IDEMPIERE-345 Deployment: Bundle p2 director app and product update script
This commit is contained in:
parent
e8f72ee777
commit
8bde582f5d
|
@ -36,14 +36,6 @@
|
|||
id="org.adempiere.report.jasper"
|
||||
version="0.0.0"/>
|
||||
|
||||
<includes
|
||||
id="org.eclipse.equinox.server.core"
|
||||
version="0.0.0"/>
|
||||
|
||||
<includes
|
||||
id="org.eclipse.equinox.server.p2"
|
||||
version="0.0.0"/>
|
||||
|
||||
<plugin
|
||||
id="org.adempiere.base"
|
||||
download-size="0"
|
||||
|
@ -87,13 +79,6 @@
|
|||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.core.runtime"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.restlet"
|
||||
download-size="0"
|
||||
|
@ -198,13 +183,6 @@
|
|||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.core.contenttype"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="com.springsource.javax.ejb"
|
||||
download-size="0"
|
||||
|
@ -281,27 +259,6 @@
|
|||
install-size="0"
|
||||
version="0.0.0"/>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.ant.core"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.equinox.event"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.equinox.ds"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.osgi.services"
|
||||
download-size="0"
|
||||
|
@ -309,23 +266,6 @@
|
|||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.core.variables"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.equinox.launcher"
|
||||
os="linux,macosx,win32"
|
||||
ws="cocoa,gtk,win32"
|
||||
arch="x86,x86_64"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.hamcrest.core"
|
||||
download-size="0"
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
xmlns="http://www.eclipse.org/buckminster/CSpec-1.0">
|
||||
<dependencies>
|
||||
<!-- Place your Dependencies here -->
|
||||
<dependency name="org.idempiere.eclipse.platform" componentType="eclipse.feature"/>
|
||||
</dependencies>
|
||||
<generators>
|
||||
<!-- Place your Generators here -->
|
||||
|
@ -18,12 +19,13 @@
|
|||
<property key="buildFile" value="product.ant" />
|
||||
<property key="targets" value="create.product" />
|
||||
</actorProperties>
|
||||
<properties>
|
||||
<property key="profile" value="ServerProfile" />
|
||||
<property key="iu" value="org.adempiere.server.product" />
|
||||
</properties>
|
||||
<properties>
|
||||
<property key="profile" value="${product.profile}" />
|
||||
<property key="iu" value="${product.id}" />
|
||||
<property key="features" value="${product.features}" />
|
||||
</properties>
|
||||
<prerequisites alias="repository">
|
||||
<attribute name="site.p2" />
|
||||
<attribute name="site.p2"/>
|
||||
</prerequisites>
|
||||
<products alias="destination" base="${buckminster.output}">
|
||||
<path path="idempiere.${target.ws}.${target.os}.${target.arch}/" ></path>
|
||||
|
@ -55,6 +57,11 @@
|
|||
<!-- Place your Action alterations here -->
|
||||
</alterActions>
|
||||
<alterGroups>
|
||||
<!-- Place your Group alterations here -->
|
||||
<public name="bundle.jars">
|
||||
<attribute name="bundle.jars" component="org.idempiere.eclipse.platform"/>
|
||||
</public>
|
||||
<public name="feature.references">
|
||||
<attribute name="feature.jars" component="org.idempiere.eclipse.platform"/>
|
||||
</public>
|
||||
</alterGroups>
|
||||
</cspecExtension>
|
||||
|
|
|
@ -9,3 +9,7 @@ generator.buildTimestamp.format='v'yyyyMMdd-HHmm
|
|||
target.os=linux
|
||||
target.ws=gtk
|
||||
target.arch=x86_64
|
||||
|
||||
product.features=org.idempiere.eclipse.platform.feature.group
|
||||
product.profile=ServerProfile
|
||||
product.id=org.adempiere.server.product
|
||||
|
|
|
@ -9,3 +9,7 @@ generator.buildTimestamp.format='v'yyyyMMdd-HHmm
|
|||
target.os=linux
|
||||
target.ws=gtk
|
||||
target.arch=x86_64
|
||||
|
||||
product.features=org.idempiere.eclipse.platform.feature.group
|
||||
product.profile=ServerProfile
|
||||
product.id=org.adempiere.server.product
|
||||
|
|
|
@ -9,3 +9,7 @@ generator.buildTimestamp.format='v'yyyyMMdd-HHmm
|
|||
target.os=macosx
|
||||
target.ws=cocoa
|
||||
target.arch=x86
|
||||
|
||||
product.features=org.idempiere.eclipse.platform.feature.group
|
||||
product.profile=ServerProfile
|
||||
product.id=org.adempiere.server.product
|
||||
|
|
|
@ -9,3 +9,7 @@ generator.buildTimestamp.format='v'yyyyMMdd-HHmm
|
|||
target.os=win32
|
||||
target.ws=win32
|
||||
target.arch=x86
|
||||
|
||||
product.features=org.idempiere.eclipse.platform.feature.group
|
||||
product.profile=ServerProfile
|
||||
product.id=org.adempiere.server.product
|
||||
|
|
|
@ -2,6 +2,7 @@ bin.includes = feature.xml
|
|||
root=file:build.xml,file:setup.ini,file:extensions-priorty.properties
|
||||
root.folder.data=data
|
||||
root.folder.setup=setup
|
||||
|
||||
#linux 64 bits
|
||||
root.linux.gtk.x86_64=file:setup.sh,file:console-setup.sh,file:idempiere-server.sh,file:setup-alt.sh,file:console-setup-alt.sh
|
||||
root.linux.gtk.x86_64.folder.utils=utils.unix
|
||||
|
|
|
@ -18,7 +18,8 @@
|
|||
|
||||
<includes
|
||||
id="org.adempiere.replication.server"
|
||||
version="0.0.0"/>
|
||||
version="0.0.0"
|
||||
optional="true"/>
|
||||
|
||||
<includes
|
||||
id="org.adempiere.ui.zk"
|
||||
|
@ -26,14 +27,15 @@
|
|||
|
||||
<includes
|
||||
id="org.adempiere.webstore"
|
||||
version="0.0.0"/>
|
||||
version="0.0.0"
|
||||
optional="true"/>
|
||||
|
||||
<includes
|
||||
id="org.eclipse.gemini.web.feature"
|
||||
version="0.0.0"/>
|
||||
|
||||
<requires>
|
||||
<import feature="org.adempiere.base" version="1.0.0.qualifier"/>
|
||||
<import feature="org.adempiere.base" version="1.0.0" match="compatible"/>
|
||||
</requires>
|
||||
|
||||
<plugin
|
||||
|
@ -143,27 +145,6 @@
|
|||
version="0.0.0"
|
||||
fragment="true"/>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.gemini.web.core"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.gemini.web.extender"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.gemini.web.tomcat"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.virgo.util.common"
|
||||
download-size="0"
|
||||
|
@ -299,20 +280,6 @@
|
|||
install-size="0"
|
||||
version="0.0.0"/>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.ant.core"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.core.variables"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.adempiere.eclipse.equinox.http.servlet"
|
||||
download-size="0"
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
</pathconvert>
|
||||
|
||||
<target name="create.product">
|
||||
<property name="installableIUs" value="${iu},${features}" />
|
||||
<property name="destination" location="${sp:destination}"/>
|
||||
<delete dir="${destination}"/>
|
||||
<makeurl property="repository" file="${sp:repository}"/>
|
||||
|
@ -31,7 +32,7 @@
|
|||
<arg value="-profileProperties" />
|
||||
<arg value="org.eclipse.update.install.features=true" />
|
||||
<arg value="-installIU"/>
|
||||
<arg value="${iu}"/>
|
||||
<arg value="${installableIUs}"/>
|
||||
<arg value="-p2.os" />
|
||||
<arg value="${target.os}" />
|
||||
<arg value="-p2.ws" />
|
||||
|
|
|
@ -0,0 +1,17 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<projectDescription>
|
||||
<name>org.idempiere.eclipse.platform-feature</name>
|
||||
<comment></comment>
|
||||
<projects>
|
||||
</projects>
|
||||
<buildSpec>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.pde.FeatureBuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
</buildSpec>
|
||||
<natures>
|
||||
<nature>org.eclipse.pde.FeatureNature</nature>
|
||||
</natures>
|
||||
</projectDescription>
|
|
@ -0,0 +1,17 @@
|
|||
bin.includes = feature.xml
|
||||
root.folder.director=director
|
||||
|
||||
root.linux.gtk.x86_64=file:director.sh,file:update.sh
|
||||
root.linux.gtk.x86_64.permissions.755=*.sh,**/*.sh
|
||||
|
||||
root.linux.gtk.x86=file:director.sh,file:update.sh
|
||||
root.linux.gtk.x86.permissions.755=*.sh,**/*.sh
|
||||
|
||||
root.macosx.cocoa.x86=file:director.sh,file:update.sh
|
||||
root.macosx.cocoa.x86.permissions.755=*.sh,**/*.sh
|
||||
|
||||
root.macosx.cocoa.x86_64=file:director.sh,file:update.sh
|
||||
root.macosx.cocoa.x86_64.permissions.755=*.sh,**/*.sh
|
||||
|
||||
root.win32.win32.x86=file:director.bat,file:update.bat
|
||||
root.win32.win32.x86_64=file:director.bat,file:update.bat
|
|
@ -0,0 +1,4 @@
|
|||
@Title ... p2 director
|
||||
@Echo off
|
||||
|
||||
java -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=director -jar plugins/org.eclipse.osgi_3.7.*.jar -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true %1
|
|
@ -0,0 +1,5 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
|
||||
java -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=director -jar plugins/org.eclipse.osgi_3.7.*.jar -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true $*
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
osgi.framework=file\:../plugins/org.eclipse.osgi_3.7.2.v20120110-1415.jar
|
||||
equinox.use.ds=true
|
||||
osgi.bundles=org.eclipse.core.variables,org.eclipse.ant.core,org.eclipse.core.runtime@start,org.hamcrest.core,org.junit,org.apache.commons.collections,org.apache.ant,org.apache.commons.net,org.eclipse.equinox.app,org.eclipse.equinox.registry,org.eclipse.equinox.common@2:start,org.eclipse.core.contenttype,org.eclipse.core.jobs,org.eclipse.equinox.preferences,org.apache.commons.logging,org.eclipse.osgi.services,org.sat4j.core,org.sat4j.pb,org.eclipse.ecf,org.eclipse.ecf.filetransfer,org.eclipse.ecf.identity,org.eclipse.ecf.provider.filetransfer,org.eclipse.ecf.provider.filetransfer.httpclient,org.eclipse.ecf.provider.filetransfer.httpclient.ssl,org.eclipse.ecf.provider.filetransfer.ssl,org.eclipse.ecf.ssl,org.eclipse.equinox.ds@start,org.eclipse.equinox.event,org.eclipse.equinox.frameworkadmin,org.eclipse.equinox.frameworkadmin.equinox,org.eclipse.equinox.http.registry,org.eclipse.equinox.launcher,org.eclipse.equinox.p2.artifact.repository,org.eclipse.equinox.p2.console,org.eclipse.equinox.p2.core,org.eclipse.equinox.p2.director,org.eclipse.equinox.p2.director.app,org.eclipse.equinox.p2.engine,org.eclipse.equinox.p2.garbagecollector,org.eclipse.equinox.p2.jarprocessor,org.eclipse.equinox.p2.metadata,org.eclipse.equinox.p2.metadata.repository,org.eclipse.equinox.p2.ql,org.eclipse.equinox.p2.repository,org.eclipse.equinox.p2.touchpoint.eclipse,org.eclipse.equinox.p2.touchpoint.natives,org.eclipse.equinox.p2.transport.ecf,org.eclipse.equinox.security,org.eclipse.equinox.util,org.apache.commons.httpclient,org.eclipse.equinox.simpleconfigurator.manipulator,org.apache.commons.codec,org.eclipse.equinox.simpleconfigurator
|
||||
osgi.framework.extensions=
|
||||
osgi.bundles.defaultStartLevel=4
|
||||
eclipse.p2.profile=ServerProfile
|
||||
eclipse.p2.data.area=@config.dir/../../p2/
|
|
@ -0,0 +1,94 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<feature
|
||||
id="org.idempiere.eclipse.platform"
|
||||
label="Eclipse Platform for iDempiere"
|
||||
version="1.0.0.qualifier"
|
||||
provider-name="www.idempiere.org">
|
||||
|
||||
<description url="http://www.example.com/description">
|
||||
Eclipse runtime for iDempiere
|
||||
</description>
|
||||
|
||||
<copyright url="http://www.example.com/copyright">
|
||||
[Enter Copyright Description here.]
|
||||
</copyright>
|
||||
|
||||
<license url="http://www.example.com/license">
|
||||
[Enter License Description here.]
|
||||
</license>
|
||||
|
||||
<includes
|
||||
id="org.eclipse.equinox.server.core"
|
||||
version="0.0.0"/>
|
||||
|
||||
<includes
|
||||
id="org.eclipse.equinox.server.p2"
|
||||
version="0.0.0"/>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.core.runtime"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.core.contenttype"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.ant.core"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.equinox.event"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.equinox.ds"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.osgi.services"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.core.variables"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.equinox.launcher"
|
||||
os="linux,macosx,win32"
|
||||
ws="cocoa,gtk,win32"
|
||||
arch="x86,x86_64"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.equinox.p2.director.app"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
</feature>
|
|
@ -0,0 +1,12 @@
|
|||
@Title ... p2 director
|
||||
@Echo off
|
||||
|
||||
cd %~dp0
|
||||
|
||||
cp idempiere.ini idempiere.ini.sav
|
||||
|
||||
java -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=director -jar plugins/org.eclipse.osgi_3.7.*.jar -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination %~dp0 -repository %1 -u org.adempiere.server.product
|
||||
|
||||
java -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=director -jar plugins/org.eclipse.osgi_3.7.*.jar -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination %~dp0 -repository %1 -i org.adempiere.server.product
|
||||
|
||||
cp idempiere.ini.sav idempiere.ini
|
|
@ -0,0 +1,13 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
|
||||
cd $(dirname "${0}")
|
||||
DESTINATION=$(pwd)
|
||||
|
||||
cp idempiere.ini idempiere.ini.sav
|
||||
|
||||
java -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=director -jar plugins/org.eclipse.osgi_3.7.*.jar -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination $DESTINATION -repository $1 -u org.adempiere.server.product
|
||||
|
||||
java -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=director -jar plugins/org.eclipse.osgi_3.7.*.jar -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination $DESTINATION -repository $1 -i org.adempiere.server.product
|
||||
|
||||
cp idempiere.ini.sav idempiere.ini
|
Loading…
Reference in New Issue