[cpp-sp COMMIT] in /branches/REL_2/msi/WiX: Compile.bat Versions.wxi

[noreply at shibboleth.net]

Author: rdw
Date: Mon Sep 24 12:29:19 2012
New Revision: 3766

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3766&view=rev
Log:
https://issues.shibboleth.net/jira/browse/SSPCPP-506 use lit to put the common objects into a library

Modified:
    branches/REL_2/msi/WiX/Compile.bat
    branches/REL_2/msi/WiX/Versions.wxi

Modified: branches/REL_2/msi/WiX/Compile.bat
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/Compile.bat?rev=3766&r1=3765&r2=3766&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/Compile.bat (original)
+++ branches/REL_2/msi/WiX/Compile.bat Mon Sep 24 12:29:19 2012
@@ -25,9 +25,12 @@
 candle ShibbolethSP-install-dlg.wxs
 
 wixcop -indent:2 ShibbolethSP-main-x64.wxs
+
+lit -pedantic -out  Shibboleth.wixlib ShibbolethSP-noarch.wixobj ShibbolethSP-exe-x86.wixobj ShibbolethSP-registry-x86.wixobj  ShibbolethSP-gui.wixobj ShibbolethSP-update-dlg.wixobj ShibbolethSP-install-dlg.wixobj
+
 candle ShibbolethSP-main-x64.wxs
-light -sw1055 -sice:ICE82 -o shibboleth-sp-2.5.0-win64.msi ShibbolethSP-main-x64.wixobj ShibbolethSP-exe-x64.wixobj ShibbolethSP-registry-x64.wixobj  ShibbolethSP-noarch.wixobj ShibbolethSP-exe-x86.wixobj ShibbolethSP-registry-x86.wixobj ShibbolethSP-gui.wixobj ShibbolethSP-update-dlg.wixobj ShibbolethSP-install-dlg.wixobj -ext WixUtilExtension.dll -ext WixUIExtension -ext WixIISExtension
+light -sw1055 -sice:ICE82 -o shibboleth-sp-2.5.0-win64.msi ShibbolethSP-main-x64.wixobj ShibbolethSP-exe-x64.wixobj ShibbolethSP-registry-x64.wixobj  Shibboleth.wixlib -ext WixUtilExtension.dll -ext WixUIExtension -ext WixIISExtension
 
 wixcop -indent:2 ShibbolethSP-main-x86.wxs
 candle ShibbolethSP-main-x86.wxs
-light -sw1055 -sice:ICE82 -o shibboleth-sp-2.5.0-win32.msi ShibbolethSP-main-x86.wixobj ShibbolethSP-noarch.wixobj ShibbolethSP-exe-x86.wixobj ShibbolethSP-registry-x86.wixobj  ShibbolethSP-gui.wixobj ShibbolethSP-update-dlg.wixobj ShibbolethSP-install-dlg.wixobj -ext WixUtilExtension.dll -ext WixUIExtension  -ext WixIISExtension
+light -sw1055 -sice:ICE82 -o shibboleth-sp-2.5.0-win32.msi ShibbolethSP-main-x86.wixobj Shibboleth.wixlib -ext WixUtilExtension.dll -ext WixUIExtension  -ext WixIISExtension

Modified: branches/REL_2/msi/WiX/Versions.wxi
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/Versions.wxi?rev=3766&r1=3765&r2=3766&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/Versions.wxi (original)
+++ branches/REL_2/msi/WiX/Versions.wxi Mon Sep 24 12:29:19 2012
@@ -17,8 +17,8 @@
    permissions and limitations under the License.  -->
 
 <Include xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-  <?define BuildDirectory='C:\Users\Administrator\Shibboleth\' ?>
-  <?define SPBuildDirectory='C:\Users\Administrator\Shibboleth\svn\2.5\' ?>
+  <?define BuildDirectory='G:\Downloads\shib\' ?>
+  <?define SPBuildDirectory='G:\Downloads\shib\cvs\2.0\' ?>
   
   <!-- Do not confuse ShibbolethDllVersion with ShibbolethVersion -->
   <?define ShibbolethVersion='2.5.0'?>
@@ -47,8 +47,8 @@
   <?define XercesVersion='3.1.1' ?><!-- $(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86_64-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion).dll' -->
   <?define XercesFileVersion='3_1' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->
 
-  <?define XmlSecVersion='1.7.0' ?><!-- '$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Release No Xalan' -->
-  <?define XmlSecFileVersion='1_7' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->
+  <?define XmlSecVersion='1.6.0' ?><!-- '$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Release No Xalan' -->
+  <?define XmlSecFileVersion='1_6' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->
 
   <?define XmlToolingVersion='1.5.1' ?>
   <?define XmlToolingFileVersion='1_5' ?><!--'xmltooling$(var.XmlToolingFileVersion)D.dll'-->