[cpp-sp COMMIT] in /branches/REL_2: configs/keygen.bat-wix msi/WiX/ShibbolethSP-noarch.wxs msi/WiX/testInstall.wxs ms...

[noreply at shibboleth.net]

Author: rdw
Date: Fri Apr 13 13:55:01 2012
New Revision: 3620

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3620&view=rev
Log:
Handle the move of openSSL from \opt.  Call keygen.bat during install

Added:
    branches/REL_2/configs/keygen.bat-wix
    branches/REL_2/msi/scripts/shib_edit_config_files.vbs-wix
Modified:
    branches/REL_2/msi/WiX/ShibbolethSP-noarch.wxs
    branches/REL_2/msi/WiX/testInstall.wxs

Modified: branches/REL_2/msi/WiX/ShibbolethSP-noarch.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/ShibbolethSP-noarch.wxs?rev=3620&r1=3619&r2=3620&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-noarch.wxs (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-noarch.wxs Fri Apr 13 13:55:01 2012
@@ -54,7 +54,7 @@
             <File Name='example-shibboleth2.xml' />
           </Component>
           <Component Id='etc_shibboleth_nonperm' Guid='{A5BBCB8B-42B3-4402-B66D-66D2971F509F}'>
-            <File Name='keygen.bat' KeyPath='yes' />
+            <File Name='keygen.bat' KeyPath='yes' Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\configs\keygen.bat-wix'/>
             <File Name='xsltproc.js' />
           </Component>
           <Directory Id='etc_shibboleth_dist' Name='dist' 
@@ -214,13 +214,18 @@
     <Condition Message='You must uninstall recent versions of Shibboleth before using this installer. To uninstall, use the &quot;Change&quot; option from the Add/Remove dialog and then Remove. Attempting to uninstall directly causes the installer to hang on most systems.'>SHIB_OLDVERSION = "none"</Condition>
 
     <!-- The actions to perform after the files have been copied -->
-    <Binary Id='EditConfigFileSrc' SourceFile='$(var.BuildDirectory)\cvs\2.0\cpp-sp\msi\scripts\shib_edit_config_files.vbs' />
+    <Binary Id='EditConfigFileSrc' SourceFile='$(var.BuildDirectory)\cvs\2.0\cpp-sp\msi\scripts\shib_edit_config_files.vbs-wix' />
+    <Binary Id='KeyGenSrc' SourceFile='$(var.BuildDirectory)\cvs\2.0\cpp-sp\msi\scripts\shib_keygen.vbs' />
     <CustomAction Id='EditConfigFiles' 
                   BinaryKey='EditConfigFileSrc' VBScriptCall='' Execute='deferred' Impersonate='no' />
-    <CustomAction Id='SetEditConfigFiles' Property='EditConfigFiles' Value='[INSTALLDIR];@;[SHIBD_PORT]' />
+    <CustomAction Id='SetEditConfigFiles' Property='EditConfigFiles' Value='[INSTALLDIR];@;[SHIBD_PORT];@;[ProgramFilesFolder]' />
+    <CustomAction Id='KeyGen' BinaryKey='KeyGenSrc' VBScriptCall='' Execute='deferred' Impersonate='no' />
+    <CustomAction Id='SetKeyGen' Property='KeyGen' Value='[INSTALLDIR]' />
     <InstallExecuteSequence>
       <Custom Action='SetEditConfigFiles' Before='CostInitialize'>NOT Installed</Custom>
       <Custom Action='EditConfigFiles' After='InstallFiles'>NOT Installed</Custom>
+      <Custom Action='SetKeyGen' Before='CostInitialize'>NOT Installed</Custom>
+      <Custom Action='KeyGen' After='EditConfigFiles'>NOT Installed</Custom>
     </InstallExecuteSequence>
 
     <!-- Components

Modified: branches/REL_2/msi/WiX/testInstall.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/testInstall.wxs?rev=3620&r1=3619&r2=3620&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/testInstall.wxs (original)
+++ branches/REL_2/msi/WiX/testInstall.wxs Fri Apr 13 13:55:01 2012
@@ -21,7 +21,7 @@
            Version='1.0.0.0' Manufacturer='Shibboleth Consortium'>
     <Package Description='TEST Windows Installer package'
              Comments='Ignore Ignore Ignore Ignore'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='200' Compressed='yes' />
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Compressed='yes' />
 
     <Media Id='1' Cabinet='product.cab' EmbedCab='yes' />
     <!-- Files -->
@@ -53,7 +53,15 @@
           </Directory>
         </Directory>
       </Directory>
+      <Directory Id='SystemFolder' >
+        <!-- Note that this will cause warning at link time which can
+        be safely ignored
+        http://blogs.msdn.com/b/astebner/archive/2007/02/13/building-an-msi-using-wix-v3-0-that-includes-the-vc-8-0-runtime-merge-modules.aspx-->
+       <Merge Id='Microsoft_VC100_DebugCRT_x86' Language='1033' SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC100_DebugCRT_x86.msm' DiskId='1' />
+        <Merge Id='Microsoft_VC100_CRT_x86' Language='1033' SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC100_CRT_x86.msm' DiskId='1' />
+      </Directory>
     </Directory>
+
     <!-- Feature -->
     <Feature Id='MyFeature' Title='My 1st Feature' Level='1'>
       <ComponentRef Id='MyComponent' />
@@ -112,6 +120,8 @@
       <MergeRef Id='XercesMergeModule_x86' />
       <MergeRef Id='XmlSecMergeModule_x86' />
       <MergeRef Id='XmlToolingMergeModule_x86' />
+      <MergeRef Id='Microsoft_VC100_CRT_x86' />
+      <MergeRef Id='Microsoft_VC100_DebugCRT_x86' />

[... 4 lines stripped ...]