Remover versions.wxi and inline component IDs from wxs files.

Fix a few bugs in the make file.

We can only build from the IDE now and hence versions.wxi and compile.bat are no more.

diff --git a/msi/WiX/Compile.bat b/msi/WiX/Compile.bat
deleted file mode 100644 (file)
index 9bf35d0..0000000
--- a/msi/WiX/Compile.bat
+++ /dev/null
@@ -1,36 +0,0 @@
-PATH=%PATH%;"C:\Program Files (x86)\Windows Installer XML v3.5\bin"
-
-wixcop -indent:2 ShibbolethSP-exe-x64.wxs
-candle ShibbolethSP-exe-x64.wxs
-
-wixcop -indent:2 ShibbolethSP-registry-x64.wxs
-candle ShibbolethSP-registry-x64.wxs
-
-wixcop -indent:2 ShibbolethSP-noarch.wxs
-candle ShibbolethSP-noarch.wxs
-
-wixcop -indent:2 ShibbolethSP-exe-x86.wxs
-candle ShibbolethSP-exe-x86.wxs
-
-wixcop -indent:2 ShibbolethSP-registry-x86.wxs
-candle ShibbolethSP-registry-x86.wxs
-
-wixcop -indent:2 ShibbolethSP-gui.wxs
-candle ShibbolethSP-gui.wxs
-
-wixcop -indent:2 ShibbolethSP-update-dlg.wxs
-candle ShibbolethSP-update-dlg.wxs
-
-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  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 Shibboleth.wixlib -ext WixUtilExtension.dll -ext WixUIExtension  -ext WixIISExtension

diff --git a/msi/WiX/Installer.make b/msi/WiX/Installer.make
index fca059b..1c412d2 100644 (file)
--- a/msi/WiX/Installer.make
+++ b/msi/WiX/Installer.make
@@ -41,7 +41,7 @@ ShibbolethSP-exe-x64.wixobj: ShibbolethSP-exe-x64.wxs ..\..\x64\Release\shibd.ex
 
 ShibbolethSP-registry-x64.wixobj: ShibbolethSP-registry-x64.wxs
        wixcop -indent:2 ShibbolethSP-registry-x64.wxs
-       candle ShibbolethSP-registry-x64.wxs
+       candle -dSPBuildDirectory=$(SolutionDir).. ShibbolethSP-registry-x64.wxs
 
 ShibbolethSP-noarch.wixobj: ShibbolethSP-noarch.wxs
        wixcop -indent:2 ShibbolethSP-noarch.wxs
@@ -53,11 +53,11 @@ ShibbolethSP-exe-x86.wixobj: ShibbolethSP-exe-x86.wxs  ..\..\Release\shibd.exe .
 
 ShibbolethSP-registry-x86.wixobj: ShibbolethSP-registry-x86.wxs
        wixcop -indent:2 ShibbolethSP-registry-x86.wxs
-       candle ShibbolethSP-registry-x86.wxs
+       candle -dSPBuildDirectory=$(SolutionDir).. ShibbolethSP-registry-x86.wxs
 
 ShibbolethSP-gui.wixobj: ShibbolethSP-gui.wxs
        wixcop -indent:2 ShibbolethSP-gui.wxs
-       candle ShibbolethSP-gui.wxs
+       candle -dSPBuildDirectory=$(SolutionDir).. ShibbolethSP-gui.wxs
 
 ShibbolethSP-update-dlg.wixobj: ShibbolethSP-update-dlg.wxs
        wixcop -indent:2 ShibbolethSP-update-dlg.wxs
@@ -69,7 +69,7 @@ ShibbolethSP-install-dlg.wixobj: ShibbolethSP-install-dlg.wxs
 
 ShibbolethSP-main-x64.wixobj: ShibbolethSP-main-x64.wxs MergeModules\Curl-x86.msm MergeModules\FastCGI-x86.msm MergeModules\Log4Shib-x86.msm MergeModules\OpenSAML-x86.msm MergeModules\OpenSAML-schemas.msm MergeModules\OpenSSL-x86.msm MergeModules\Shibboleth-x86.msm MergeModules\Shibboleth-schemas.msm MergeModules\Xerces-x86.msm MergeModules\XmlSec-x86.msm MergeModules\Zlib-x86.msm MergeModules\Curl-x64.msm MergeModules\FastCGI-x64.msm MergeModules\Log4Shib-x64.msm MergeModules\OpenSAML-x64.msm MergeModules\OpenSSL-x64.msm MergeModules\Shibboleth-x64.msm MergeModules\Xerces-x64.msm MergeModules\XmlSec-x64.msm MergeModules\Zlib-x64.msm
        wixcop -indent:2 ShibbolethSP-main-x64.wxs
-       candle -dSPBuildDirectory=$(SolutionDir)..-dShibbolethVersion=$(ShibbolethVersion) -dShibbolethId64=$(ShibbolethId64) -dShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethSP-main-x64.wxs
+       candle -dSPBuildDirectory=$(SolutionDir).. -dShibbolethVersion=$(ShibbolethVersion) -dShibbolethId64=$(ShibbolethId64) -dShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethSP-main-x64.wxs
 
 ShibbolethSP-main-x86.wixobj: ShibbolethSP-main-x86.wxs MergeModules\Curl-x86.msm MergeModules\FastCGI-x86.msm MergeModules\Log4Shib-x86.msm MergeModules\OpenSAML-x86.msm MergeModules\OpenSAML-schemas.msm MergeModules\OpenSSL-x86.msm MergeModules\Shibboleth-x86.msm MergeModules\Shibboleth-schemas.msm MergeModules\Xerces-x86.msm MergeModules\XmlSec-x86.msm MergeModules\Zlib-x86.msm
        wixcop -indent:2 ShibbolethSP-main-x86.wxs

diff --git a/msi/WiX/Installer.vcxproj b/msi/WiX/Installer.vcxproj
index af64161..4b7ae61 100644 (file)
--- a/msi/WiX/Installer.vcxproj
+++ b/msi/WiX/Installer.vcxproj
@@ -67,8 +67,23 @@ del *64.wixpdb</NMakeCleanCommandLine>
   <ItemDefinitionGroup>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <None Include="Dialog.bmp" />
+    <None Include="license.rtf" />
+    <None Include="ShibbolethSP-defs-x86.wxi" />
+    <None Include="ShibbolethSP-exe-x64.wxs" />
+    <None Include="ShibbolethSP-exe-x86.wxs" />
+    <None Include="ShibbolethSP-gui.wxs" />
+    <None Include="ShibbolethSP-install-dlg.wxs" />
+    <None Include="ShibbolethSP-main-x64.wxs" />
+    <None Include="ShibbolethSP-main-x86.wxs" />
+    <None Include="ShibbolethSP-noarch.wxs" />
+    <None Include="ShibbolethSP-properties.wxi" />
+    <None Include="ShibbolethSP-registry-x64.wxs" />
+    <None Include="ShibbolethSP-registry-x86.wxs" />
+    <None Include="ShibbolethSP-update-dlg.wxs" />
+    <None Include="TopBanner.bmp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

diff --git a/msi/WiX/ShibbolethSP-exe-x64.wxs b/msi/WiX/ShibbolethSP-exe-x64.wxs
index 1dc85df..b94b70d 100644 (file)
--- a/msi/WiX/ShibbolethSP-exe-x64.wxs
+++ b/msi/WiX/ShibbolethSP-exe-x64.wxs
@@ -16,8 +16,6 @@
    implied.  See the License for the specific language governing
    permissions and limitations under the License.  -->
 
-<?include Versions.wxi ?>
-
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <!-- This is where we put all executables & so & dlls which make up the SP X86 installer -->
   <Fragment>

diff --git a/msi/WiX/ShibbolethSP-exe-x86.wxs b/msi/WiX/ShibbolethSP-exe-x86.wxs
index c9066db..e67d03f 100644 (file)
--- a/msi/WiX/ShibbolethSP-exe-x86.wxs
+++ b/msi/WiX/ShibbolethSP-exe-x86.wxs
@@ -16,8 +16,6 @@
    implied.  See the License for the specific language governing
    permissions and limitations under the License.  -->
 
-<?include Versions.wxi ?>
-
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <!-- This is where we put all executables & so & dlls which make up the SP X86 installer -->
   <Fragment>

diff --git a/msi/WiX/ShibbolethSP-gui.wxs b/msi/WiX/ShibbolethSP-gui.wxs
index d8d7119..1ed20d1 100644 (file)
--- a/msi/WiX/ShibbolethSP-gui.wxs
+++ b/msi/WiX/ShibbolethSP-gui.wxs
@@ -16,8 +16,6 @@
      implied.  See the License for the specific language governing
      permissions and limitations under the License.  -->
 
-<?include Versions.wxi ?>
-
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <!-- This file controls the dispaying of the GUI dialogs (both WiX and custom) -->
   <Fragment>

diff --git a/msi/WiX/ShibbolethSP-main-x64.wxs b/msi/WiX/ShibbolethSP-main-x64.wxs
index 951566d..3905ca3 100644 (file)
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -16,9 +16,6 @@
    implied.  See the License for the specific language governing
    permissions and limitations under the License.  -->
 
-<?include Versions.wxi ?>
-<?define ShibbolethId64='{65F34F66-573F-432D-A6F4-B5E1D417A6DA}' ?>
-
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Product Id='$(var.ShibbolethId64)' Language='1033' 
            Manufacturer='Shibboleth Consortium' Name='Shibboleth Service Provider' 

diff --git a/msi/WiX/ShibbolethSP-main-x86.wxs b/msi/WiX/ShibbolethSP-main-x86.wxs
index 90669b5..fc61b26 100644 (file)
--- a/msi/WiX/ShibbolethSP-main-x86.wxs
+++ b/msi/WiX/ShibbolethSP-main-x86.wxs
@@ -16,9 +16,6 @@
    implied.  See the License for the specific language governing
    permissions and limitations under the License.  -->
 
-<?include Versions.wxi ?>
-<?define ShibbolethId32='{68D3C057-1C6D-4C3C-9E5B-7A6A8CA0BA74}' ?>
-
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Product Id='$(var.ShibbolethId32)' Language='1033' 
            Manufacturer='Shibboleth Consortium' Name='Shibboleth Service Provider' 

diff --git a/msi/WiX/ShibbolethSP-noarch.wxs b/msi/WiX/ShibbolethSP-noarch.wxs
index 569e3cd..25254b4 100644 (file)
--- a/msi/WiX/ShibbolethSP-noarch.wxs
+++ b/msi/WiX/ShibbolethSP-noarch.wxs
@@ -15,8 +15,6 @@
      implied.  See the License for the specific language governing
      permissions and limitations under the License.  -->
 
-<?include Versions.wxi ?>
-
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <!--
     This is where we put all the architecture neutral bits of the

diff --git a/msi/WiX/ShibbolethSP-registry-x64.wxs b/msi/WiX/ShibbolethSP-registry-x64.wxs
index fa04af6..3d236a9 100644 (file)
--- a/msi/WiX/ShibbolethSP-registry-x64.wxs
+++ b/msi/WiX/ShibbolethSP-registry-x64.wxs
@@ -16,8 +16,6 @@
    implied.  See the License for the specific language governing
    permissions and limitations under the License.  -->
 
-<?include Versions.wxi ?>
-
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <!--
     This is where we put all the architecture neutral bits of the

diff --git a/msi/WiX/ShibbolethSP-registry-x86.wxs b/msi/WiX/ShibbolethSP-registry-x86.wxs
index d100099..75d3afc 100644 (file)
--- a/msi/WiX/ShibbolethSP-registry-x86.wxs
+++ b/msi/WiX/ShibbolethSP-registry-x86.wxs
@@ -16,8 +16,6 @@
    implied.  See the License for the specific language governing
    permissions and limitations under the License.  -->
 
-<?include Versions.wxi ?>
-
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <!--
     This is where we put all the architecture neutral bits of the

diff --git a/msi/WiX/Versions.wxi b/msi/WiX/Versions.wxi
deleted file mode 100644 (file)
index 242a760..0000000
--- a/msi/WiX/Versions.wxi
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
-   Development, Inc. (UCAID) under one or more contributor license
-   agreements.  See the NOTICE file distributed with this work for
-   additional information regarding copyright ownership. The UCAID
-   licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
- 
-     http://www.apache.org/licenses/LICENSE-2.0
- 
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied.  See the License for the specific language governing
-   permissions and limitations under the License.  -->
-
-<Include xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-  <?define BuildDirectory='C:\perforce\ShibbolethBuild\' ?>
-  <?define SPBuildDirectory='C:\Users\rdw\ShibbolethSp\' ?>
-  
-  <!-- Do not confuse ShibbolethDllVersion with ShibbolethVersion -->
-  <?define ShibbolethVersion='2.5.1'?>
-  <!-- DO NOT CHANGE UpgradeCode -->
-  <?define ShibbolethUpgradeCode='{28A4EB62-E860-49CA-BE43-44ADEB91DBF6}' ?>
-
-  <?define CurlVersion='7.26.0' ?>
-
-  <?define FastCGIVersion='2.4.0' ?>
-
-  <?define LogForShibVersion='1.0.5' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->
-
-  <?define LogForShibFileVersion='1_0' ?> <!-- '$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\x64\Release\'> -->
-
-  <?define OpenSAMLVersion='2.5.0' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->
-  <?define OpenSAMLFileVersion='2_5' ?><!-- 'saml$(var.OpenSAMLFileVersion).dll' -->
-
-  <?define OpenSSLVersion='1.0.1.3' ?><!-- 1.0.1c -->
-  <?define OpenSSLDirVersion='1.0.1c' ?><!-- '$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll.dbg\'> -->
-  <?define OpenSSLFileVersion='1_0' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->
-
-  <!-- Do not confuse ShibbolethDllVersion with ShibbolethVersion -->
-  <?define ShibbolethDllFileVersion='1_5' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->
-  <?define ShibbolethDllVersion='1.5.1' ?>
-
-  <?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 XmlToolingVersion='1.5.1' ?>
-  <?define XmlToolingFileVersion='1_5' ?><!--'xmltooling$(var.XmlToolingFileVersion)D.dll'-->
-
-  <?define ZlibVersion='1.2.7' ?><!--'$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\Release\zlib$(var.ZlibFileVersion).dll'-->
-  <?define ZlibFileVersion='1' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->
-</Include>