Exbed parameterization into a common header (prior to eventual movement into a .wixpr...

diff --git a/msi/WiX/MergeModules/Curl-x64.wxs b/msi/WiX/MergeModules/Curl-x64.wxs
index 857d5f2..c213b6b 100644 (file)
--- a/msi/WiX/MergeModules/Curl-x64.wxs
+++ b/msi/WiX/MergeModules/Curl-x64.wxs
@@ -16,8 +16,7 @@
    implied.  See the License for the specific language governing\r
    permissions and limitations under the License.  -->\r
 \r
-<?define BuildDirectory='G:\Downloads\shib\' ?>\r
-<?define CurlVersion='7.21.2' ?>\r
+<?include ..\Versions.wxi ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <Module Id='CurlMergeModule_x64' Language='1033' Version='$(var.CurlVersion)'>\r

diff --git a/msi/WiX/MergeModules/Curl-x86.wxs b/msi/WiX/MergeModules/Curl-x86.wxs
index 2272bdc..0432343 100644 (file)
--- a/msi/WiX/MergeModules/Curl-x86.wxs
+++ b/msi/WiX/MergeModules/Curl-x86.wxs
@@ -16,8 +16,7 @@
    implied.  See the License for the specific language governing\r
    permissions and limitations under the License.  -->\r
 \r
-<?define BuildDirectory='G:\Downloads\shib\' ?>\r
-<?define CurlVersion='7.21.2' ?>\r
+<?include ..\Versions.wxi ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <Module Id='CurlMergeModule_x86' Language='1033' Version='$(var.CurlVersion)'>\r

diff --git a/msi/WiX/MergeModules/FastCGI-x64.wxs b/msi/WiX/MergeModules/FastCGI-x64.wxs
index 0baf43a..e727845 100644 (file)
--- a/msi/WiX/MergeModules/FastCGI-x64.wxs
+++ b/msi/WiX/MergeModules/FastCGI-x64.wxs
@@ -16,8 +16,7 @@
    implied.  See the License for the specific language governing\r
    permissions and limitations under the License.  -->\r
 \r
-<?define BuildDirectory='G:\Downloads\shib\' ?>\r
-<?define FastCGIVersion='2.4.0' ?>\r
+<?include ..\Versions.wxi ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <Module Id='FastCGIMergeModule_x64' Language='1033' Version='$(var.FastCGIVersion)'>\r

diff --git a/msi/WiX/MergeModules/FastCGI-x86.wxs b/msi/WiX/MergeModules/FastCGI-x86.wxs
index a172c66..3e8e3fb 100644 (file)
--- a/msi/WiX/MergeModules/FastCGI-x86.wxs
+++ b/msi/WiX/MergeModules/FastCGI-x86.wxs
@@ -16,8 +16,7 @@
    implied.  See the License for the specific language governing\r
    permissions and limitations under the License.  -->\r
 \r
-<?define BuildDirectory='G:\Downloads\shib\' ?>\r
-<?define FastCGIVersion='2.4.0' ?>\r
+<?include ..\Versions.wxi ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <Module Id='FastCGIMergeModule_x86' Language='1033' Version='$(var.FastCGIVersion)'>\r

diff --git a/msi/WiX/MergeModules/Log4Shib-x64.wxs b/msi/WiX/MergeModules/Log4Shib-x64.wxs
index 417798d..4e1bc49 100644 (file)
--- a/msi/WiX/MergeModules/Log4Shib-x64.wxs
+++ b/msi/WiX/MergeModules/Log4Shib-x64.wxs
@@ -16,9 +16,7 @@
    implied.  See the License for the specific language governing\r
    permissions and limitations under the License.  -->\r
 \r
-<?define BuildDirectory='G:\Downloads\shib\' ?>\r
-<?define LogForShibVersion='1.0.5' ?>\r
-<?define LogForShibFileVersion='1_0' ?>\r
+<?include ..\Versions.wxi ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <Module Id='Log4ShibMergeModule_x86' Language='1033' Version='$(var.LogForShibVersion)'>\r

diff --git a/msi/WiX/MergeModules/Log4Shib-x86.wxs b/msi/WiX/MergeModules/Log4Shib-x86.wxs
index 3553681..e92ea61 100644 (file)
--- a/msi/WiX/MergeModules/Log4Shib-x86.wxs
+++ b/msi/WiX/MergeModules/Log4Shib-x86.wxs
@@ -16,9 +16,7 @@
    implied.  See the License for the specific language governing\r
    permissions and limitations under the License.  -->\r
 \r
-<?define BuildDirectory='G:\Downloads\shib\' ?>\r
-<?define LogForShibVersion='1.0.5' ?>\r
-<?define LogForShibFileVersion='1_0' ?>\r
+<?include ..\Versions.wxi ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <Module Id='Log4ShibMergeModule_x86' Language='1033' Version='$(var.LogForShibVersion)'>\r

diff --git a/msi/WiX/MergeModules/OpenSAML-schemas.wxs b/msi/WiX/MergeModules/OpenSAML-schemas.wxs
index 446fa74..d3411b4 100644 (file)
--- a/msi/WiX/MergeModules/OpenSAML-schemas.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-schemas.wxs
@@ -15,11 +15,10 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
      implied.  See the License for the specific language governing\r
      permissions and limitations under the License.  -->\r
-\r
-<?define BuildDirectory='G:\Downloads\shib\' ?>\r
-<?define OpenSAMLVersion='2.4.3' ?>\r
+<?include ..\Versions.wxi ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
+\r
   <Module Id='OpenSAMLMergeModule_schemas' Language='1033' Version='$(var.OpenSAMLVersion)'>\r
     <Package Id='{8567178A-EEA1-4798-9D20-C2E2F7247D0F}' Description='Merge Module for OpenSAML schemas'\r
              Comments='This module is built by the Shibboleth Consortium'\r

diff --git a/msi/WiX/MergeModules/OpenSAML-x64.wxs b/msi/WiX/MergeModules/OpenSAML-x64.wxs
index 363cd39..b3ddd1e 100644 (file)
--- a/msi/WiX/MergeModules/OpenSAML-x64.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-x64.wxs
@@ -16,9 +16,7 @@
    implied.  See the License for the specific language governing\r
    permissions and limitations under the License.  -->\r
 \r
-<?define BuildDirectory='G:\Downloads\shib\' ?>\r
-<?define OpenSAMLVersion='2.4.3' ?> \r
-<?define OpenSAMLFileVersion='2_4' ?>\r
+<?include ..\Versions.wxi ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <Module Id='OpenSAMLMergeModule_x64' Language='1033' Version='$(var.OpenSAMLVersion)'>\r

diff --git a/msi/WiX/MergeModules/OpenSAML-x86.wxs b/msi/WiX/MergeModules/OpenSAML-x86.wxs
index 6f644b5..bf13737 100644 (file)
--- a/msi/WiX/MergeModules/OpenSAML-x86.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-x86.wxs
@@ -16,9 +16,7 @@
    implied.  See the License for the specific language governing\r
    permissions and limitations under the License.  -->\r
 \r
-<?define BuildDirectory='G:\Downloads\shib\' ?>\r
-<?define OpenSAMLVersion='2.4.3' ?> \r
-<?define OpenSAMLFileVersion='2_4' ?>\r
+<?include ..\Versions.wxi ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <Module Id='OpenSAMLMergeModule_x86' Language='1033' Version='$(var.OpenSAMLVersion)'>\r

diff --git a/msi/WiX/MergeModules/OpenSSL-x64.wxs b/msi/WiX/MergeModules/OpenSSL-x64.wxs
index 4a32c4f..3395855 100644 (file)
--- a/msi/WiX/MergeModules/OpenSSL-x64.wxs
+++ b/msi/WiX/MergeModules/OpenSSL-x64.wxs
@@ -16,10 +16,7 @@
    implied.  See the License for the specific language governing\r
    permissions and limitations under the License.  -->\r
 \r
-<?define BuildDirectory='G:\Downloads\shib\' ?>\r
-<?define OpenSSLVersion='1.0.0.10' ?><!-- 1.0.0a -->\r
-<?define OpenSSLDirVersion='1.0.0a' ?>\r
-<?define OpenSSLFileVersion='1_0_0' ?>\r
+<?include ..\Versions.wxi ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <Module Id='OpenSSLMergeModule_x64' Language='1033' Version='$(var.OpenSSLVersion)'>\r

diff --git a/msi/WiX/MergeModules/OpenSSL-x86.wxs b/msi/WiX/MergeModules/OpenSSL-x86.wxs
index 09e2e1a..afdcf34 100644 (file)
--- a/msi/WiX/MergeModules/OpenSSL-x86.wxs
+++ b/msi/WiX/MergeModules/OpenSSL-x86.wxs
@@ -16,10 +16,7 @@
    implied.  See the License for the specific language governing\r
    permissions and limitations under the License.  -->\r
 \r
-<?define BuildDirectory='G:\Downloads\shib\' ?>\r
-<?define OpenSSLVersion='1.0.0.10' ?><!-- 1.0.0a -->\r
-<?define OpenSSLDirVersion='1.0.0a' ?>\r
-<?define OpenSSLFileVersion='1_0_0' ?>\r
+<?include ..\Versions.wxi ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <Module Id='OpenSSLMergeModule_x86' Language='1033' Version='$(var.OpenSSLVersion)'>\r

diff --git a/msi/WiX/MergeModules/Shibboleth-x64.wxs b/msi/WiX/MergeModules/Shibboleth-x64.wxs
index 31a43a1..c0a52fd 100644 (file)
--- a/msi/WiX/MergeModules/Shibboleth-x64.wxs
+++ b/msi/WiX/MergeModules/Shibboleth-x64.wxs
@@ -15,10 +15,7 @@
    implied.  See the License for the specific language governing\r
    permissions and limitations under the License.  -->\r
 \r
-<?define BuildDirectory='G:\Downloads\shib\' ?>\r
-<?define ShibbolethSPFileVersion='1_4' ?>\r
-<?define ShibbolethVersion='1.4.2' ?>\r
-\r
+<?include ..\Versions.wxi ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <Module Id='ShibbolethSPMergeModule_x64' Language='1033' Version='$(var.ShibbolethVersion)'>\r

diff --git a/msi/WiX/MergeModules/Shibboleth-x86.wxs b/msi/WiX/MergeModules/Shibboleth-x86.wxs
index 16246a5..f34695d 100644 (file)
--- a/msi/WiX/MergeModules/Shibboleth-x86.wxs
+++ b/msi/WiX/MergeModules/Shibboleth-x86.wxs
@@ -15,10 +15,7 @@
    implied.  See the License for the specific language governing\r
    permissions and limitations under the License.  -->\r
 \r
-<?define BuildDirectory='G:\Downloads\shib\' ?>\r
-<?define ShibbolethSPFileVersion='1_4' ?>\r
-<?define ShibbolethVersion='1.4.2' ?>\r
-\r
+<?include ..\Versions.wxi ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <Module Id='ShibbolethSPMergeModule_x86' Language='1033' Version='$(var.ShibbolethVersion)'>\r

diff --git a/msi/WiX/MergeModules/Xerces-x64.wxs b/msi/WiX/MergeModules/Xerces-x64.wxs
index dd02a5f..289d3a2 100644 (file)
--- a/msi/WiX/MergeModules/Xerces-x64.wxs
+++ b/msi/WiX/MergeModules/Xerces-x64.wxs
@@ -16,9 +16,7 @@
    implied.  See the License for the specific language governing\r
    permissions and limitations under the License.  -->\r
 \r
-<?define BuildDirectory='G:\Downloads\shib\' ?>\r
-<?define XercesVersion='3.1.1' ?>\r
-<?define XercesFileVersion='3_1' ?>\r
+<?include ..\Versions.wxi ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <Module Id='XercesMergeModule_x86' Language='1033' Version='$(var.XercesVersion)'>\r

diff --git a/msi/WiX/MergeModules/Xerces-x86.wxs b/msi/WiX/MergeModules/Xerces-x86.wxs
index 0b2a3a6..a6522df 100644 (file)
--- a/msi/WiX/MergeModules/Xerces-x86.wxs
+++ b/msi/WiX/MergeModules/Xerces-x86.wxs
@@ -16,9 +16,7 @@
    implied.  See the License for the specific language governing\r
    permissions and limitations under the License.  -->\r
 \r
-<?define BuildDirectory='G:\Downloads\shib\' ?>\r
-<?define XercesVersion='3.1.1' ?>\r
-<?define XercesFileVersion='3_1' ?>\r
+<?include ..\Versions.wxi ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <Module Id='XercesMergeModule_x86' Language='1033' Version='$(var.XercesVersion)'>\r

diff --git a/msi/WiX/MergeModules/XmlSec-x64.wxs b/msi/WiX/MergeModules/XmlSec-x64.wxs
index e2d7291..537b0b9 100644 (file)
--- a/msi/WiX/MergeModules/XmlSec-x64.wxs
+++ b/msi/WiX/MergeModules/XmlSec-x64.wxs
@@ -16,9 +16,7 @@
      implied.  See the License for the specific language governing\r
      permissions and limitations under the License.  -->\r
 \r
-<?define BuildDirectory='G:\Downloads\shib\' ?>\r
-<?define XmlSecVersion='1.6.0' ?> <!-- 1.0.0a -->\r
-<?define XmlSecFileVersion='1_6' ?>\r
+<?include ..\Versions.wxi ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <Module Id='XmlSecmergemodule_x64' Language='1033' Version='$(var.XmlSecVersion)'>\r

diff --git a/msi/WiX/MergeModules/XmlSec-x86.wxs b/msi/WiX/MergeModules/XmlSec-x86.wxs
index ffe459b..b87251c 100644 (file)
--- a/msi/WiX/MergeModules/XmlSec-x86.wxs
+++ b/msi/WiX/MergeModules/XmlSec-x86.wxs
@@ -16,9 +16,7 @@
      implied.  See the License for the specific language governing\r
      permissions and limitations under the License.  -->\r
 \r
-<?define BuildDirectory='G:\Downloads\shib\' ?>\r
-<?define XmlSecVersion='1.6.0' ?> <!-- 1.0.0a -->\r
-<?define XmlSecFileVersion='1_6' ?>\r
+<?include ..\Versions.wxi ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <Module Id='XmlSecMergeModule_x86' Language='1033' Version='$(var.XmlSecVersion)'>\r

diff --git a/msi/WiX/MergeModules/XmlTooling-schemas.wxs b/msi/WiX/MergeModules/XmlTooling-schemas.wxs
index 49698e2..e10870b 100644 (file)
--- a/msi/WiX/MergeModules/XmlTooling-schemas.wxs
+++ b/msi/WiX/MergeModules/XmlTooling-schemas.wxs
@@ -15,8 +15,7 @@
    implied.  See the License for the specific language governing\r
    permissions and limitations under the License.  -->\r
 \r
-<?define BuildDirectory='G:\Downloads\shib\' ?>\r
-<?define XmlToolingVersion='1.4.2' ?>\r
+<?include ..\Versions.wxi ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <Module Id='XmlTooling_schemas' Language='1033' Version='$(var.XmlToolingVersion)'>\r

diff --git a/msi/WiX/MergeModules/XmlTooling-x64.wxs b/msi/WiX/MergeModules/XmlTooling-x64.wxs
index 2271e65..04384a0 100644 (file)
--- a/msi/WiX/MergeModules/XmlTooling-x64.wxs
+++ b/msi/WiX/MergeModules/XmlTooling-x64.wxs
@@ -16,9 +16,7 @@
    implied.  See the License for the specific language governing\r
    permissions and limitations under the License.  -->\r
 \r
-<?define BuildDirectory='G:\Downloads\shib\' ?>\r
-<?define XmlToolingVersion='1.4.2' ?> \r
-<?define XmlToolingFileVersion='1_4' ?>\r
+<?include ..\Versions.wxi ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <Module Id='XmlToolingMergeModule_x64' Language='1033' Version='$(var.XmlToolingVersion)'>\r

diff --git a/msi/WiX/MergeModules/XmlTooling-x86.wxs b/msi/WiX/MergeModules/XmlTooling-x86.wxs
index d892253..fbf3203 100644 (file)
--- a/msi/WiX/MergeModules/XmlTooling-x86.wxs
+++ b/msi/WiX/MergeModules/XmlTooling-x86.wxs
@@ -16,9 +16,7 @@
    implied.  See the License for the specific language governing\r
    permissions and limitations under the License.  -->\r
 \r
-<?define BuildDirectory='G:\Downloads\shib\' ?>\r
-<?define XmlToolingVersion='1.4.2' ?> \r
-<?define XmlToolingFileVersion='1_4' ?>\r
+<?include ..\Versions.wxi ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <Module Id='XmlToolingMergeModule_x86' Language='1033' Version='$(var.XmlToolingVersion)'>\r

diff --git a/msi/WiX/MergeModules/Zlib-x64.wxs b/msi/WiX/MergeModules/Zlib-x64.wxs
index e2a6740..c97db27 100644 (file)
--- a/msi/WiX/MergeModules/Zlib-x64.wxs
+++ b/msi/WiX/MergeModules/Zlib-x64.wxs
@@ -15,9 +15,7 @@
    implied.  See the License for the specific language governing\r
    permissions and limitations under the License.  -->\r
 \r
-<?define BuildDirectory='G:\Downloads\shib\' ?>\r
-<?define ZlibVersion='1.2.5' ?>\r
-<?define ZlibFileVersion='1' ?>\r
+<?include ..\Versions.wxi ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <Module Id='ZlibMergeModule_x86' Language='1033' Version='$(var.ZlibVersion)'>\r

diff --git a/msi/WiX/MergeModules/Zlib-x86.wxs b/msi/WiX/MergeModules/Zlib-x86.wxs
index b146599..729a860 100644 (file)
--- a/msi/WiX/MergeModules/Zlib-x86.wxs
+++ b/msi/WiX/MergeModules/Zlib-x86.wxs
@@ -15,9 +15,7 @@
    implied.  See the License for the specific language governing\r
    permissions and limitations under the License.  -->\r
 \r
-<?define BuildDirectory='G:\Downloads\shib\' ?>\r
-<?define ZlibVersion='1.2.5' ?>\r
-<?define ZlibFileVersion='1' ?>\r
+<?include ..\Versions.wxi ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <Module Id='ZlibMergeModule_x86' Language='1033' Version='$(var.ZlibVersion)'>\r

diff --git a/msi/WiX/Versions.wxi b/msi/WiX/Versions.wxi
new file mode 100644 (file)
index 0000000..cb02534
--- /dev/null
+++ b/msi/WiX/Versions.wxi
@@ -0,0 +1,42 @@
+<?xml version='1.0' encoding='UTF-8'?>\r
+<Include xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
+  <?define BuildDirectory='G:\Downloads\shib\' ?>\r
+\r
+  <?define CurlVersion='7.21.2' ?>\r
+\r
+  <?define FastCGIVersion='2.4.0' ?>\r
+\r
+  <?define LogForShibVersion='1.0.5' ?>\r
+\r
+  <?define LogForShibFileVersion='1_0' ?> <!-- '$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\x64\Release\'> -->\r
+\r
+  <?define OpenSAMLVersion='2.4.3' ?> \r
+  <?define OpenSAMLFileVersion='2_4' ?><!-- 'saml$(var.OpenSAMLFileVersion).dll' -->\r
+\r
+\r
+  <?define OpenSSLVersion='1.0.0.10' ?><!-- 1.0.0a -->\r
+  <?define OpenSSLDirVersion='1.0.0a' ?><!-- '$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll.dbg\'> -->\r
+  <?define OpenSSLFileVersion='1_0_0' ?><!-- 'libeay32_$(var.OpenSSLFileVersion)D.dll' -->\r
+\r
+\r
+  <?define ShibbolethSPFileVersion='1_4' ?><!-- 'shibsp-lite$(var.ShibbolethSPFileVersion).dll'  -->\r
+  <?define ShibbolethVersion='1.4.2' ?>\r
+\r
+\r
+  <?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' ?>\r
+\r
+  <?define XmlSecVersion='1.6.0' ?><!-- '$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Release No Xalan' -->\r
+  <?define XmlSecFileVersion='1_6' ?><!--'xsec_$(var.XmlSecFileVersion).dll'-->\r
+\r
+\r
+  <?define XmlToolingVersion='1.4.2' ?>\r
+\r
+  <?define XmlToolingFileVersion='1_4' ?><!--'xmltooling$(var.XmlToolingFileVersion)D.dll'-->\r
+\r
+\r
+  <?define ZlibVersion='1.2.5' ?><!--'$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\projects\visualc6\Win32_DLL_Release\zlib$(var.ZlibFileVersion).dll'-->\r
+  <?define ZlibFileVersion='1' ?>\r
+\r
+\r
+</Include>\r