[cpp-sp COMMIT] in /branches/REL_2: Shibboleth.sln msi/WiX/MergeModules/MergeModules.make

[noreply at shibboleth.net]

Author: scantor
Date: Thu Mar 12 17:38:17 2015
New Revision: 3914

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3914&view=rev
Log:
Activate installer projects in solution, and fix Xerces path in makefile.

Modified:
    branches/REL_2/Shibboleth.sln
    branches/REL_2/msi/WiX/MergeModules/MergeModules.make

Modified: branches/REL_2/Shibboleth.sln
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/Shibboleth.sln?rev=3914&r1=3913&r2=3914&view=diff
==============================================================================
--- branches/REL_2/Shibboleth.sln (original)
+++ branches/REL_2/Shibboleth.sln Thu Mar 12 17:38:17 2015
@@ -324,13 +324,21 @@
 		{A2140D6E-C2C6-4329-84E3-2F530CEBE442}.Release|x64.ActiveCfg = Release|x64
 		{A2140D6E-C2C6-4329-84E3-2F530CEBE442}.Release|x64.Build.0 = Release|x64
 		{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}.Debug|Win32.Build.0 = Debug|Win32
 		{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}.Debug|x64.ActiveCfg = Debug|x64
+		{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}.Debug|x64.Build.0 = Debug|x64
 		{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}.Release|Win32.ActiveCfg = Release|Win32
+		{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}.Release|Win32.Build.0 = Release|Win32
 		{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}.Release|x64.ActiveCfg = Release|x64
+		{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}.Release|x64.Build.0 = Release|x64
 		{C2B1BB79-C88B-42B4-9AEC-170F91910F70}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C2B1BB79-C88B-42B4-9AEC-170F91910F70}.Debug|Win32.Build.0 = Debug|Win32
 		{C2B1BB79-C88B-42B4-9AEC-170F91910F70}.Debug|x64.ActiveCfg = Debug|x64
+		{C2B1BB79-C88B-42B4-9AEC-170F91910F70}.Debug|x64.Build.0 = Debug|x64
 		{C2B1BB79-C88B-42B4-9AEC-170F91910F70}.Release|Win32.ActiveCfg = Release|Win32
+		{C2B1BB79-C88B-42B4-9AEC-170F91910F70}.Release|Win32.Build.0 = Release|Win32
 		{C2B1BB79-C88B-42B4-9AEC-170F91910F70}.Release|x64.ActiveCfg = Release|x64
+		{C2B1BB79-C88B-42B4-9AEC-170F91910F70}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: branches/REL_2/msi/WiX/MergeModules/MergeModules.make
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/MergeModules/MergeModules.make?rev=3914&r1=3913&r2=3914&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/MergeModules.make (original)
+++ branches/REL_2/msi/WiX/MergeModules/MergeModules.make Thu Mar 12 17:38:17 2015
@@ -21,7 +21,7 @@
 #
 Curl-x64.msm: Curl-x64.wixobj 
 	light Curl-x64.wixobj
-	del ..\*.msi
+	del ..\*64*.msi
 
 Curl-x64.wixobj: Curl-x64.wxs $(BuildSP)\curl-$(CurlVersion)\lib\release-dll-ssl-dll-zlib-dll.x64\libcurl5.dll $(BuildSP)\curl-$(CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll.x64\libcurl5d.dll
 	wixcop -indent:2 Curl-x64.wxs 
@@ -29,7 +29,7 @@
 
 Curl-x86.msm: Curl-x86.wixobj 
 	light Curl-x86.wixobj
-	del ..\*.msi
+	del ..\*32*.msi
 
 Curl-x86.wixobj: Curl-x86.wxs $(BuildSP)\curl-$(CurlVersion)\lib\release-dll-ssl-dll-zlib-dll\libcurl5.dll $(BuildSP)\curl-$(CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll\libcurl5d.dll 
 	wixcop -indent:2 Curl-x86.wxs 
@@ -40,7 +40,7 @@
 #
 FastCGI-x86.msm: FastCGI-x86.wixobj 
 	light FastCGI-x86.wixobj
-	del ..\*.msi
+	del ..\*32*.msi
 
 FastCGI-x86.wixobj: FastCGI-x86.wxs $(BuildSP)\fcgi-$(FastCGIVersion)-VC10\Win32\Release\libfcgi.dll  $(BuildSP)\fcgi-$(FastCGIVersion)-VC10\Win32\Debug\libfcgid.dll 
 	wixcop -indent:2 FastCGI-x86.wxs 
@@ -48,7 +48,7 @@
 
 FastCGI-x64.msm: FastCGI-x64.wixobj 
 	light FastCGI-x64.wixobj
-	del ..\*.msi
+	del ..\*64*.msi
 
 FastCGI-x64.wixobj: FastCGI-x64.wxs $(BuildSP)\fcgi-$(FastCGIVersion)-VC10\Win32\x64\Release\libfcgi.dll  $(BuildSP)\fcgi-$(FastCGIVersion)-VC10\Win32\x64\Debug\libfcgid.dll
 	wixcop -indent:2 FastCGI-x64.wxs 
@@ -59,11 +59,11 @@
 #
 Log4Shib-x64.msm: Log4Shib-x64.wixobj
 	light Log4Shib-x64.wixobj
-	del ..\*.msi
+	del ..\*64*.msi
 
 Log4Shib-x86.msm: Log4Shib-x86.wixobj
 	light Log4Shib-x86.wixobj
-	del ..\*.msi
+	del ..\*32*.msi
 
 Log4Shib-x86.wixobj: Log4Shib-x86.wxs $(BuildSP)\log4shib-$(Log4ShibVersion)\msvc10\Debug\log4shib$(Log4ShibFileVersion)D.dll $(BuildSP)\log4shib-$(Log4ShibVersion)\msvc10\Release\log4shib$(Log4ShibFileVersion).dll
 	wixcop -indent:2 Log4Shib-x86.wxs 
@@ -78,11 +78,11 @@
 #
 OpenSAML-x86.msm: OpenSAML-x86.wixobj
 	light OpenSAML-x86.wixobj
-	del ..\*.msi
+	del ..\*32*.msi
 
 OpenSAML-x64.msm: OpenSAML-x64.wixobj
 	light OpenSAML-x64.wixobj
-	del ..\*.msi
+	del ..\*64*.msi
 

[... 90 lines stripped ...]