IDEMPIERE-3560 - restore back previous of update.sh version before changes from IDEMPIERE-3353 - add org.idempiere.fitnesse.feature.group to the updated plugins on core

This commit is contained in:
Carlos Ruiz 2017-11-29 10:43:04 +01:00
parent 1eeac68526
commit 7184f1c80e
4 changed files with 7 additions and 25 deletions

View File

@ -6,12 +6,6 @@ set DESTINATION=%cd%
@echo %DESTINATION% @echo %DESTINATION%
@echo %1% @echo %1%
set INSTALL_UI=%2%
set UNINSTALL_UI=%2%
if [%3]==[] goto nothird
set UNINSTALL_UI=%3%
:nothird
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 %UNINSTALL_UI% 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 -i %INSTALL_UI% 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%

View File

@ -4,13 +4,6 @@
cd $(dirname "${0}") cd $(dirname "${0}")
DESTINATION=$(pwd) DESTINATION=$(pwd)
VMOPTS="-Declipse.log.level=ALL -Dorg.eclipse.ecf.provider.filetransfer.excludeContributors=org.eclipse.ecf.provider.filetransfer.httpclient4 -Djava.net.preferIPv4Stack=true" VMOPTS="-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
INSTALL_UI="$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
UNINSTALL_UI="$2"
if [ -n "$3" ]; then
# case update org.adempiere.server.product, install and un-install is difference
UNINSTALL_UI="$3"
fi
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 "$UNINSTALL_UI"
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 "$INSTALL_UI"

View File

@ -23,9 +23,7 @@ if exist jettyhome\etc\jetty-selector.xml (
copy jettyhome\etc\jetty-selector.xml jetty-selector.xml.sav copy jettyhome\etc\jetty-selector.xml jetty-selector.xml.sav
) )
set UNINSTALL_UI="org.adempiere.server.product, org.idempiere.fitnesse.feature.group" @call %DESTINATION%\update-prd %1% org.adempiere.server.product,org.idempiere.fitnesse.feature.group
set INSTALL_UI="org.adempiere.server.product, org.eclipse.equinox.p2.director, org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group"
@call %DESTINATION%\update-prd %1 %INSTALL_UI% %UNINSTALL_UI%
copy idempiere.ini.sav idempiere.ini copy idempiere.ini.sav idempiere.ini

View File

@ -33,10 +33,7 @@ then
cp jettyhome/etc/jetty-selector.xml jetty-selector.xml.sav cp jettyhome/etc/jetty-selector.xml jetty-selector.xml.sav
fi fi
UNINSTALL_UI="org.adempiere.server.product, org.idempiere.fitnesse.feature.group" $DESTINATION/update-prd.sh $1 org.adempiere.server.product,org.idempiere.fitnesse.feature.group
INSTALL_UI="org.adempiere.server.product, org.eclipse.equinox.p2.director, org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group"
$DESTINATION/update-prd.sh $1 "$INSTALL_UI" "$UNINSTALL_UI"
cp idempiere.ini.sav idempiere.ini cp idempiere.ini.sav idempiere.ini