[cpp-sp COMMIT] in /branches/REL_2/msi/WiX: Compile.bat Installer.make Installer.vcxproj ShibbolethSP-exe-x64.wxs Shi...

[noreply at shibboleth.net]

Author: rdw
Date: Sat Oct 27 10:14:19 2012
New Revision: 3806

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3806&view=rev
Log:
Remover versions.wxi and inline component IDs from wxs files.
Fix a few bugs in the make file.

We can only build from the IDE now and hence versions.wxi and compile.bat are no more.


Modified:
    branches/REL_2/msi/WiX/Compile.bat
    branches/REL_2/msi/WiX/Installer.make
    branches/REL_2/msi/WiX/Installer.vcxproj
    branches/REL_2/msi/WiX/ShibbolethSP-exe-x64.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-exe-x86.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-gui.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-noarch.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-registry-x64.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-registry-x86.wxs
    branches/REL_2/msi/WiX/Versions.wxi

Modified: branches/REL_2/msi/WiX/Installer.make
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/Installer.make?rev=3806&r1=3805&r2=3806&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/Installer.make (original)
+++ branches/REL_2/msi/WiX/Installer.make Sat Oct 27 10:14:19 2012
@@ -41,7 +41,7 @@
 
 ShibbolethSP-registry-x64.wixobj: ShibbolethSP-registry-x64.wxs
 	wixcop -indent:2 ShibbolethSP-registry-x64.wxs
-	candle ShibbolethSP-registry-x64.wxs
+	candle -dSPBuildDirectory=$(SolutionDir).. ShibbolethSP-registry-x64.wxs
 
 ShibbolethSP-noarch.wixobj: ShibbolethSP-noarch.wxs
 	wixcop -indent:2 ShibbolethSP-noarch.wxs
@@ -53,11 +53,11 @@
 
 ShibbolethSP-registry-x86.wixobj: ShibbolethSP-registry-x86.wxs
 	wixcop -indent:2 ShibbolethSP-registry-x86.wxs
-	candle ShibbolethSP-registry-x86.wxs
+	candle -dSPBuildDirectory=$(SolutionDir).. ShibbolethSP-registry-x86.wxs
 
 ShibbolethSP-gui.wixobj: ShibbolethSP-gui.wxs
 	wixcop -indent:2 ShibbolethSP-gui.wxs
-	candle ShibbolethSP-gui.wxs
+	candle -dSPBuildDirectory=$(SolutionDir).. ShibbolethSP-gui.wxs
 
 ShibbolethSP-update-dlg.wixobj: ShibbolethSP-update-dlg.wxs
 	wixcop -indent:2 ShibbolethSP-update-dlg.wxs
@@ -69,7 +69,7 @@
 
 ShibbolethSP-main-x64.wixobj: ShibbolethSP-main-x64.wxs MergeModules\Curl-x86.msm MergeModules\FastCGI-x86.msm MergeModules\Log4Shib-x86.msm MergeModules\OpenSAML-x86.msm MergeModules\OpenSAML-schemas.msm MergeModules\OpenSSL-x86.msm MergeModules\Shibboleth-x86.msm MergeModules\Shibboleth-schemas.msm MergeModules\Xerces-x86.msm MergeModules\XmlSec-x86.msm MergeModules\Zlib-x86.msm MergeModules\Curl-x64.msm MergeModules\FastCGI-x64.msm MergeModules\Log4Shib-x64.msm MergeModules\OpenSAML-x64.msm MergeModules\OpenSSL-x64.msm MergeModules\Shibboleth-x64.msm MergeModules\Xerces-x64.msm MergeModules\XmlSec-x64.msm MergeModules\Zlib-x64.msm
 	wixcop -indent:2 ShibbolethSP-main-x64.wxs
-	candle -dSPBuildDirectory=$(SolutionDir)..-dShibbolethVersion=$(ShibbolethVersion) -dShibbolethId64=$(ShibbolethId64) -dShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethSP-main-x64.wxs
+	candle -dSPBuildDirectory=$(SolutionDir).. -dShibbolethVersion=$(ShibbolethVersion) -dShibbolethId64=$(ShibbolethId64) -dShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethSP-main-x64.wxs
 
 ShibbolethSP-main-x86.wixobj: ShibbolethSP-main-x86.wxs MergeModules\Curl-x86.msm MergeModules\FastCGI-x86.msm MergeModules\Log4Shib-x86.msm MergeModules\OpenSAML-x86.msm MergeModules\OpenSAML-schemas.msm MergeModules\OpenSSL-x86.msm MergeModules\Shibboleth-x86.msm MergeModules\Shibboleth-schemas.msm MergeModules\Xerces-x86.msm MergeModules\XmlSec-x86.msm MergeModules\Zlib-x86.msm
 	wixcop -indent:2 ShibbolethSP-main-x86.wxs

Modified: branches/REL_2/msi/WiX/Installer.vcxproj
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/Installer.vcxproj?rev=3806&r1=3805&r2=3806&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/Installer.vcxproj (original)
+++ branches/REL_2/msi/WiX/Installer.vcxproj Sat Oct 27 10:14:19 2012
@@ -67,8 +67,23 @@
   <ItemDefinitionGroup>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <None Include="Dialog.bmp" />
+    <None Include="license.rtf" />
+    <None Include="ShibbolethSP-defs-x86.wxi" />
+    <None Include="ShibbolethSP-exe-x64.wxs" />
+    <None Include="ShibbolethSP-exe-x86.wxs" />
+    <None Include="ShibbolethSP-gui.wxs" />
+    <None Include="ShibbolethSP-install-dlg.wxs" />
+    <None Include="ShibbolethSP-main-x64.wxs" />
+    <None Include="ShibbolethSP-main-x86.wxs" />
+    <None Include="ShibbolethSP-noarch.wxs" />
+    <None Include="ShibbolethSP-properties.wxi" />
+    <None Include="ShibbolethSP-registry-x64.wxs" />
+    <None Include="ShibbolethSP-registry-x86.wxs" />
+    <None Include="ShibbolethSP-update-dlg.wxs" />
+    <None Include="TopBanner.bmp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

Modified: branches/REL_2/msi/WiX/ShibbolethSP-exe-x64.wxs

[... 121 lines stripped ...]