[cpp-sp COMMIT] /branches/REL_2/msi/WiX/MergeModules/MergeModules.make

[noreply at shibboleth.net]

Author: rdw
Date: Mon Oct 22 11:42:20 2012
New Revision: 3796

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3796&view=rev
Log:
Add some missing cleanup in buidling the merge modules

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

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=3796&r1=3795&r2=3796&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/MergeModules.make (original)
+++ branches/REL_2/msi/WiX/MergeModules/MergeModules.make Mon Oct 22 11:42:20 2012
@@ -86,6 +86,7 @@
 
 OpenSAML-schemas.msm: OpenSAML-schemas.wixobj
 	light OpenSAML-schemas.wixobj
+	del ..\*.msi
 
 OpenSAML-schemas.wixobj: OpenSAML-schemas.wxs
 	candle OpenSAML-schemas.wxs -dSPBuildDirectory=$(SolutionDir).. -dOpenSAMLVersion=$(OpenSAMLVersion) 
@@ -95,9 +96,11 @@
 #
 OpenSSL-x86.msm: OpenSSL-x86.wixobj
 	light OpenSSL-x86.wixobj
+	del ..\*.msi
 
 OpenSSL-x64.msm: OpenSSL-x64.wixobj
 	light OpenSSL-x64.wixobj
+	del ..\*.msi
 
 OpenSSL-x86.wixobj: OpenSSL-x86.wxs  $(BuildSP)\openssl-$(OpenSSLDirVersion)\out32dll\libeay32_$(OpenSSLFileVersion).dll $(BuildSP)\openssl-$(OpenSSLDirVersion)\out32dll\ssleay32_$(OpenSSLFileVersion).dll $(BuildSP)\openssl-$(OpenSSLDirVersion)\out32dll\openssl.exe $(BuildSP)\openssl-$(OpenSSLDirVersion)\out32dll.dbg\libeay32_$(OpenSSLFileVersion)d.dll $(BuildSP)\openssl-$(OpenSSLDirVersion)\out32dll.dbg\ssleay32_$(OpenSSLFileVersion)d.dll $(BuildSP)\openssl-$(OpenSSLDirVersion)\out32dll.dbg\openssl.exe
 	candle OpenSSL-x86.wxs -dBuildDirectory=$(BuildSP) -dOpenSSLVersion=$(OpenSSLVersion) -dOpenSSLDirVersion=$(OpenSSLDirVersion) -dOpenSSLFileVersion=$(OpenSSLFileVersion) -dLibEay32Component=$(LibEay32Component) -dSSlEay32Component=$(SSlEay32Component) -dLibEay32Componentd=$(LibEay32Componentd) -dSSlEay32Componentd=$(SSlEay32Componentd)
@@ -110,9 +113,11 @@
 #
 Shibboleth-x86.msm: Shibboleth-x86.wixobj
 	light Shibboleth-x86.wixobj
+	del ..\*.msi
 
 Shibboleth-x64.msm: Shibboleth-x64.wixobj
 	light Shibboleth-x64.wixobj
+	del ..\*.msi
 
 Shibboleth-x86.wixobj: Shibboleth-x86.wxs $(SolutionDir)\Release\shibsp$(ShibbolethDllFileVersion).dll $(SolutionDir)\Release\shibsp-lite$(ShibbolethDllFileVersion).dll $(SolutionDir)\Debug\shibsp$(ShibbolethDllFileVersion)d.dll $(SolutionDir)\Debug\shibsp-lite$(ShibbolethDllFileVersion)d.dll
 	candle Shibboleth-x86.wxs -dSPBuildDirectory=$(SolutionDir).. -dShibbolethDllVersion=$(ShibbolethDllVersion) -dShibbolethDllFileVersion=$(ShibbolethDllFileVersion) -dShibDll32Component=$(ShibDll32Component) -dShibDllLite32Component=$(ShibDllLite32Component) -dShibDll32Componentd=$(ShibDll32Componentd) -dShibDllLite32Componentd=$(ShibDllLite32Componentd)
@@ -122,6 +127,7 @@
 
 Shibboleth-schemas.msm: Shibboleth-schemas.wixobj
 	light Shibboleth-schemas.wixobj
+	del ..\*.msi
 
 Shibboleth-schemas.wixobj: Shibboleth-schemas.wxs
 	candle Shibboleth-schemas.wxs -dSPBuildDirectory=$(SolutionDir).. -dShibbolethDllVersion=$(ShibbolethDllVersion) 
@@ -132,9 +138,11 @@
 #
 Xerces-x86.msm: Xerces-x86.wixobj
 	light Xerces-x86.wixobj
+	del ..\*.msi
 
 Xerces-x64.msm: Xerces-x64.wixobj
 	light Xerces-x64.wixobj
+	del ..\*.msi
 
 Xerces-x86.wixobj: Xerces-x86.wxs $(BuildSP)\xerces-c-$(XercesVersion)-x86-windows-vc-10.0\bin\xerces-c_$(XercesFileVersion).dll Xerces-x86.wxs $(BuildSP)\xerces-c-$(XercesVersion)-x86-windows-vc-10.0\bin\xerces-c_$(XercesFileVersion)D.dll
 	candle Xerces-x86.wxs -dBuildDirectory=$(BuildSP) -dXercesVersion=$(XercesVersion) -dXercesFileVersion=$(XercesFileVersion) -dXerces32Component=$(Xerces32Component) -dXerces32Componentd=$(Xerces32Componentd)
@@ -148,9 +156,11 @@
 #
 XmlSec-x86.msm: XmlSec-x86.wixobj
 	light XmlSec-x86.wixobj
+	del ..\*.msi
 
 XmlSec-x64.msm: XmlSec-x64.wixobj
 	light XmlSec-x64.wixobj
+	del ..\*.msi
 

[... 15 lines stripped ...]