SSPCPP-506 - use lit to put the common objects into a library

https://issues.shibboleth.net/jira/browse/SSPCPP-506

diff --git a/msi/WiX/Compile.bat b/msi/WiX/Compile.bat
index 8f2ee75..9bf35d0 100644 (file)
--- a/msi/WiX/Compile.bat
+++ b/msi/WiX/Compile.bat
@@ -25,9 +25,12 @@ wixcop -indent:2 ShibbolethSP-install-dlg.wxs
 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

diff --git a/msi/WiX/Versions.wxi b/msi/WiX/Versions.wxi
index 4de06c2..49d16b7 100644 (file)
--- a/msi/WiX/Versions.wxi
+++ b/msi/WiX/Versions.wxi
@@ -17,8 +17,8 @@
    permissions and limitations under the License.  -->\r
 \r
 <Include xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <?define BuildDirectory='C:\Users\Administrator\Shibboleth\' ?>\r
-  <?define SPBuildDirectory='C:\Users\Administrator\Shibboleth\svn\2.5\' ?>\r
+  <?define BuildDirectory='G:\Downloads\shib\' ?>\r
+  <?define SPBuildDirectory='G:\Downloads\shib\cvs\2.0\' ?>\r
   \r
   <!-- Do not confuse ShibbolethDllVersion with ShibbolethVersion -->\r
   <?define ShibbolethVersion='2.5.0'?>\r
@@ -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' -->\r
   <?define XercesFileVersion='3_1' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->\r
 \r
-  <?define XmlSecVersion='1.7.0' ?><!-- '$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Release No Xalan' -->\r
-  <?define XmlSecFileVersion='1_7' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->\r
+  <?define XmlSecVersion='1.6.0' ?><!-- '$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Release No Xalan' -->\r
+  <?define XmlSecFileVersion='1_6' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->\r
 \r
   <?define XmlToolingVersion='1.5.1' ?>\r
   <?define XmlToolingFileVersion='1_5' ?><!--'xmltooling$(var.XmlToolingFileVersion)D.dll'-->\r