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

[noreply at shibboleth.net]

Author: rdw
Date: Fri Aug 22 10:50:29 2014
New Revision: 6458

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6458&view=rev
Log:
IDP-469 More Installer procedure tinkering.  Handle absolute paths.  Do more for the IdP install

Modified:
    trunk/idp-installer/src/main/wix/IdP.bat
    trunk/idp-installer/src/main/wix/IdP.wixproj
    trunk/idp-installer/src/main/wix/IdP.wxs
    trunk/idp-installer/src/main/wix/Jetty.bat

Modified: trunk/idp-installer/src/main/wix/IdP.bat
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/wix/IdP.bat?rev=6458&r1=6457&r2=6458&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/IdP.bat (original)
+++ trunk/idp-installer/src/main/wix/IdP.bat Fri Aug 22 10:50:29 2014
@@ -1,8 +1,13 @@
 @Echo off
-REM Generate msm
+REM Generate msi
 setlocal
 
 REM Preconditions
+
+if "%1%" == "" (
+  Echo Idp PATH_TO_IDP_DISTRIBUTION
+  goto done
+)
 
 if not defined WIX (
    echo WIX should be installed
@@ -16,15 +21,89 @@
 
 REM Clear up detritus from last time
 
-"%WIX%/BIN/CANDLE" -arch x86 -dProjectDir=. idp.wxs
+if exist idp_contents.wxs (
+   del idp_contents.wxs
+)
+
+if exist idp-extract (
+   rd /q /s idp-extract
+)
+
+REM Set up environment
+
+if not defined JAVA_JDK  (
+   set JAVA_JDK=%JAVA_HOME%
+)
+
+if not defined JAVA_JDK  (
+  echo Error: Nether JAVA_JDK nor JAVA_HOME is defined.
+  exit /b
+)
+
+if not defined JARCMD (
+  set JARCMD=%JAVA_JDK%\bin\jar.exe
+)
+
+if not exist "%JARCMD%" (
+  echo Error: JAVA_HOME is not defined correctly.
+  echo Cannot execute %JARCMD%
+  goto done
+)
+
+REM Test and extract
+
+if not exist %1% (
+   echo Error: Could not locate idp zip %1%
+   goto done
+)
+
+if not exist %1.asc (
+   echo Error: Could not locate signature for procrun zip %1%.asc
+   goto done
+)
+
+gpg --verify %1.asc %1
+if ERRORLEVEL 1 (
+   echo Error: Signature check failed on %1%
+   goto done
+)
+
+mkdir idp-extract
+cd idp-extract
+if exist "%1" (
+  "%JARCMD%" xf %1 
+) else (
+  "%JARCMD%" xf ..\%1 
+)
+dir /s idp.properties 1> nl:a 2> nl:b
+if ERRORLEVEL 1 (
+  cd ..
+  echo "Could not find idp.properties in IdP package"
+  goto done;
+)
+
+cd ..
+
+for /D %%X in (idp-extract/*) do set idpex=%%X
+"%WIX%/BIN/HEAT" dir idp-extract\%idpex% -platform -gg -dr IDPROOT -var var.idpSrc -cg IdPGroup -out idp_contents.wxs
 if ERRORLEVEL 1 goto done
 
-"%WIX%/BIN/LIGHT" -out idp.msi -ext WixUIExtension idp.wixobj
+
+REM Build
+"%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=. idp.wxs
+if ERRORLEVEL 1 goto done
+
+"%WIX%/BIN/LIGHT" -nologo -out idp.msi -ext WixUIExtension idp.wixobj idp_contents.wixobj
+if ERRORLEVEL 1 goto done
+
+dir idp.msi
 
 REM Tidy up in the Sucessful exit case
    del *.wixobj *.wixpdb
-   del jetty.msm
+   rd /s /q idp-extract
 
 :done
 

Modified: trunk/idp-installer/src/main/wix/IdP.wixproj
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/wix/IdP.wixproj?rev=6458&r1=6457&r2=6458&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/IdP.wixproj (original)
+++ trunk/idp-installer/src/main/wix/IdP.wixproj Fri Aug 22 10:50:29 2014
@@ -25,6 +25,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="IdP.wxs" />
+    <Compile Include="idp_contents.wxs" />
   </ItemGroup>
   <Import Project="$(WixTargetsPath)" />
   <!--

Modified: trunk/idp-installer/src/main/wix/IdP.wxs
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/wix/IdP.wxs?rev=6458&r1=6457&r2=6458&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/IdP.wxs (original)
+++ trunk/idp-installer/src/main/wix/IdP.wxs Fri Aug 22 10:50:29 2014
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Product Id="*" Name="IdP" Language="1033" Version="1.0.0.0" Manufacturer="Microsoft" UpgradeCode="8d3bfb53-47ff-4cbc-9363-cbf9e46bedc4">
-	<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
+    <Product Id="*" Name="IdP" Language="1033" Version="0.0.3.0" Manufacturer="Microsoft" UpgradeCode="8d3bfb53-47ff-4cbc-9363-cbf9e46bedc4">
+	<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Platform="x86"/>
 
-	<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
+	<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." Schedule="afterInstallInitialize"/>
 	<MediaTemplate EmbedCab="yes"/>
 
 	<Feature Id="ProductFeature" Title="IdP" Level="1">
-	    <ComponentRef Id="ProductComponents" />
+	    <ComponentGroupRef Id="IdPGroup"/>

[... 120 lines stripped ...]