From d97b330fc277f85b0269c9fc903526f2eb2fc99f Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Mon, 23 Oct 2017 20:00:27 +0200 Subject: [PATCH] IDEMPIERE-3353 - port 1716c438eac6 to windows --- .../update-prd.bat | 10 ++++++++-- org.idempiere.equinox.p2.director-feature/update.bat | 4 +++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/org.idempiere.equinox.p2.director-feature/update-prd.bat b/org.idempiere.equinox.p2.director-feature/update-prd.bat index 3f1d5b809b..1f0b2f7cf0 100644 --- a/org.idempiere.equinox.p2.director-feature/update-prd.bat +++ b/org.idempiere.equinox.p2.director-feature/update-prd.bat @@ -6,6 +6,12 @@ set DESTINATION=%cd% @echo %DESTINATION% @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 -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%, org.eclipse.equinox.p2.director, org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.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 -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 -i %INSTALL_UI% diff --git a/org.idempiere.equinox.p2.director-feature/update.bat b/org.idempiere.equinox.p2.director-feature/update.bat index 8da6c4f9cb..a98806a7ae 100644 --- a/org.idempiere.equinox.p2.director-feature/update.bat +++ b/org.idempiere.equinox.p2.director-feature/update.bat @@ -23,7 +23,9 @@ if exist jettyhome\etc\jetty-selector.xml ( copy jettyhome\etc\jetty-selector.xml jetty-selector.xml.sav ) -@call %DESTINATION%\update-prd %1% org.adempiere.server.product +set UNINSTALL_UI="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