IDEMPIERE-3353:sync development profile (eclipse) and package profile
1. on buckminster_linux_gtk_x86.properties add product.id=org.eclipse.equinox.p2.director so when uninstall in update process, it will keep material (plugins) for org.eclipse.equinox.p2.director 2. add org.idempiere.equinox.p2.director.feature to separate material (.sh) of org.adempiere.server.product and p2.director 3. change update-prd.sh to update org.idempiere.fitnesse.feature also 4. update director/configuration/config.ini folow update equinox to 4.7.x
This commit is contained in:
parent
e91fdb28b4
commit
ffdc57cbe8
|
@ -38,6 +38,10 @@
|
||||||
id="org.idempiere.fitnesse"
|
id="org.idempiere.fitnesse"
|
||||||
version="0.0.0"/>
|
version="0.0.0"/>
|
||||||
|
|
||||||
|
<includes
|
||||||
|
id="org.idempiere.equinox.p2.director"
|
||||||
|
version="0.0.0"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.eclipse.swt"
|
id="org.eclipse.swt"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
xmlns="http://www.eclipse.org/buckminster/CSpec-1.0">
|
xmlns="http://www.eclipse.org/buckminster/CSpec-1.0">
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<!-- Place your Dependencies here -->
|
<!-- Place your Dependencies here -->
|
||||||
<dependency name="org.idempiere.eclipse.platform" componentType="eclipse.feature"/>
|
<dependency name="org.idempiere.equinox.p2.director" componentType="eclipse.feature"/>
|
||||||
<dependency name="org.idempiere.fitnesse" componentType="eclipse.feature"/>
|
<dependency name="org.idempiere.fitnesse" componentType="eclipse.feature"/>
|
||||||
<dependency name="org.idempiere.fitnesse.fixture" componentType="osgi.bundle"/>
|
<dependency name="org.idempiere.fitnesse.fixture" componentType="osgi.bundle"/>
|
||||||
<dependency name="org.idempiere.fitnesse.server" componentType="osgi.bundle"/>
|
<dependency name="org.idempiere.fitnesse.server" componentType="osgi.bundle"/>
|
||||||
|
@ -74,7 +74,6 @@
|
||||||
</alterActions>
|
</alterActions>
|
||||||
<alterGroups>
|
<alterGroups>
|
||||||
<public name="bundle.jars">
|
<public name="bundle.jars">
|
||||||
<attribute name="bundle.jars" component="org.idempiere.eclipse.platform"/>
|
|
||||||
<attribute name="bundle.jars" component="org.idempiere.fitnesse.fixture"/>
|
<attribute name="bundle.jars" component="org.idempiere.fitnesse.fixture"/>
|
||||||
<attribute name="bundle.jars" component="org.idempiere.fitnesse.server"/>
|
<attribute name="bundle.jars" component="org.idempiere.fitnesse.server"/>
|
||||||
<attribute name="bundle.jars" component="org.idempiere.fitnesse"/>
|
<attribute name="bundle.jars" component="org.idempiere.fitnesse"/>
|
||||||
|
@ -82,7 +81,7 @@
|
||||||
<attribute name="bundle.jars" component="org.idempiere.ui.zk.selenium"/>
|
<attribute name="bundle.jars" component="org.idempiere.ui.zk.selenium"/>
|
||||||
</public>
|
</public>
|
||||||
<public name="feature.references">
|
<public name="feature.references">
|
||||||
<attribute name="feature.jars" component="org.idempiere.eclipse.platform"/>
|
<attribute name="feature.jars" component="org.idempiere.equinox.p2.director"/>
|
||||||
<attribute name="feature.jars" component="org.idempiere.fitnesse"/>
|
<attribute name="feature.jars" component="org.idempiere.fitnesse"/>
|
||||||
</public>
|
</public>
|
||||||
</alterGroups>
|
</alterGroups>
|
||||||
|
|
|
@ -10,9 +10,9 @@ target.os=*
|
||||||
target.ws=*
|
target.ws=*
|
||||||
target.arch=*
|
target.arch=*
|
||||||
|
|
||||||
product.features=org.idempiere.eclipse.platform.feature.group, org.idempiere.fitnesse.feature.group
|
product.features=org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group
|
||||||
product.profile=DefaultProfile
|
product.profile=DefaultProfile
|
||||||
product.id=org.adempiere.server.product
|
product.id=org.adempiere.server.product, org.eclipse.equinox.p2.director
|
||||||
|
|
||||||
osgi.user.area=${user.home}
|
osgi.user.area=${user.home}
|
||||||
osgi.user.area.default=${user.home}
|
osgi.user.area.default=${user.home}
|
||||||
|
|
|
@ -10,9 +10,9 @@ target.os=linux
|
||||||
target.ws=gtk
|
target.ws=gtk
|
||||||
target.arch=x86
|
target.arch=x86
|
||||||
|
|
||||||
product.features=org.idempiere.eclipse.platform.feature.group, org.idempiere.fitnesse.feature.group
|
product.features=org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group
|
||||||
product.profile=DefaultProfile
|
product.profile=DefaultProfile
|
||||||
product.id=org.adempiere.server.product
|
product.id=org.adempiere.server.product, org.eclipse.equinox.p2.director
|
||||||
|
|
||||||
osgi.user.area=${user.home}
|
osgi.user.area=${user.home}
|
||||||
osgi.user.area.default=${user.home}
|
osgi.user.area.default=${user.home}
|
||||||
|
|
|
@ -10,9 +10,9 @@ target.os=linux
|
||||||
target.ws=gtk
|
target.ws=gtk
|
||||||
target.arch=x86_64
|
target.arch=x86_64
|
||||||
|
|
||||||
product.features=org.idempiere.eclipse.platform.feature.group, org.idempiere.fitnesse.feature.group
|
product.features=org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group
|
||||||
product.profile=DefaultProfile
|
product.profile=DefaultProfile
|
||||||
product.id=org.adempiere.server.product
|
product.id=org.adempiere.server.product, org.eclipse.equinox.p2.director
|
||||||
|
|
||||||
osgi.user.area=${user.home}
|
osgi.user.area=${user.home}
|
||||||
osgi.user.area.default=${user.home}
|
osgi.user.area.default=${user.home}
|
||||||
|
|
|
@ -10,9 +10,9 @@ target.os=macosx
|
||||||
target.ws=cocoa
|
target.ws=cocoa
|
||||||
target.arch=x86
|
target.arch=x86
|
||||||
|
|
||||||
product.features=org.idempiere.eclipse.platform.feature.group, org.idempiere.fitnesse.feature.group
|
product.features=org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group
|
||||||
product.profile=DefaultProfile
|
product.profile=DefaultProfile
|
||||||
product.id=org.adempiere.server.product
|
product.id=org.adempiere.server.product, org.eclipse.equinox.p2.director
|
||||||
|
|
||||||
osgi.user.area=${user.home}
|
osgi.user.area=${user.home}
|
||||||
osgi.user.area.default=${user.home}
|
osgi.user.area.default=${user.home}
|
||||||
|
|
|
@ -10,9 +10,9 @@ target.os=solaris
|
||||||
target.ws=gtk
|
target.ws=gtk
|
||||||
target.arch=x86
|
target.arch=x86
|
||||||
|
|
||||||
product.features=org.idempiere.eclipse.platform.feature.group, org.idempiere.fitnesse.feature.group
|
product.features=org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group
|
||||||
product.profile=DefaultProfile
|
product.profile=DefaultProfile
|
||||||
product.id=org.adempiere.server.product
|
product.id=org.adempiere.server.product, org.eclipse.equinox.p2.director
|
||||||
|
|
||||||
osgi.user.area=${user.home}
|
osgi.user.area=${user.home}
|
||||||
osgi.user.area.default=${user.home}
|
osgi.user.area.default=${user.home}
|
||||||
|
|
|
@ -10,9 +10,9 @@ target.os=win32
|
||||||
target.ws=win32
|
target.ws=win32
|
||||||
target.arch=x86
|
target.arch=x86
|
||||||
|
|
||||||
product.features=org.idempiere.eclipse.platform.feature.group, org.idempiere.fitnesse.feature.group
|
product.features=org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group
|
||||||
product.profile=DefaultProfile
|
product.profile=DefaultProfile
|
||||||
product.id=org.adempiere.server.product
|
product.id=org.adempiere.server.product, org.eclipse.equinox.p2.director
|
||||||
|
|
||||||
osgi.user.area=${user.home}
|
osgi.user.area=${user.home}
|
||||||
osgi.user.area.default=${user.home}
|
osgi.user.area.default=${user.home}
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -1,20 +1,11 @@
|
||||||
bin.includes = feature.xml
|
bin.includes = feature.xml
|
||||||
root.folder.director=director
|
|
||||||
|
|
||||||
root.linux.gtk.x86_64=file:director.sh,file:update.sh,file:update-prd.sh
|
|
||||||
root.linux.gtk.x86_64.permissions.755=*.sh,**/*.sh
|
root.linux.gtk.x86_64.permissions.755=*.sh,**/*.sh
|
||||||
|
|
||||||
root.linux.gtk.x86=file:director.sh,file:update.sh,file:update-prd.sh
|
|
||||||
root.linux.gtk.x86.permissions.755=*.sh,**/*.sh
|
root.linux.gtk.x86.permissions.755=*.sh,**/*.sh
|
||||||
|
|
||||||
root.macosx.cocoa.x86=file:director.sh,file:update.sh,file:update-prd.sh
|
|
||||||
root.macosx.cocoa.x86.permissions.755=*.sh,**/*.sh
|
root.macosx.cocoa.x86.permissions.755=*.sh,**/*.sh
|
||||||
|
|
||||||
root.macosx.cocoa.x86_64=file:director.sh,file:update.sh,file:update-prd.sh
|
|
||||||
root.macosx.cocoa.x86_64.permissions.755=*.sh,**/*.sh
|
root.macosx.cocoa.x86_64.permissions.755=*.sh,**/*.sh
|
||||||
|
|
||||||
root.win32.win32.x86=file:director.bat,file:update.bat,file:update-prd.bat
|
root.solaris.gtk.x86.permissions.755=*.sh,**/*.sh
|
||||||
root.win32.win32.x86_64=file:director.bat,file:update.bat,file:update-prd.bat
|
|
||||||
|
|
||||||
root.solaris.gtk.x86=file:director.sh,file:update.sh,file:update-prd.sh
|
|
||||||
root.solaris.gtk.x86.permissions.755=*.sh,**/*.sh
|
|
||||||
|
|
|
@ -0,0 +1,17 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<projectDescription>
|
||||||
|
<name>org.idempiere.equinox.p2.director-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,24 @@
|
||||||
|
bin.includes = feature.xml
|
||||||
|
|
||||||
|
root.folder.director=director
|
||||||
|
|
||||||
|
root.linux.gtk.x86_64=file:director.sh,file:update.sh,file:update-prd.sh
|
||||||
|
root.linux.gtk.x86_64.permissions.755=*.sh,**/*.sh
|
||||||
|
|
||||||
|
root.linux.gtk.x86=file:director.sh,file:update.sh,file:update-prd.sh
|
||||||
|
root.linux.gtk.x86.permissions.755=*.sh,**/*.sh
|
||||||
|
|
||||||
|
root.macosx.cocoa.x86=file:director.sh,file:update.sh,file:update-prd.sh
|
||||||
|
root.macosx.cocoa.x86.permissions.755=*.sh,**/*.sh
|
||||||
|
|
||||||
|
root.macosx.cocoa.x86_64=file:director.sh,file:update.sh,file:update-prd.sh
|
||||||
|
root.macosx.cocoa.x86_64.permissions.755=*.sh,**/*.sh
|
||||||
|
|
||||||
|
root.win32.win32.x86=file:director.bat,file:update.bat,file:update-prd.bat
|
||||||
|
root.win32.win32.x86.permissions.755=*.sh,**/*.sh
|
||||||
|
|
||||||
|
root.win32.win32.x86_64=file:director.bat,file:update.bat,file:update-prd.bat
|
||||||
|
root.win32.win32.x86_64.permissions.755=*.sh,**/*.sh
|
||||||
|
|
||||||
|
root.solaris.gtk.x86=file:director.sh,file:update.sh,file:update-prd.sh
|
||||||
|
root.solaris.gtk.x86.permissions.755=*.sh,**/*.sh
|
|
@ -32,7 +32,6 @@ osgi.bundles=org.eclipse.core.net@start,\
|
||||||
org.eclipse.equinox.p2.jarprocessor,\
|
org.eclipse.equinox.p2.jarprocessor,\
|
||||||
org.eclipse.equinox.p2.metadata,\
|
org.eclipse.equinox.p2.metadata,\
|
||||||
org.eclipse.equinox.p2.metadata.repository,\
|
org.eclipse.equinox.p2.metadata.repository,\
|
||||||
org.eclipse.equinox.p2.ql,\
|
|
||||||
org.eclipse.equinox.p2.repository,\
|
org.eclipse.equinox.p2.repository,\
|
||||||
org.eclipse.equinox.p2.touchpoint.eclipse,\
|
org.eclipse.equinox.p2.touchpoint.eclipse,\
|
||||||
org.eclipse.equinox.p2.touchpoint.natives,\
|
org.eclipse.equinox.p2.touchpoint.natives,\
|
||||||
|
@ -58,7 +57,12 @@ osgi.bundles=org.eclipse.core.net@start,\
|
||||||
org.junit,\
|
org.junit,\
|
||||||
org.eclipse.osgi.compatibility.state,\
|
org.eclipse.osgi.compatibility.state,\
|
||||||
org.eclipse.osgi.compatibility.plugins,\
|
org.eclipse.osgi.compatibility.plugins,\
|
||||||
org.eclipse.osgi@start
|
org.eclipse.osgi@start,\
|
||||||
|
org.eclipse.osgi.services,\
|
||||||
|
org.eclipse.osgi.util,\
|
||||||
|
org.apache.felix.scr,\
|
||||||
|
org.eclipse.equinox.ds,\
|
||||||
|
org.tukaani.xz
|
||||||
osgi.framework.extensions=
|
osgi.framework.extensions=
|
||||||
osgi.bundles.defaultStartLevel=4
|
osgi.bundles.defaultStartLevel=4
|
||||||
eclipse.p2.profile=DefaultProfile
|
eclipse.p2.profile=DefaultProfile
|
|
@ -0,0 +1,20 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<feature
|
||||||
|
id="org.idempiere.equinox.p2.director"
|
||||||
|
label="Idempiere P2 Director"
|
||||||
|
version="4.1.0.qualifier"
|
||||||
|
provider-name="www.idempiere.org">
|
||||||
|
|
||||||
|
<description url="http://www.example.com/description">
|
||||||
|
[Enter Feature Description here.]
|
||||||
|
</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>
|
||||||
|
|
||||||
|
</feature>
|
|
@ -7,5 +7,5 @@ set DESTINATION=%cd%
|
||||||
@echo %1%
|
@echo %1%
|
||||||
|
|
||||||
FOR %%c in (plugins\org.eclipse.equinox.launcher_1.*.jar) DO set JARFILE=%%c
|
FOR %%c in (plugins\org.eclipse.equinox.launcher_1.*.jar) DO set JARFILE=%%c
|
||||||
java -Dorg.eclipse.ecf.provider.filetransfer.excludeContributors=org.eclipse.ecf.provider.filetransfer.httpclient4 -Djava.net.preferIPv4Stack=true -jar %JARFILE% -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination %DESTINATION% -repository %1% -u %2%
|
java -Dorg.eclipse.ecf.provider.filetransfer.excludeContributors=org.eclipse.ecf.provider.filetransfer.httpclient4 -Djava.net.preferIPv4Stack=true -jar %JARFILE% -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination %DESTINATION% -repository %1% -u "%2%, org.idempiere.fitnesse.feature.group"
|
||||||
java -Dorg.eclipse.ecf.provider.filetransfer.excludeContributors=org.eclipse.ecf.provider.filetransfer.httpclient4 -Djava.net.preferIPv4Stack=true -jar %JARFILE% -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination %DESTINATION% -repository %1% -i %2%
|
java -Dorg.eclipse.ecf.provider.filetransfer.excludeContributors=org.eclipse.ecf.provider.filetransfer.httpclient4 -Djava.net.preferIPv4Stack=true -jar %JARFILE% -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination %DESTINATION% -repository %1% -i "%2%, org.eclipse.equinox.p2.director, org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group"
|
|
@ -4,6 +4,6 @@
|
||||||
cd $(dirname "${0}")
|
cd $(dirname "${0}")
|
||||||
DESTINATION=$(pwd)
|
DESTINATION=$(pwd)
|
||||||
|
|
||||||
VMOPTS="-Dorg.eclipse.ecf.provider.filetransfer.excludeContributors=org.eclipse.ecf.provider.filetransfer.httpclient4 -Djava.net.preferIPv4Stack=true"
|
VMOPTS="-Declipse.log.level=ALL -Dorg.eclipse.ecf.provider.filetransfer.excludeContributors=org.eclipse.ecf.provider.filetransfer.httpclient4 -Djava.net.preferIPv4Stack=true"
|
||||||
java $VMOPTS -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination $DESTINATION -repository $1 -u $2
|
java $VMOPTS -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination $DESTINATION -repository $1 -u "$2, org.idempiere.fitnesse.feature.group"
|
||||||
java $VMOPTS -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination $DESTINATION -repository $1 -i $2
|
java $VMOPTS -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination $DESTINATION -repository $1 -i "$2, org.eclipse.equinox.p2.director, org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group"
|
Loading…
Reference in New Issue