[cpp-sp COMMIT] in /branches/REL_2/msi/WiX/MergeModules: Curl-x64.wxs Curl-x86.wxs FastCGI-x64.wxs FastCGI-x86.wxs Lo...

noreply at shibboleth.net noreply at shibboleth.net
Sat Oct 27 07:26:56 EDT 2012 

Author: rdw
Date: Sat Oct 27 07:26:56 2012
New Revision: 3805

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3805&view=rev
Log:
Remove all inline (changeable) components and reference to Versions.wxi.

Merge Modules can only be compiled from the IDE now.


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/MergeModules.vcxproj
    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-schemas.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/Zlib-x64.wxs
    branches/REL_2/msi/WiX/MergeModules/Zlib-x86.wxs
    branches/REL_2/msi/WiX/MergeModules/compile.bat

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=3805&r1=3804&r2=3805&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/Curl-x64.wxs (original)
+++ branches/REL_2/msi/WiX/MergeModules/Curl-x64.wxs Sat Oct 27 07:26:56 2012
@@ -15,8 +15,6 @@
    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 ..\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=3805&r1=3804&r2=3805&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/Curl-x86.wxs (original)
+++ branches/REL_2/msi/WiX/MergeModules/Curl-x86.wxs Sat Oct 27 07:26:56 2012
@@ -15,8 +15,6 @@
    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 ..\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=3805&r1=3804&r2=3805&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/FastCGI-x64.wxs (original)
+++ branches/REL_2/msi/WiX/MergeModules/FastCGI-x64.wxs Sat Oct 27 07:26:56 2012
@@ -15,8 +15,6 @@
    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 ..\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=3805&r1=3804&r2=3805&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/FastCGI-x86.wxs (original)
+++ branches/REL_2/msi/WiX/MergeModules/FastCGI-x86.wxs Sat Oct 27 07:26:56 2012
@@ -15,8 +15,6 @@
    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 ..\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=3805&r1=3804&r2=3805&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/Log4Shib-x64.wxs (original)
+++ branches/REL_2/msi/WiX/MergeModules/Log4Shib-x64.wxs Sat Oct 27 07:26:56 2012

[... 394 lines stripped ...]

More information about the commits mailing list