[cpp-sp COMMIT] in /branches/REL_2/msi/WiX: Installer.make Installer.vcxproj MergeModules/Curl-x64.wxs MergeModules/C...

[noreply at shibboleth.net]

Author: rdw
Date: Tue Oct 23 08:10:55 2012
New Revision: 3798

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3798&view=rev
Log:
Set native EOL on all wxs, make and vcxproj files.  Revert the ones which had become unixifed to being DOS (on a dos machine) and recommit them..

Modified:
    branches/REL_2/msi/WiX/Installer.make   (contents, props changed)
    branches/REL_2/msi/WiX/Installer.vcxproj   (contents, props changed)
    branches/REL_2/msi/WiX/MergeModules/Curl-x64.wxs   (contents, props changed)
    branches/REL_2/msi/WiX/MergeModules/Curl-x86.wxs   (contents, props changed)
    branches/REL_2/msi/WiX/MergeModules/FastCGI-x64.wxs   (contents, props changed)
    branches/REL_2/msi/WiX/MergeModules/FastCGI-x86.wxs   (contents, props changed)
    branches/REL_2/msi/WiX/MergeModules/Log4Shib-x64.wxs   (contents, props changed)
    branches/REL_2/msi/WiX/MergeModules/Log4Shib-x86.wxs   (contents, props changed)
    branches/REL_2/msi/WiX/MergeModules/MergeModules.make   (contents, props changed)
    branches/REL_2/msi/WiX/MergeModules/MergeModules.vcxproj   (contents, props changed)
    branches/REL_2/msi/WiX/MergeModules/OpenSAML-schemas.wxs   (contents, props changed)
    branches/REL_2/msi/WiX/MergeModules/OpenSAML-x64.wxs   (contents, props changed)
    branches/REL_2/msi/WiX/MergeModules/OpenSAML-x86.wxs   (contents, props changed)
    branches/REL_2/msi/WiX/MergeModules/OpenSSL-x64.wxs   (contents, props changed)
    branches/REL_2/msi/WiX/MergeModules/OpenSSL-x86.wxs   (contents, props changed)
    branches/REL_2/msi/WiX/MergeModules/Shibboleth-schemas.wxs   (contents, props changed)
    branches/REL_2/msi/WiX/MergeModules/Shibboleth-x64.wxs   (contents, props changed)
    branches/REL_2/msi/WiX/MergeModules/Shibboleth-x86.wxs   (contents, props changed)
    branches/REL_2/msi/WiX/MergeModules/Xerces-x64.wxs   (contents, props changed)
    branches/REL_2/msi/WiX/MergeModules/Xerces-x86.wxs   (contents, props changed)
    branches/REL_2/msi/WiX/MergeModules/XmlSec-x64.wxs   (contents, props changed)
    branches/REL_2/msi/WiX/MergeModules/XmlSec-x86.wxs   (contents, props changed)
    branches/REL_2/msi/WiX/MergeModules/Zlib-x64.wxs   (contents, props changed)
    branches/REL_2/msi/WiX/MergeModules/Zlib-x86.wxs   (contents, props changed)
    branches/REL_2/msi/WiX/Patch.wxs   (contents, props changed)
    branches/REL_2/msi/WiX/ShibbolethSP-exe-x64.wxs   (contents, props changed)
    branches/REL_2/msi/WiX/ShibbolethSP-exe-x86.wxs   (contents, props changed)
    branches/REL_2/msi/WiX/ShibbolethSP-gui.wxs   (contents, props changed)
    branches/REL_2/msi/WiX/ShibbolethSP-install-dlg.wxs   (contents, props changed)
    branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs   (props changed)
    branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs   (props changed)
    branches/REL_2/msi/WiX/ShibbolethSP-noarch.wxs   (contents, props changed)
    branches/REL_2/msi/WiX/ShibbolethSP-registry-x64.wxs   (contents, props changed)
    branches/REL_2/msi/WiX/ShibbolethSP-registry-x86.wxs   (contents, props changed)
    branches/REL_2/msi/WiX/ShibbolethSP-update-dlg.wxs   (contents, props changed)
    branches/REL_2/msi/WiX/tes.wxs
    branches/REL_2/msi/WiX/testInstall.wxs

Modified: branches/REL_2/msi/WiX/Installer.make
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/Installer.make?rev=3798&r1=3797&r2=3798&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/Installer.make (original)
+++ branches/REL_2/msi/WiX/Installer.make Tue Oct 23 08:10:55 2012
@@ -1,76 +1,76 @@
-all: all32 all64
-
-all32: shibboleth-sp-$(ShibbolethVersion)-win32.msi
-
-all64: shibboleth-sp-$(ShibbolethVersion)-win64.msi
-
-clean32: 
-	del *-x86.msi *-x86.wixobj *-x86.wixpdb *schemas.wixobj Shibboleth.wixlib
-
-clean64: 
-	del *-x64.wixobj *-x64.msi *-x64.wixpdb *schemas.wixobj Shibboleth.wixlib
-
-clean: clean32 clean64
-
-rebuild32: clean32 all32
-
-rebuild64: clean64 all64
-
-#
-# MSI
-#
-shibboleth-sp-$(ShibbolethVersion)-win32.msi: ShibbolethSP-main-x86.wixobj Shibboleth.wixlib
-	light -sw1055 -sice:ICE82 -o shibboleth-sp-$(ShibbolethVersion)-win32.msi ShibbolethSP-main-x86.wixobj Shibboleth.wixlib -ext WixUtilExtension.dll -ext WixUIExtension  -ext WixIISExtension
-	del shibboleth-sp-$(ShibbolethVersion)-win64.msi
-
-shibboleth-sp-$(ShibbolethVersion)-win64.msi: ShibbolethSP-main-x64.wixobj ShibbolethSP-exe-x64.wixobj ShibbolethSP-registry-x64.wixobj  Shibboleth.wixlib
-	light -sw1055 -sice:ICE82 -o shibboleth-sp-$(ShibbolethVersion)-win64.msi ShibbolethSP-main-x64.wixobj ShibbolethSP-exe-x64.wixobj ShibbolethSP-registry-x64.wixobj  Shibboleth.wixlib -ext WixUtilExtension.dll -ext WixUIExtension -ext WixIISExtension
-
-#
-# Library
-#
-Shibboleth.wixlib: ShibbolethSP-noarch.wixobj ShibbolethSP-exe-x86.wixobj ShibbolethSP-registry-x86.wixobj  ShibbolethSP-gui.wixobj ShibbolethSP-update-dlg.wixobj ShibbolethSP-install-dlg.wixobj

[... 6312 lines stripped ...]