[cpp-sp COMMIT] in /branches/REL_2/msi/WiX: MergeModules/Curl-x64.wxs MergeModules/Curl-x86.wxs MergeModules/FastCGI-...
noreply at shibboleth.net
noreply at shibboleth.net
Thu May 3 18:14:20 BST 2012
Author: rdw
Date: Thu May 3 18:14:20 2012
New Revision: 3640
URL: http://svn.shibboleth.net/view/cpp-sp?rev=3640&view=rev
Log:
Exbed parameterization into a common header (prior to eventual movement into a .wixproj file)
Added:
branches/REL_2/msi/WiX/Versions.wxi
Modified:
branches/REL_2/msi/WiX/MergeModules/Curl-x64.wxs
branches/REL_2/msi/WiX/MergeModules/Curl-x86.wxs
branches/REL_2/msi/WiX/MergeModules/FastCGI-x64.wxs
branches/REL_2/msi/WiX/MergeModules/FastCGI-x86.wxs
branches/REL_2/msi/WiX/MergeModules/Log4Shib-x64.wxs
branches/REL_2/msi/WiX/MergeModules/Log4Shib-x86.wxs
branches/REL_2/msi/WiX/MergeModules/OpenSAML-schemas.wxs
branches/REL_2/msi/WiX/MergeModules/OpenSAML-x64.wxs
branches/REL_2/msi/WiX/MergeModules/OpenSAML-x86.wxs
branches/REL_2/msi/WiX/MergeModules/OpenSSL-x64.wxs
branches/REL_2/msi/WiX/MergeModules/OpenSSL-x86.wxs
branches/REL_2/msi/WiX/MergeModules/Shibboleth-x64.wxs
branches/REL_2/msi/WiX/MergeModules/Shibboleth-x86.wxs
branches/REL_2/msi/WiX/MergeModules/Xerces-x64.wxs
branches/REL_2/msi/WiX/MergeModules/Xerces-x86.wxs
branches/REL_2/msi/WiX/MergeModules/XmlSec-x64.wxs
branches/REL_2/msi/WiX/MergeModules/XmlSec-x86.wxs
branches/REL_2/msi/WiX/MergeModules/XmlTooling-schemas.wxs
branches/REL_2/msi/WiX/MergeModules/XmlTooling-x64.wxs
branches/REL_2/msi/WiX/MergeModules/XmlTooling-x86.wxs
branches/REL_2/msi/WiX/MergeModules/Zlib-x64.wxs
branches/REL_2/msi/WiX/MergeModules/Zlib-x86.wxs
Modified: branches/REL_2/msi/WiX/MergeModules/Curl-x64.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/MergeModules/Curl-x64.wxs?rev=3640&r1=3639&r2=3640&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/Curl-x64.wxs (original)
+++ branches/REL_2/msi/WiX/MergeModules/Curl-x64.wxs Thu May 3 18:14:20 2012
@@ -16,8 +16,7 @@
implied. See the License for the specific language governing
permissions and limitations under the License. -->
-<?define BuildDirectory='G:\Downloads\shib\' ?>
-<?define CurlVersion='7.21.2' ?>
+<?include ..\Versions.wxi ?>
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
<Module Id='CurlMergeModule_x64' Language='1033' Version='$(var.CurlVersion)'>
Modified: branches/REL_2/msi/WiX/MergeModules/Curl-x86.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/MergeModules/Curl-x86.wxs?rev=3640&r1=3639&r2=3640&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/Curl-x86.wxs (original)
+++ branches/REL_2/msi/WiX/MergeModules/Curl-x86.wxs Thu May 3 18:14:20 2012
@@ -16,8 +16,7 @@
implied. See the License for the specific language governing
permissions and limitations under the License. -->
-<?define BuildDirectory='G:\Downloads\shib\' ?>
-<?define CurlVersion='7.21.2' ?>
+<?include ..\Versions.wxi ?>
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
<Module Id='CurlMergeModule_x86' Language='1033' Version='$(var.CurlVersion)'>
Modified: branches/REL_2/msi/WiX/MergeModules/FastCGI-x64.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/MergeModules/FastCGI-x64.wxs?rev=3640&r1=3639&r2=3640&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/FastCGI-x64.wxs (original)
+++ branches/REL_2/msi/WiX/MergeModules/FastCGI-x64.wxs Thu May 3 18:14:20 2012
@@ -16,8 +16,7 @@
implied. See the License for the specific language governing
permissions and limitations under the License. -->
-<?define BuildDirectory='G:\Downloads\shib\' ?>
-<?define FastCGIVersion='2.4.0' ?>
+<?include ..\Versions.wxi ?>
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
<Module Id='FastCGIMergeModule_x64' Language='1033' Version='$(var.FastCGIVersion)'>
Modified: branches/REL_2/msi/WiX/MergeModules/FastCGI-x86.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/MergeModules/FastCGI-x86.wxs?rev=3640&r1=3639&r2=3640&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/FastCGI-x86.wxs (original)
+++ branches/REL_2/msi/WiX/MergeModules/FastCGI-x86.wxs Thu May 3 18:14:20 2012
@@ -16,8 +16,7 @@
implied. See the License for the specific language governing
permissions and limitations under the License. -->
-<?define BuildDirectory='G:\Downloads\shib\' ?>
-<?define FastCGIVersion='2.4.0' ?>
+<?include ..\Versions.wxi ?>
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
<Module Id='FastCGIMergeModule_x86' Language='1033' Version='$(var.FastCGIVersion)'>
Modified: branches/REL_2/msi/WiX/MergeModules/Log4Shib-x64.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/MergeModules/Log4Shib-x64.wxs?rev=3640&r1=3639&r2=3640&view=diff
==============================================================================
[... 309 lines stripped ...]
More information about the commits
mailing list