[java-identity-provider COMMIT] in /branches/3.1/idp-installer/src/main/wix: IdP.bat IdP.wixproj Jetty.bat Shibboleth...

[noreply at shibboleth.net]

Author: rdw
Date: Tue Mar 31 06:48:46 2015
New Revision: 7460

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7460&view=rev
Log:
IDP668 Merge from mainline.  Explicitly delete on install

Added:
    branches/3.1/idp-installer/src/main/wix/ShibbolethIdP-delete.wxs   (with props)
Modified:
    branches/3.1/idp-installer/src/main/wix/IdP.bat
    branches/3.1/idp-installer/src/main/wix/IdP.wixproj
    branches/3.1/idp-installer/src/main/wix/Jetty.bat
    branches/3.1/idp-installer/src/main/wix/ShibbolethIdP-main.wxs

Modified: branches/3.1/idp-installer/src/main/wix/IdP.bat
URL: http://svn.shibboleth.net/view/java-identity-provider/branches/3.1/idp-installer/src/main/wix/IdP.bat?rev=7460&r1=7459&r2=7460&view=diff
==============================================================================
--- branches/3.1/idp-installer/src/main/wix/IdP.bat (original)
+++ branches/3.1/idp-installer/src/main/wix/IdP.bat Tue Mar 31 06:48:46 2015
@@ -138,20 +138,20 @@
 "%WIX%/BIN/CANDLE" -nologo -arch x86 -didpSrc=idp-extract\%idpex% idp_contents.wxs
 if ERRORLEVEL 1 goto done
 
-"%WIX%/BIN/CANDLE" -nologo -arch x86 -dProjectDir=. ShibbolethIdP-registry.wxs ShibbolethIdP-main.wxs -dmsitype=x86
+"%WIX%/BIN/CANDLE" -nologo -arch x86 -dProjectDir=. ShibbolethIdP-registry.wxs ShibbolethIdP-main.wxs ShibbolethIdP-delete.wxs -dmsitype=x86 -ext WixUtilExtension
 
 "%WIX%/BIN/CANDLE" -nologo -arch x86 -dProjectDir=. ShibbolethIdP-gui.wxs ShibbolethIdP-install-dlg.wxs ShibbolethIdP-adconfig-dlg.wxs ShibbolethIdP-update-dlg.wxs
 if ERRORLEVEL 1 goto done
 
-"%WIX%/BIN/LIGHT" -nologo -out idp-x86.msi -ext WixUIExtension ShibbolethIdP-main.wixobj idp_contents.wixobj ShibbolethIdP-registry.wixobj ShibbolethIdP-gui.wixobj ShibbolethIdP-install-dlg.wixobj ShibbolethIdP-adconfig-dlg.wixobj ShibbolethIdP-update-dlg.wixobj -ext WixUtilExtension.dll -sice:ICE61
+"%WIX%/BIN/LIGHT" -nologo -out idp-x86.msi -ext WixUIExtension ShibbolethIdP-main.wixobj idp_contents.wixobj ShibbolethIdP-registry.wixobj ShibbolethIdP-gui.wixobj ShibbolethIdP-install-dlg.wixobj ShibbolethIdP-adconfig-dlg.wixobj ShibbolethIdP-update-dlg.wixobj ShibbolethIdP-delete.wixobj -ext WixUtilExtension -sice:ICE61
 if ERRORLEVEL 1 goto done
 
 del ShibbolethIdP-main.wixobj
 del ShibbolethIdP-registry.wixobj
-"%WIX%/BIN/CANDLE" -nologo -arch x64 -dProjectDir=. ShibbolethIdP-main.wxs ShibbolethIdP-registry.wxs -dmsitype=x64
+"%WIX%/BIN/CANDLE" -nologo -arch x64 -dProjectDir=. ShibbolethIdP-main.wxs ShibbolethIdP-registry.wxs ShibbolethIdP-delete.wxs -dmsitype=x64 -ext WixUtilExtension
 if ERRORLEVEL 1 goto done
 
-"%WIX%/BIN/LIGHT" -nologo -out idp-x64.msi -ext WixUIExtension ShibbolethIdP-main.wixobj idp_contents.wixobj ShibbolethIdP-registry.wixobj ShibbolethIdP-gui.wixobj ShibbolethIdP-install-dlg.wixobj ShibbolethIdP-adconfig-dlg.wixobj ShibbolethIdP-update-dlg.wixobj -ext WixUtilExtension.dll -sice:ICE61
+"%WIX%/BIN/LIGHT" -nologo -out idp-x64.msi -ext WixUIExtension ShibbolethIdP-main.wixobj idp_contents.wixobj ShibbolethIdP-registry.wixobj ShibbolethIdP-gui.wixobj ShibbolethIdP-install-dlg.wixobj ShibbolethIdP-adconfig-dlg.wixobj ShibbolethIdP-update-dlg.wixobj ShibbolethIdP-delete.wixobj -ext WixUtilExtension -sice:ICE61
 if ERRORLEVEL 1 goto done
 
 

Modified: branches/3.1/idp-installer/src/main/wix/IdP.wixproj
URL: http://svn.shibboleth.net/view/java-identity-provider/branches/3.1/idp-installer/src/main/wix/IdP.wixproj?rev=7460&r1=7459&r2=7460&view=diff
==============================================================================
--- branches/3.1/idp-installer/src/main/wix/IdP.wixproj (original)
+++ branches/3.1/idp-installer/src/main/wix/IdP.wixproj Tue Mar 31 06:48:46 2015
@@ -26,6 +26,7 @@
   <ItemGroup>
     <Compile Include="idp_contents.wxs" />
     <Compile Include="ShibbolethIdP-adconfig-dlg.wxs" />
+    <Compile Include="ShibbolethIdP-delete.wxs" />
     <Compile Include="ShibbolethIdP-gui.wxs" />
     <Compile Include="ShibbolethIdP-install-dlg.wxs" />
     <Compile Include="ShibbolethIdP-main.wxs" />

Modified: branches/3.1/idp-installer/src/main/wix/Jetty.bat
URL: http://svn.shibboleth.net/view/java-identity-provider/branches/3.1/idp-installer/src/main/wix/Jetty.bat?rev=7460&r1=7459&r2=7460&view=diff
==============================================================================
--- branches/3.1/idp-installer/src/main/wix/Jetty.bat (original)
+++ branches/3.1/idp-installer/src/main/wix/Jetty.bat Tue Mar 31 06:48:46 2015
@@ -129,12 +129,12 @@
 
 REM compile Jetty and procrun contents as well as the merge module for x86
 
-"%WIX%/BIN/CANDLE" -nologo -dJettySrc=jetty-extract\%Jex% -dJettyClass=%JETTY_CLASS% -dProcrunSrc=procrun-extract -dPlatform=x86 -arch x86 jetty_contents.wxs MergeModule.wxs procrun.wxs -dmsitype=x86 -ext WixFirewallExtension.dll
+"%WIX%/BIN/CANDLE" -nologo -dJettySrc=jetty-extract\%Jex% -dJettyClass=%JETTY_CLASS% -dProcrunSrc=procrun-extract -dPlatform=x86 -arch x86 jetty_contents.wxs MergeModule.wxs procrun.wxs -dmsitype=x86 -ext WixFirewallExtension
 if ERRORLEVEL 1 goto done
 
 REM link for x86
 

[... 54 lines stripped ...]