[mapguide-commits] r4985 - in trunk/Installer: . Installers/MapGuide

[svn_mapguide at osgeo.org]

Author: trevorwekel
Date: 2010-06-28 00:54:49 +0000 (Mon, 28 Jun 2010)
New Revision: 4985

Modified:
   trunk/Installer/Installers/MapGuide/MapGuide.wixproj
   trunk/Installer/Installers/MapGuide/MapGuide.wxs
   trunk/Installer/build.bat
   trunk/Installer/build64.bat
Log:
Ticket #1387 Support 64 bit Web Extensions on Windows
- Propagate 32/64 bit build type to Wix


Modified: trunk/Installer/Installers/MapGuide/MapGuide.wixproj
===================================================================
--- trunk/Installer/Installers/MapGuide/MapGuide.wixproj	2010-06-27 19:20:27 UTC (rev 4984)
+++ trunk/Installer/Installers/MapGuide/MapGuide.wixproj	2010-06-28 00:54:49 UTC (rev 4985)
@@ -18,7 +18,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
-    <DefineConstants>Debug;MgTitle=$(MgTitle);MgVersion=$(MgVersion);MgRegKey=$(MgRegKey);MgSource=$(MgSource)</DefineConstants>
+    <DefineConstants>Debug;MgTitle=$(MgTitle);MgVersion=$(MgVersion);MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform)</DefineConstants>
     <Cultures>$(MgCulture)</Cultures>
     <SuppressIces>ICE47</SuppressIces>
   </PropertyGroup>
@@ -27,7 +27,7 @@
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <SuppressValidation>False</SuppressValidation>
     <SuppressPdbOutput>True</SuppressPdbOutput>
-    <DefineConstants>MgTitle=$(MgTitle);MgVersion=$(MgVersion);MgRegKey=$(MgRegKey);MgSource=$(MgSource)</DefineConstants>
+    <DefineConstants>MgTitle=$(MgTitle);MgVersion=$(MgVersion);MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform)</DefineConstants>
     <Cultures>$(MgCulture)</Cultures>
     <SuppressIces>ICE47</SuppressIces>
   </PropertyGroup>

Modified: trunk/Installer/Installers/MapGuide/MapGuide.wxs
===================================================================
--- trunk/Installer/Installers/MapGuide/MapGuide.wxs	2010-06-27 19:20:27 UTC (rev 4984)
+++ trunk/Installer/Installers/MapGuide/MapGuide.wxs	2010-06-28 00:54:49 UTC (rev 4985)
@@ -12,7 +12,7 @@
            Manufacturer="!(loc.ProductManufacturer)"
            Language="!(loc.LANG)" >
 
-        <Package InstallerVersion="300" Compressed="yes" />
+        <Package InstallerVersion="300" Compressed="yes" Platform="$(var.MgPlatform)" />
 
         <Media Id="1" Cabinet="MapGuideOpenSource.cab" EmbedCab="yes" CompressionLevel="none" />
 

Modified: trunk/Installer/build.bat
===================================================================
--- trunk/Installer/build.bat	2010-06-27 19:20:27 UTC (rev 4984)
+++ trunk/Installer/build.bat	2010-06-28 00:54:49 UTC (rev 4985)
@@ -398,7 +398,7 @@
 
 :build
 echo [build]: Installer
-SET RUN_BUILD=%MSBUILD% /p:OutputName=%INSTALLER_NAME%;MgCulture=%CULTURE%;MgTitle=%INSTALLER_TITLE%;MgVersion=%INSTALLER_VERSION%;MgRegKey=%MG_REG_KEY%
+SET RUN_BUILD=%MSBUILD% /p:OutputName=%INSTALLER_NAME%;MgCulture=%CULTURE%;MgTitle=%INSTALLER_TITLE%;MgVersion=%INSTALLER_VERSION%;MgRegKey=%MG_REG_KEY%;MgPlatform=%CPUTYPE%
 if not ""=="%MG_SOURCE_INC%" set RUN_BUILD=%RUN_BUILD%;MgSource=%MG_SOURCE_INC%
 set RUN_BUILD=%RUN_BUILD% Installer.sln
 %RUN_BUILD% 

Modified: trunk/Installer/build64.bat
===================================================================
--- trunk/Installer/build64.bat	2010-06-27 19:20:27 UTC (rev 4984)
+++ trunk/Installer/build64.bat	2010-06-28 00:54:49 UTC (rev 4985)
@@ -422,7 +422,7 @@
 
 :build
 echo [build]: Installer
-SET RUN_BUILD=%MSBUILD% /p:OutputName=%INSTALLER_NAME%;MgCulture=%CULTURE%;MgTitle=%INSTALLER_TITLE%;MgVersion=%INSTALLER_VERSION%;MgRegKey=%MG_REG_KEY%
+SET RUN_BUILD=%MSBUILD% /p:OutputName=%INSTALLER_NAME%;MgCulture=%CULTURE%;MgTitle=%INSTALLER_TITLE%;MgVersion=%INSTALLER_VERSION%;MgRegKey=%MG_REG_KEY%;MgPlatform=%CPUTYPE%
 if not ""=="%MG_SOURCE_INC%" set RUN_BUILD=%RUN_BUILD%;MgSource=%MG_SOURCE_INC%
 set RUN_BUILD=%RUN_BUILD% Installer.sln
 %RUN_BUILD%