[cpp-parent-projects COMMIT] /cpp-msbuild/trunk/build.make

[noreply at shibboleth.net]

Author: scantor
Date: Wed Feb 27 14:39:55 2013
New Revision: 6

URL: http://svn.shibboleth.net/view/cpp-parent-projects?rev=6&view=rev
Log:
Clean up installer targets

Modified:
    cpp-msbuild/trunk/build.make

Modified: cpp-msbuild/trunk/build.make
URL: http://svn.shibboleth.net/view/cpp-parent-projects/cpp-msbuild/trunk/build.make?rev=6&r1=5&r2=6&view=diff
==============================================================================
--- cpp-msbuild/trunk/build.make (original)
+++ cpp-msbuild/trunk/build.make Wed Feb 27 14:39:55 2013
@@ -1,9 +1,9 @@
 #
 # Short cuts to make things easier
 
-SPROOT=$(MAKEDIR)\..\..\cpp-sp
-XMLROOT=$(MAKEDIR)\..\..\cpp-xmltooling
-SAMLROOT=$(MAKEDIR)\..\..\cpp-opensaml
+SPROOT=$(MAKEDIR)\..\cpp-sp
+XMLROOT=$(MAKEDIR)\..\cpp-xmltooling
+SAMLROOT=$(MAKEDIR)\..\cpp-opensaml
 
 
 #
@@ -20,12 +20,16 @@
 	cd $(SAMLROOT)
 	del/s *.dll *.exe *.msm *.lib *.obj
 
-#
-msi32: mergemodules32 exe32 
+
+msi32: exe32 mergemodules32 msi32only
+
+msi64: exe64 mergemodules64 msi64only
+
+msi32only:
 	cd $(SPROOT)
 	msbuild  /property:Platform=Win32;Configuration=Release /maxcpucount .\shibboleth.sln /t:Installers\MergeModules;Installers\Installer
 
-msi64: mergemodules32 exe32 mergemodules64 exe64
+msi64only:
 	cd $(SPROOT)
 	msbuild  /property:Platform=x64;Configuration=Release /maxcpucount .\shibboleth.sln /t:Installers\MergeModules;Installers\Installer