[mapguide-commits] r4986 - in trunk/Installer: .
Installers/MapGuide Libraries/CS Map Libraries/MapGuide
Server Libraries/MapGuide Web Extensions
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Mon Jun 28 02:55:03 EDT 2010
Author: trevorwekel
Date: 2010-06-28 06:55:03 +0000 (Mon, 28 Jun 2010)
New Revision: 4986
Modified:
trunk/Installer/Installers/MapGuide/MapGuide.wxs
trunk/Installer/Libraries/CS Map/CS Map.wixproj
trunk/Installer/Libraries/CS Map/CSMap.wxs
trunk/Installer/Libraries/MapGuide Server/FDO.wxs
trunk/Installer/Libraries/MapGuide Server/MapGuide Server.wixproj
trunk/Installer/Libraries/MapGuide Server/MapGuideServer.wxs
trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs
trunk/Installer/Libraries/MapGuide Web Extensions/MapGuide Web Extensions.wixproj
trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs
trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs
trunk/Installer/build64.bat
Log:
Ticket #1387 Support 64 bit Web Extensions on Windows
- Add missing -Win64 directive to paraffin command line
- Additional changes to wix component and registry declarations to flag them as 64 bit
Modified: trunk/Installer/Installers/MapGuide/MapGuide.wxs
===================================================================
--- trunk/Installer/Installers/MapGuide/MapGuide.wxs 2010-06-28 00:54:49 UTC (rev 4985)
+++ trunk/Installer/Installers/MapGuide/MapGuide.wxs 2010-06-28 06:55:03 UTC (rev 4986)
@@ -4,6 +4,13 @@
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"
xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension"
>
+ <?if "$(var.MgPlatform)" = "x64" ?>
+ <?define Win64 = "yes" ?>
+ <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
+ <?else ?>
+ <?define Win64 = "no" ?>
+ <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
+ <?endif ?>
<Product
Id="*"
UpgradeCode="5D9A7D8D-485E-43E0-A4C8-3582E4D80051"
@@ -23,6 +30,7 @@
Id="MgWebConfigRs"
Type="raw"
Root="HKLM"
+ Win64="$(var.Win64)"
Key="$(var.MgRegKey)"
Name="MGWEB_CONFIG" />
</Property>
@@ -32,6 +40,7 @@
Id="IisApiTypeRs"
Type="raw"
Root="HKLM"
+ Win64="$(var.Win64)"
Key="$(var.MgRegKey)"
Name="IIS_API_TYPE" />
</Property>
@@ -60,6 +69,7 @@
Id="MgWebsiteRs"
Type="raw"
Root="HKLM"
+ Win64="$(var.Win64)"
Key="$(var.MgRegKey)"
Name="MG_WEBSITE" />
</Property>
@@ -74,7 +84,13 @@
<!-- we need to know what version of IIS is installed (if any) to see what options to offer during install UI, and
which custom actions to run during installation -->
<Property Id="IISVERSIONMAJOR" Value="#0" Secure="yes">
- <RegistrySearch Id="SearchRegIISVERSIONMAJOR" Root="HKLM" Key="Software\Microsoft\InetStp" Name="MajorVersion" Type="raw" />
+ <RegistrySearch
+ Id="SearchRegIISVERSIONMAJOR"
+ Root="HKLM"
+ Win64="$(var.Win64)"
+ Key="Software\Microsoft\InetStp"
+ Name="MajorVersion"
+ Type="raw" />
</Property>
<Icon Id="OSGeo.ico" SourceFile="..\..\Support\Graphics\OSGeo.ico" />
@@ -82,7 +98,7 @@
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramMenuFolder" Name="Programs"/>
<Directory Id="DesktopFolder" Name="Desktop"/>
- <Directory Id="ProgramFilesFolder">
+ <Directory Id="$(var.PlatformProgramFilesFolder)">
<Directory Id="OSGeoFolder" Name="OSGeo">
<Directory Id="INSTALLLOCATION" Name="MapGuide">
<!-- These are "aliases", set in the individual feature libraries.-->
Modified: trunk/Installer/Libraries/CS Map/CS Map.wixproj
===================================================================
--- trunk/Installer/Libraries/CS Map/CS Map.wixproj 2010-06-28 00:54:49 UTC (rev 4985)
+++ trunk/Installer/Libraries/CS Map/CS Map.wixproj 2010-06-28 06:55:03 UTC (rev 4986)
@@ -14,12 +14,12 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
- <DefineConstants>Debug;MgRegKey=$(MgRegKey);MgSource=$(MgSource)</DefineConstants>
+ <DefineConstants>Debug;MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform)</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
- <DefineConstants>MgRegKey=$(MgRegKey);MgSource=$(MgSource)</DefineConstants>
+ <DefineConstants>MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform)</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Compile Include="FileIncludes\incCSMapDictionaryFiles.wxs" />
Modified: trunk/Installer/Libraries/CS Map/CSMap.wxs
===================================================================
--- trunk/Installer/Libraries/CS Map/CSMap.wxs 2010-06-28 00:54:49 UTC (rev 4985)
+++ trunk/Installer/Libraries/CS Map/CSMap.wxs 2010-06-28 06:55:03 UTC (rev 4986)
@@ -1,9 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <?if "$(var.MgPlatform)" = "x64" ?>
+ <?define Win64 = "yes" ?>
+ <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
+ <?else ?>
+ <?define Win64 = "no" ?>
+ <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
+ <?endif ?>
<Fragment>
<DirectoryRef Id="CsMapParentFolder">
<Directory Id="CSMAPLOCATION" Name="CS-Map">
- <Component Id="CsMapComponent" Guid="552EAF5E-2420-4C2A-A52C-62B456EE1F64">
+ <Component Id="CsMapComponent" Win64="$(var.Win64)" Guid="552EAF5E-2420-4C2A-A52C-62B456EE1F64">
<CreateFolder />
<Environment Id="CsMapEnvVar"
Action="set"
Modified: trunk/Installer/Libraries/MapGuide Server/FDO.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Server/FDO.wxs 2010-06-28 00:54:49 UTC (rev 4985)
+++ trunk/Installer/Libraries/MapGuide Server/FDO.wxs 2010-06-28 06:55:03 UTC (rev 4986)
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <?if "$(var.MgPlatform)" = "x64" ?>
+ <?define Win64 = "yes" ?>
+ <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
+ <?else ?>
+ <?define Win64 = "no" ?>
+ <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
+ <?endif ?>
<Fragment>
<CustomAction Id="FdoRegCmd" Property="FdoReg" Execute="immediate" Value=""[FDOLOCATION]FdoRegUtil.exe"" />
@@ -66,13 +73,13 @@
<DirectoryRef Id="SERVERROOTLOCATION">
<Directory Id="FDOLOCATION" Name="Fdo">
<Directory Id="FDOCOMLOCATION" Name="com">
- <Component Id="FdoComComponent" Guid="2318F3DF-88E4-46EB-B2A7-86A17202D9CB">
+ <Component Id="FdoComComponent" Win64="$(var.Win64)" Guid="2318F3DF-88E4-46EB-B2A7-86A17202D9CB">
<File Id="FdoSysSql" Checksum="yes" Source="$(var.MgSource)\Server\FDO\com\fdo_sys.sql" />
<File Id="FdoSysIdxSql" Checksum="yes" Source="$(var.MgSource)\Server\FDO\com\fdo_sys_idx.sql" />
<File Id="FdoSysSysSql" Checksum="yes" Source="$(var.MgSource)\Server\FDO\com\fdosys_sys.sql" />
</Component>
</Directory>
- <Component Id="FdoComponent" Guid="EC356C4B-8AD8-472C-8D3B-90AC4E77BDB0">
+ <Component Id="FdoComponent" Win64="$(var.Win64)" Guid="EC356C4B-8AD8-472C-8D3B-90AC4E77BDB0">
<CreateFolder />
<IniFile Id="INISETFDOPATH"
Action="addLine"
@@ -83,7 +90,7 @@
Value="[FDOLOCATION]" />
</Component>
<!-- FDO Core -->
- <Component Id="FdoCoreCompnent" Guid="90F4CB26-524F-499B-AA22-BD17036B167D">
+ <Component Id="FdoCoreCompnent" Win64="$(var.Win64)" Guid="90F4CB26-524F-499B-AA22-BD17036B167D">
<File Id="FdoRegUtil" Checksum="yes" Source="$(var.MgSource)\Server\FDO\FdoRegUtil.exe" />
<File Id="FdoBoostDateTime" Checksum="yes" Source="$(var.MgSource)\Server\FDO\boost_date_time-vc90-mt-1_34_1.dll" />
<File Id="FdoBoostThread" Checksum="yes" Source="$(var.MgSource)\Server\FDO\boost_thread-vc90-mt-1_34_1.dll" />
@@ -104,76 +111,76 @@
<File Id="SmMessage" Checksum="yes" Source="$(var.MgSource)\Server\FDO\SmMessage.dll" />
</Component>
<!-- ArcSDE Provider -->
- <Component Id="FdoArcSdeComponent" Guid="73E0719B-243F-49E9-BF74-F1B7CF7EA35F">
+ <Component Id="FdoArcSdeComponent" Win64="$(var.Win64)" Guid="73E0719B-243F-49E9-BF74-F1B7CF7EA35F">
<File Id="ArcSdeMessage" Checksum="yes" Source="$(var.MgSource)\Server\FDO\ArcSDEMessage.dll" />
<File Id="ArcSdeProvider91" Checksum="yes" Source="$(var.MgSource)\Server\FDO\ArcSdeProvider91.dll" />
<File Id="ArcSdeProvider92" Checksum="yes" Source="$(var.MgSource)\Server\FDO\ArcSdeProvider92.dll" />
<File Id="ArcSdeProvider" Checksum="yes" Source="$(var.MgSource)\Server\FDO\ArcSdeProvider.dll" />
</Component>
<!-- GDAL Provider -->
- <Component Id="FdoGdalProviderComponent" Guid="B1D7539F-865E-4A32-B82A-96E76012780B">
+ <Component Id="FdoGdalProviderComponent" Win64="$(var.Win64)" Guid="B1D7539F-865E-4A32-B82A-96E76012780B">
<File Id="GrfpMessage" Checksum="yes" Source="$(var.MgSource)\Server\FDO\GRFPMessage.dll" />
<File Id="GrfpOverrides" Checksum="yes" Source="$(var.MgSource)\Server\FDO\GRFPOverrides.dll" />
<File Id="GrfpProvider" Checksum="yes" Source="$(var.MgSource)\Server\FDO\GRFPProvider.dll" />
</Component>
<!-- King Oracle Provider -->
- <Component Id="FdoKingOracleProviderComponent" Guid="A383085F-5531-4E31-9F74-0CDDF154FCAA">
+ <Component Id="FdoKingOracleProviderComponent" Win64="$(var.Win64)" Guid="A383085F-5531-4E31-9F74-0CDDF154FCAA">
<File Id="KingOracleMessage" Checksum="yes" Source="$(var.MgSource)\Server\FDO\KingOracleMessage.dll" />
<File Id="KingOracleOverrides" Checksum="yes" Source="$(var.MgSource)\Server\FDO\KingOracleOverrides.dll" />
<File Id="KingOracleProvider" Checksum="yes" Source="$(var.MgSource)\Server\FDO\KingOracleProvider.dll" />
</Component>
<!-- MySQL Provider -->
- <Component Id="FdoMySqlProviderComponent" Guid="26D8BA03-9BFE-4E89-BFBB-026284A38A6C">
+ <Component Id="FdoMySqlProviderComponent" Win64="$(var.Win64)" Guid="26D8BA03-9BFE-4E89-BFBB-026284A38A6C">
<File Id="MySqlOverrides" Checksum="yes" Source="$(var.MgSource)\Server\FDO\MySQLOverrides.dll" />
<File Id="MySqlProvider" Checksum="yes" Source="$(var.MgSource)\Server\FDO\MySQLProvider.dll" />
</Component>
<!-- ODBC Provider -->
- <Component Id="FdoOdbcProviderComponent" Guid="DB266999-621F-4503-B27C-F5F2B5AE2187">
+ <Component Id="FdoOdbcProviderComponent" Win64="$(var.Win64)" Guid="DB266999-621F-4503-B27C-F5F2B5AE2187">
<File Id="OdbcOverrides" Checksum="yes" Source="$(var.MgSource)\Server\FDO\ODBCOverrides.dll" />
<File Id="OdbcProvider" Checksum="yes" Source="$(var.MgSource)\Server\FDO\ODBCProvider.dll" />
</Component>
<!-- OGR Provider -->
- <Component Id="FdoOgrProviderComponent" Guid="7FB890D4-8824-478E-83F6-E14DF2A3F949">
+ <Component Id="FdoOgrProviderComponent" Win64="$(var.Win64)" Guid="7FB890D4-8824-478E-83F6-E14DF2A3F949">
<File Id="OgrProvider" Checksum="yes" Source="$(var.MgSource)\Server\FDO\OGRProvider.dll" />
</Component>
<!-- PostGIS (legacy) Provider -->
- <Component Id="FdoPostGisProviderComponent" Guid="1D51342F-3ECC-4053-8475-F70333B4B22D">
+ <Component Id="FdoPostGisProviderComponent" Win64="$(var.Win64)" Guid="1D51342F-3ECC-4053-8475-F70333B4B22D">
<File Id="PostGisMessage" Checksum="yes" Source="$(var.MgSource)\Server\FDO\PostGISMessage.dll" />
<File Id="PostGisOverrides" Checksum="yes" Source="$(var.MgSource)\Server\FDO\PostGISOverrides.dll" />
<File Id="PostGisProvider" Checksum="yes" Source="$(var.MgSource)\Server\FDO\PostGISProvider.dll" />
</Component>
<!-- PostGIS (new) Provider -->
- <Component Id="FdoPostgreSqlProviderComponent" Guid="550B6CA0-10F8-444B-B51B-8569FF23B8C2">
+ <Component Id="FdoPostgreSqlProviderComponent" Win64="$(var.Win64)" Guid="550B6CA0-10F8-444B-B51B-8569FF23B8C2">
<File Id="PostgreSqlOverrides" Checksum="yes" Source="$(var.MgSource)\Server\FDO\PostgreSQLOverrides.dll" />
<File Id="PostgreSqlProvider" Checksum="yes" Source="$(var.MgSource)\Server\FDO\PostgreSQLProvider.dll" />
</Component>
<!-- SDF Provider -->
- <Component Id="FdoSdfProviderComponent" Guid="F0976038-9F62-42E7-AA6E-B37C33744C6F">
+ <Component Id="FdoSdfProviderComponent" Win64="$(var.Win64)" Guid="F0976038-9F62-42E7-AA6E-B37C33744C6F">
<File Id="SdfMessage" Checksum="yes" Source="$(var.MgSource)\Server\FDO\SDFMessage.dll" />
<File Id="SdfProvider" Checksum="yes" Source="$(var.MgSource)\Server\FDO\SDFProvider.dll" />
</Component>
<!-- SHP Provider -->
- <Component Id="FdoShpProviderComponent" Guid="AE77DBB1-1453-4528-A6F3-D8B58DEC90B1">
+ <Component Id="FdoShpProviderComponent" Win64="$(var.Win64)" Guid="AE77DBB1-1453-4528-A6F3-D8B58DEC90B1">
<File Id="ShpMessage" Checksum="yes" Source="$(var.MgSource)\Server\FDO\SHPMessage.dll" />
<File Id="ShpOverrides" Checksum="yes" Source="$(var.MgSource)\Server\FDO\SHPOverrides.dll" />
<File Id="ShpProvider" Checksum="yes" Source="$(var.MgSource)\Server\FDO\SHPProvider.dll" />
</Component>
<!-- SQLite Provider -->
- <Component Id="FdoSltProviderComponent" Guid="B08D37EF-BE05-486B-ACE5-E1C4CF15112E">
+ <Component Id="FdoSltProviderComponent" Win64="$(var.Win64)" Guid="B08D37EF-BE05-486B-ACE5-E1C4CF15112E">
<File Id="SltProvider" Checksum="yes" Source="$(var.MgSource)\Server\FDO\SQLiteProvider.dll" />
</Component>
<!-- SQL Server Spatial Provider -->
- <Component Id="FdoSqlServerSpatialProviderComponent" Guid="C7BBA455-5885-4207-953E-C5C6455FF7FB">
+ <Component Id="FdoSqlServerSpatialProviderComponent" Win64="$(var.Win64)" Guid="C7BBA455-5885-4207-953E-C5C6455FF7FB">
<File Id="SqlServerSpatialOverrides" Checksum="yes" Source="$(var.MgSource)\Server\FDO\SQLServerSpatialOverrides.dll" />
<File Id="SqlServerSpatialProvider" Checksum="yes" Source="$(var.MgSource)\Server\FDO\SQLServerSpatialProvider.dll" />
</Component>
<!-- WFS Provider -->
- <Component Id="FdoWfsProviderComponent" Guid="FE44D851-BBE6-4D72-811F-0BAA1B81A29B">
+ <Component Id="FdoWfsProviderComponent" Win64="$(var.Win64)" Guid="FE44D851-BBE6-4D72-811F-0BAA1B81A29B">
<File Id="WfsMessage" Checksum="yes" Source="$(var.MgSource)\Server\FDO\WFSMessage.dll" />
<File Id="WfsProvider" Checksum="yes" Source="$(var.MgSource)\Server\FDO\WFSProvider.dll" />
</Component>
<!-- WMS Provider -->
- <Component Id="FdoWmsProviderComponent" Guid="97C77CE8-4F97-49E3-B6D8-E4A40DB02190">
+ <Component Id="FdoWmsProviderComponent" Win64="$(var.Win64)" Guid="97C77CE8-4F97-49E3-B6D8-E4A40DB02190">
<File Id="WmsMessage" Checksum="yes" Source="$(var.MgSource)\Server\FDO\WMSMessage.dll" />
<File Id="WmsOverrides" Checksum="yes" Source="$(var.MgSource)\Server\FDO\WMSOverrides.dll" />
<File Id="WmsProvider" Checksum="yes" Source="$(var.MgSource)\Server\FDO\WMSProvider.dll" />
Modified: trunk/Installer/Libraries/MapGuide Server/MapGuide Server.wixproj
===================================================================
--- trunk/Installer/Libraries/MapGuide Server/MapGuide Server.wixproj 2010-06-28 00:54:49 UTC (rev 4985)
+++ trunk/Installer/Libraries/MapGuide Server/MapGuide Server.wixproj 2010-06-28 06:55:03 UTC (rev 4986)
@@ -15,13 +15,13 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
- <DefineConstants>Debug;MgRegKey=$(MgRegKey);MgSource=$(MgSource)</DefineConstants>
+ <DefineConstants>Debug;MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform)</DefineConstants>
<LibBindFiles>True</LibBindFiles>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
- <DefineConstants>MgCulture=$(MgCulture);MgRegKey=$(MgRegKey);MgSource=$(MgSource)</DefineConstants>
+ <DefineConstants>MgCulture=$(MgCulture);MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform)</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Compile Include="FDO.wxs" />
Modified: trunk/Installer/Libraries/MapGuide Server/MapGuideServer.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Server/MapGuideServer.wxs 2010-06-28 00:54:49 UTC (rev 4985)
+++ trunk/Installer/Libraries/MapGuide Server/MapGuideServer.wxs 2010-06-28 06:55:03 UTC (rev 4986)
@@ -2,11 +2,18 @@
<Wix
xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+ <?if "$(var.MgPlatform)" = "x64" ?>
+ <?define Win64 = "yes" ?>
+ <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
+ <?else ?>
+ <?define Win64 = "no" ?>
+ <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
+ <?endif ?>
<Fragment>
<DirectoryRef Id="ServerParentFolder">
<Directory Id="SERVERROOTLOCATION" Name="Server">
- <Component Id="ServerPortConfigComponent" Guid="68F33B54-F8C2-4BF5-AD25-3E549C73075C" Feature="ServerFeature">
+ <Component Id="ServerPortConfigComponent" Win64="$(var.Win64)" Guid="68F33B54-F8C2-4BF5-AD25-3E549C73075C" Feature="ServerFeature">
<CreateFolder />
<IniFile Id="INISETSERVERADMINPORT"
Action="addLine"
@@ -32,7 +39,7 @@
</Component>
<Directory Id="SERVERBINLOCATION" Name="Bin" />
<Directory Id="SERVERLOGSLOCATION" Name="Logs">
- <Component Id="ServerLogsComponent" Guid="B8107569-201D-4FAC-B1B1-BB3AC7207782" Feature="ServerLogsFeature">
+ <Component Id="ServerLogsComponent" Win64="$(var.Win64)" Guid="B8107569-201D-4FAC-B1B1-BB3AC7207782" Feature="ServerLogsFeature">
<CreateFolder />
<IniFile Id="INISETLOGPATH"
Action="addLine"
@@ -44,7 +51,7 @@
</Component>
</Directory>
<Directory Id="SERVERPACKAGESLOCATION" Name="Packages">
- <Component Id="ServerPackagesComponent" Guid="58B60D26-35CB-4343-9854-EBC766C775B2" Feature="ServerPackagesFeature">
+ <Component Id="ServerPackagesComponent" Win64="$(var.Win64)" Guid="58B60D26-35CB-4343-9854-EBC766C775B2" Feature="ServerPackagesFeature">
<CreateFolder />
<IniFile Id="INISETPACKAGESPATH"
Action="addLine"
@@ -56,11 +63,11 @@
</Component>
</Directory>
<Directory Id="SERVERREPOSITORIESLOCATION" Name="Repositories">
- <Component Id="ServerRepositoriesComponent" Guid="2D89F4D5-4D13-434D-86DE-F34768DE46FA" Feature="ServerRepositoriesFeature">
+ <Component Id="ServerRepositoriesComponent" Win64="$(var.Win64)" Guid="2D89F4D5-4D13-434D-86DE-F34768DE46FA" Feature="ServerRepositoriesFeature">
<CreateFolder />
</Component>
<Directory Id="SERVERREPOSITORIESLIBRARYLOCATION" Name="Library">
- <Component Id="ServerRepositoriesLibraryComponent" Guid="1ABDE417-D567-42cd-AC0F-78A7C444DB4A" Feature="ServerRepositoriesLibraryFeature">
+ <Component Id="ServerRepositoriesLibraryComponent" Win64="$(var.Win64)" Guid="1ABDE417-D567-42cd-AC0F-78A7C444DB4A" Feature="ServerRepositoriesLibraryFeature">
<CreateFolder />
<IniFile Id="INISETREPOSITORIESLIBRARYPATH"
Action="addLine"
@@ -71,7 +78,7 @@
Value="[SERVERREPOSITORIESLIBRARYLOCATION]" />
</Component>
<Directory Id="SERVERREPOSITORIESLIBRARYDATAFILESLOCATION" Name="DataFiles">
- <Component Id="ServerRepositoriesLibraryDataFilesComponent" Guid="12998202-7FEE-448B-9371-42193B12EC7E" Feature="ServerRepositoriesLibraryFeature">
+ <Component Id="ServerRepositoriesLibraryDataFilesComponent" Win64="$(var.Win64)" Guid="12998202-7FEE-448B-9371-42193B12EC7E" Feature="ServerRepositoriesLibraryFeature">
<CreateFolder />
<IniFile Id="INISETREPOSITORIESLIBRARYDATAFILESPATH"
Action="addLine"
@@ -84,7 +91,7 @@
</Directory>
</Directory>
<Directory Id="SERVERREPOSITORIESSESSIONLOCATION" Name="Session">
- <Component Id="ServerRepositoriesSessionComponent" Guid="BB476765-5FA5-4CB0-AA63-1CCDE8867F7E" Feature="ServerRepositoriesSessionFeature">
+ <Component Id="ServerRepositoriesSessionComponent" Win64="$(var.Win64)" Guid="BB476765-5FA5-4CB0-AA63-1CCDE8867F7E" Feature="ServerRepositoriesSessionFeature">
<CreateFolder/>
<IniFile Id="INISETREPOSITORIESSESSIONPATH"
Action="addLine"
@@ -95,7 +102,7 @@
Value="[SERVERREPOSITORIESSESSIONLOCATION]" />
</Component>
<Directory Id="SERVERREPOSITORIESSESSIONDATAFILESLOCATION" Name="DataFiles">
- <Component Id="ServerRepositoriesSessionDataFilesComponent" Guid="28C0B4C0-7516-43C5-94D4-8AAF4C0DB6EE" Feature="ServerRepositoriesSessionFeature">
+ <Component Id="ServerRepositoriesSessionDataFilesComponent" Win64="$(var.Win64)" Guid="28C0B4C0-7516-43C5-94D4-8AAF4C0DB6EE" Feature="ServerRepositoriesSessionFeature">
<CreateFolder />
<IniFile Id="INISETREPOSITORIESSESSIONDATAFILESPATH"
Action="addLine"
@@ -108,7 +115,7 @@
</Directory>
</Directory>
<Directory Id="SERVERREPOSITORIESSITELOCATION" Name="Site">
- <Component Id="ServerRepositoriesSiteComponent" Guid="FAD5C161-00B2-4A26-A0B1-9F82DE049E0B" Feature="ServerRepositoriesSiteFeature">
+ <Component Id="ServerRepositoriesSiteComponent" Win64="$(var.Win64)" Guid="FAD5C161-00B2-4A26-A0B1-9F82DE049E0B" Feature="ServerRepositoriesSiteFeature">
<CreateFolder />
<IniFile Id="INISETREPOSITORIESSITEPATH"
Action="addLine"
@@ -120,7 +127,7 @@
</Component>
</Directory>
<Directory Id="SERVERREPOSITORIESTILECACHELOCATION" Name="TileCache">
- <Component Id="ServerRepositoriesTileCacheComponent" Guid="902988DA-F9F8-4827-9CC0-63756A4BEE2E" Feature="ServerRepositoriesTileCacheFeature">
+ <Component Id="ServerRepositoriesTileCacheComponent" Win64="$(var.Win64)" Guid="902988DA-F9F8-4827-9CC0-63756A4BEE2E" Feature="ServerRepositoriesTileCacheFeature">
<CreateFolder />
<IniFile Id="INISETREPOSITORIESTILECACHEPATH"
Action="addLine"
@@ -133,7 +140,7 @@
</Directory>
</Directory>
<Directory Id="SERVERRESOURCESLOCATION" Name="Resources">
- <Component Id="ServerResourcesComponent" Guid="73D633D6-F358-4DED-A9A7-0A55B133F8EA">
+ <Component Id="ServerResourcesComponent" Win64="$(var.Win64)" Guid="73D633D6-F358-4DED-A9A7-0A55B133F8EA">
<CreateFolder />
<IniFile Id="INISETRESOURCESPATH"
Action="addLine"
@@ -145,7 +152,7 @@
</Component>
</Directory>
<Directory Id="SERVERSCHEMALOCATION" Name="Schema">
- <Component Id="ServerSchemaComponent" Guid="4839A32B-CB9F-4FCC-8F40-0139C8E1FB3A">
+ <Component Id="ServerSchemaComponent" Win64="$(var.Win64)" Guid="4839A32B-CB9F-4FCC-8F40-0139C8E1FB3A">
<CreateFolder />
<IniFile Id="INISETSCHEMAPATH"
Action="addLine"
@@ -157,7 +164,7 @@
</Component>
</Directory>
<Directory Id="SERVERTEMPLOCATION" Name="Temp">
- <Component Id="ServerTempComponent" Guid="8FEBC0F2-A1CA-43D5-B7EF-C11907B9A67D" Feature="ServerTempFeature">
+ <Component Id="ServerTempComponent" Win64="$(var.Win64)" Guid="8FEBC0F2-A1CA-43D5-B7EF-C11907B9A67D" Feature="ServerTempFeature">
<CreateFolder>
<util:PermissionEx User="Everyone" GenericAll="yes" />
</CreateFolder>
@@ -171,7 +178,7 @@
</Component>
</Directory>
<Directory Id="SERVERWFSLOCATION" Name="Wfs">
- <Component Id="ServerWfsComponent" Guid="A27AF9DB-C72E-477C-83BD-ECD40601C5FC">
+ <Component Id="ServerWfsComponent" Win64="$(var.Win64)" Guid="A27AF9DB-C72E-477C-83BD-ECD40601C5FC">
<CreateFolder />
<IniFile Id="INISETWFSPATH"
Action="addLine"
@@ -183,7 +190,7 @@
</Component>
</Directory>
<Directory Id="SERVERWMSLOCATION" Name="Wms">
- <Component Id="ServerWmsComponent" Guid="AB35AD62-B06B-4D1D-90DB-FC8A6B49078F">
+ <Component Id="ServerWmsComponent" Win64="$(var.Win64)" Guid="AB35AD62-B06B-4D1D-90DB-FC8A6B49078F">
<CreateFolder />
<IniFile Id="INISETWMSPATH"
Action="addLine"
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs 2010-06-28 00:54:49 UTC (rev 4985)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs 2010-06-28 06:55:03 UTC (rev 4986)
@@ -2,9 +2,22 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:iis="http://schemas.microsoft.com/wix/IIsExtension"
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+ <?if "$(var.MgPlatform)" = "x64" ?>
+ <?define Win64 = "yes" ?>
+ <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
+ <?else ?>
+ <?define Win64 = "no" ?>
+ <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
+ <?endif ?>
<Fragment>
<Property Id="FRAMEWORKDIR">
- <RegistrySearch Id="DotNetSearch" Root="HKLM" Key="Software\Microsoft\.NETFramework" Name="InstallRoot" Type="directory" />
+ <RegistrySearch
+ Id="DotNetSearch"
+ Root="HKLM"
+ Win64="$(var.Win64)"
+ Key="Software\Microsoft\.NETFramework"
+ Name="InstallRoot"
+ Type="directory" />
</Property>
<PropertyRef Id="MGWEB_CONFIG"/>
<PropertyRef Id="IISVERSIONMAJOR"/>
@@ -36,7 +49,7 @@
<Feature Id="IISSetupFeature" Level="1" Display="hidden" >
<!-- IIS5 Base component -->
- <Component Id="IIS5BaseMapGuideComponent" Guid="4174B322-8449-4299-813F-E2B1FCB4ECB4" Directory="WEBEXTENSIONSLOCATION">
+ <Component Id="IIS5BaseMapGuideComponent" Win64="$(var.Win64)" Guid="4174B322-8449-4299-813F-E2B1FCB4ECB4" Directory="WEBEXTENSIONSLOCATION">
<Condition>MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#5"</Condition>
<CreateFolder />
<iis:WebVirtualDir Id="IIS5MapGuideVDir" Alias="[VIRTUALDIR]" Directory="WEBROOTLOCATION" WebSite="IISDefaultWebSite">
@@ -64,7 +77,7 @@
</Component>
<!-- IIS5 PHP MapViewer component -->
- <Component Id="IIS5PhpViewerComponent" Guid="1E56B410-1305-4406-BDFB-1252E159B746" Directory="WEBEXTENSIONSLOCATION">
+ <Component Id="IIS5PhpViewerComponent" Win64="$(var.Win64)" Guid="1E56B410-1305-4406-BDFB-1252E159B746" Directory="WEBEXTENSIONSLOCATION">
<Condition>MGWEB_CONFIG="IIS" AND IIS_API_TYPE="PHP" AND IISVERSIONMAJOR="#5"</Condition>
<CreateFolder />
<iis:WebVirtualDir Id="IIS5PhpViewerVDir" Alias="[VIRTUALDIR]/mapviewerajax" Directory="dir_mapviewerphp_0" WebSite="IISDefaultWebSite">
@@ -73,7 +86,7 @@
</Component>
<!-- IIS5 DotNet MapViewer component -->
- <Component Id="IIS5DotNetViewerComponent" Guid="EC460125-D5D4-4596-BD03-B8D920F02E7F" Directory="WEBEXTENSIONSLOCATION">
+ <Component Id="IIS5DotNetViewerComponent" Win64="$(var.Win64)" Guid="EC460125-D5D4-4596-BD03-B8D920F02E7F" Directory="WEBEXTENSIONSLOCATION">
<Condition>NETFRAMEWORK20 AND MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#5"</Condition>
<CreateFolder />
<iis:WebVirtualDir Id="IIS5DotNetViewerVDir" Alias="[VIRTUALDIR]/mapviewerajax" Directory="dir_mapviewernet_0" WebSite="IISDefaultWebSite">
@@ -83,14 +96,14 @@
</Component>
<!-- Trac #361 -->
- <Component Id="PersistWebsiteSelection" Guid="0C0CBB26-C99B-486a-9367-15D49AC9726B" Directory="WEBEXTENSIONSLOCATION">
+ <Component Id="PersistWebsiteSelection" Win64="$(var.Win64)" Guid="0C0CBB26-C99B-486a-9367-15D49AC9726B" Directory="WEBEXTENSIONSLOCATION">
<RegistryKey Root="HKLM" Key="$(var.MgRegKey)">
<RegistryValue Name="MG_WEBSITE" Type="string" Value="[MG_WEBSITE]" />
</RegistryKey>
</Component>
<!-- IIS6 Base component -->
- <Component Id="IIS6BaseMapGuideComponent" Guid="BC77760D-55D5-4111-BC1D-50CEC0482D60" Directory="WEBEXTENSIONSLOCATION">
+ <Component Id="IIS6BaseMapGuideComponent" Win64="$(var.Win64)" Guid="BC77760D-55D5-4111-BC1D-50CEC0482D60" Directory="WEBEXTENSIONSLOCATION">
<Condition>MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#6"</Condition>
<CreateFolder />
<iis:WebAppPool Id="IIS6MapGuideAppPool" Name="[APP_POOL_NAME]" />
@@ -122,7 +135,7 @@
</Component>
<!-- IIS6 PHP MapViewer component -->
- <Component Id="IIS6PhpViewerComponent" Guid="6CDC8E73-B6B1-4A2E-98E3-953C399D1D0D" Directory="WEBEXTENSIONSLOCATION">
+ <Component Id="IIS6PhpViewerComponent" Win64="$(var.Win64)" Guid="6CDC8E73-B6B1-4A2E-98E3-953C399D1D0D" Directory="WEBEXTENSIONSLOCATION">
<Condition>MGWEB_CONFIG="IIS" AND IIS_API_TYPE="PHP" AND IISVERSIONMAJOR="#6"</Condition>
<CreateFolder />
<iis:WebVirtualDir Id="IIS6PhpViewerVDir" Alias="[VIRTUALDIR]/mapviewerajax" Directory="dir_mapviewerphp_0" WebSite="IISDefaultWebSite">
@@ -131,7 +144,7 @@
</Component>
<!-- IIS6 DotNet MapViewer component -->
- <Component Id="IIS6DotNetViewerComponent" Guid="357E1C68-9E29-474F-A783-6F8FD8BCEAB4" Directory="WEBEXTENSIONSLOCATION">
+ <Component Id="IIS6DotNetViewerComponent" Win64="$(var.Win64)" Guid="357E1C68-9E29-474F-A783-6F8FD8BCEAB4" Directory="WEBEXTENSIONSLOCATION">
<Condition>NETFRAMEWORK20 AND MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#6"</Condition>
<CreateFolder />
<iis:WebVirtualDir Id="IIS6DotNetViewerVDir" Alias="[VIRTUALDIR]/mapviewerajax" Directory="dir_mapviewernet_0" WebSite="IISDefaultWebSite">
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/MapGuide Web Extensions.wixproj
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/MapGuide Web Extensions.wixproj 2010-06-28 00:54:49 UTC (rev 4985)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/MapGuide Web Extensions.wixproj 2010-06-28 06:55:03 UTC (rev 4986)
@@ -14,12 +14,12 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
- <DefineConstants>Debug;MgRegKey=$(MgRegKey);MgSource=$(MgSource)</DefineConstants>
+ <DefineConstants>Debug;MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform)</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
- <DefineConstants>MgRegKey=$(MgRegKey);MgSource=$(MgSource)</DefineConstants>
+ <DefineConstants>MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform)</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Compile Include="Apache.wxs" />
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs 2010-06-28 00:54:49 UTC (rev 4985)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs 2010-06-28 06:55:03 UTC (rev 4986)
@@ -1,6 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+ <?if "$(var.MgPlatform)" = "x64" ?>
+ <?define Win64 = "yes" ?>
+ <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
+ <?else ?>
+ <?define Win64 = "no" ?>
+ <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
+ <?endif ?>
<Fragment>
<PropertyRef Id="NETFRAMEWORK20"/>
@@ -9,7 +16,7 @@
<DirectoryRef Id="WebParentFolder">
<Directory Id="WEBEXTENSIONSLOCATION" Name="Web">
- <Component Id="WebPortConfigComponent" Guid="3C8FE0E1-3161-423D-9E08-0983B7075C4C" Feature="WebExtensionsFeature">
+ <Component Id="WebPortConfigComponent" Win64="$(var.Win64)" Guid="3C8FE0E1-3161-423D-9E08-0983B7075C4C" Feature="WebExtensionsFeature">
<CreateFolder />
<IniFile Id="INISETWEBADMINPORT"
Action="addLine"
@@ -33,7 +40,7 @@
Section="SiteConnectionProperties"
Value="[MG_SITE_PORT]"/>
</Component>
- <Component Id="WebExtensionsComponent" Guid="AE77C8EB-284D-4410-903F-92AD516DEA93">
+ <Component Id="WebExtensionsComponent" Win64="$(var.Win64)" Guid="AE77C8EB-284D-4410-903F-92AD516DEA93">
<RegistryKey Id="MapGuideKey" Action="create" Root="HKLM" Key="$(var.MgRegKey)">
<RegistryValue Id="IisApiType" Action="write" Type="string" Name="IIS_API_TYPE" Value="[IIS_API_TYPE]" />
<RegistryValue Id="MgWebConfig" Action="write" Type="string" Name="MGWEB_CONFIG" Value="[MGWEB_CONFIG]" />
@@ -41,7 +48,7 @@
<CreateFolder />
</Component>
<Directory Id="WEBTEMPLOCATION" Name="Temp">
- <Component Id="WebTempComponent" Guid="38C3E0A5-88F8-4A98-896D-CCB5DADCC566" Feature="WebTempFeature">
+ <Component Id="WebTempComponent" Win64="$(var.Win64)" Guid="38C3E0A5-88F8-4A98-896D-CCB5DADCC566" Feature="WebTempFeature">
<CreateFolder>
<util:PermissionEx User="Everyone" GenericAll="yes" />
</CreateFolder>
@@ -49,7 +56,7 @@
</Directory>
<Directory Id="APACHELOCATION" Name="Apache2" />
<Directory Id="PHPLOCATION" Name="Php">
- <Component Id="WebExtPhpComponent" Guid="88814E96-07DC-4fb7-A993-F31FC1E000CB" Feature="WebExtPhpFeature">
+ <Component Id="WebExtPhpComponent" Win64="$(var.Win64)" Guid="88814E96-07DC-4fb7-A993-F31FC1E000CB" Feature="WebExtPhpFeature">
<CreateFolder />
<Environment Id="PhpEnvVar"
Action="set"
@@ -78,7 +85,7 @@
</Directory>
<Directory Id="WEBROOTLOCATION" Name="www">
<Directory Id="HELPLOCATION" Name="help" />
- <Component Id="WebRootComponent" Guid="A84579E6-285D-4869-9F04-AA47FB1ACFD5" Feature="WebExtensionsFeature">
+ <Component Id="WebRootComponent" Win64="$(var.Win64)" Guid="A84579E6-285D-4869-9F04-AA47FB1ACFD5" Feature="WebExtensionsFeature">
<CreateFolder />
<RemoveFile Id="MapGuideWebConfig" On="uninstall" Name="web.config" Property="WEBROOTLOCATION" />
<RemoveFile Id="MapAgentWebConfig" On="uninstall" Name="web.config" Property="dir_mapagent_0" />
@@ -171,7 +178,7 @@
</Feature>
<Feature Id="WebTempFeature" Title="!(loc.WebTempFeature)" Level="1" ConfigurableDirectory="WEBTEMPLOCATION" Description="!(loc.WebTempFeature_Description)" Absent="disallow" AllowAdvertise="no" TypicalDefault="install" InstallDefault="local" />
<Feature Id="WebExtSamplesFeature" Title="!(loc.WebExtSamplesFeature)" Level="1" Description="!(loc.WebExtSamplesFeature_Description)" AllowAdvertise="no" TypicalDefault="install" InstallDefault="local">
- <Component Id="WebExtSamplesComponent" Guid="525BAE2A-F8E4-415F-A095-91DDD17FD5E6" Directory="WEBEXTENSIONSLOCATION" >
+ <Component Id="WebExtSamplesComponent" Win64="$(var.Win64)" Guid="525BAE2A-F8E4-415F-A095-91DDD17FD5E6" Directory="WEBEXTENSIONSLOCATION" >
<!-- This is required because a UI bug displays the feature as network-installable if there are no folders or files. -->
<CreateFolder />
</Component>
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs 2010-06-28 00:54:49 UTC (rev 4985)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs 2010-06-28 06:55:03 UTC (rev 4986)
@@ -1,11 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+ <?if "$(var.MgPlatform)" = "x64" ?>
+ <?define Win64 = "yes" ?>
+ <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
+ <?else ?>
+ <?define Win64 = "no" ?>
+ <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
+ <?endif ?>
<Fragment>
<DirectoryRef Id="ProgramMenuFolder">
<!-- HACK: For some reason the MG_VERSION_MAJOR_MINOR property doesn't evaluate, so hardcode it for now -->
<Directory Id="MapGuideOpenSourceMenuLocation" Name="MapGuide Open Source 2.2">
- <Component Id="GenericShortcutComponent" Guid="243CE0F3-D6BC-476B-910E-6F34DA54A2E2">
+ <Component Id="GenericShortcutComponent" Win64="$(var.Win64)" Guid="243CE0F3-D6BC-476B-910E-6F34DA54A2E2">
<CreateFolder />
<RegistryKey Root="HKCU" Key="$(var.MgRegKey)\GenericShortcut">
<RegistryValue
@@ -15,7 +22,7 @@
</RegistryKey>
<RemoveFolder Id="MapGuideOpenSourceMenuLocation" On="uninstall" />
</Component>
- <Component Id="ApacheWebApiShortcutComponent" Guid="5FC3FEA9-4DCD-404A-8835-43C8C2F96E29">
+ <Component Id="ApacheWebApiShortcutComponent" Win64="$(var.Win64)" Guid="5FC3FEA9-4DCD-404A-8835-43C8C2F96E29">
<Condition>MGWEB_CONFIG="APACHE"</Condition>
<CreateFolder />
<util:InternetShortcut Id="ApacheWebApi"
@@ -29,7 +36,7 @@
KeyPath="yes" />
</RegistryKey>
</Component>
- <Component Id="ApacheViewerApiShortcutComponent" Guid="4AABF916-33FC-440D-9D6F-8CE95F2ADE7A">
+ <Component Id="ApacheViewerApiShortcutComponent" Win64="$(var.Win64)" Guid="4AABF916-33FC-440D-9D6F-8CE95F2ADE7A">
<Condition>MGWEB_CONFIG="APACHE"</Condition>
<CreateFolder />
<util:InternetShortcut Id="ApacheViewerApi"
@@ -43,7 +50,7 @@
KeyPath="yes" />
</RegistryKey>
</Component>
- <Component Id="WebApacheShortcutComponent" Guid="2EBC8176-07C5-40A9-97F9-C3E83836637E">
+ <Component Id="WebApacheShortcutComponent" Win64="$(var.Win64)" Guid="2EBC8176-07C5-40A9-97F9-C3E83836637E">
<Condition>MGWEB_CONFIG="APACHE"</Condition>
<util:InternetShortcut Id="ApacheSiteAdmin"
Directory="MapGuideOpenSourceMenuLocation"
@@ -64,7 +71,7 @@
KeyPath="yes" />
</RegistryKey>
</Component>
- <Component Id="IISWebApiShortcutComponent" Guid="DFA7D99A-3760-4072-9510-7EC5D658FB5F">
+ <Component Id="IISWebApiShortcutComponent" Win64="$(var.Win64)" Guid="DFA7D99A-3760-4072-9510-7EC5D658FB5F">
<Condition>MGWEB_CONFIG="IIS"</Condition>
<CreateFolder />
<util:InternetShortcut Id="IISWebApi"
@@ -78,7 +85,7 @@
KeyPath="yes" />
</RegistryKey>
</Component>
- <Component Id="IISViewerApiShortcutComponent" Guid="F2CCA279-4C99-48CE-9F79-7465449E2B33">
+ <Component Id="IISViewerApiShortcutComponent" Win64="$(var.Win64)" Guid="F2CCA279-4C99-48CE-9F79-7465449E2B33">
<Condition>MGWEB_CONFIG="IIS"</Condition>
<CreateFolder />
<util:InternetShortcut Id="IISViewerApi"
@@ -92,7 +99,7 @@
KeyPath="yes" />
</RegistryKey>
</Component>
- <Component Id="WebIISShortcutComponent" Guid="F59A450A-84DE-4E2E-B942-BD416CDEBBF3">
+ <Component Id="WebIISShortcutComponent" Win64="$(var.Win64)" Guid="F59A450A-84DE-4E2E-B942-BD416CDEBBF3">
<Condition>MGWEB_CONFIG="IIS"</Condition>
<util:InternetShortcut Id="IISSiteAdmin"
Directory="MapGuideOpenSourceMenuLocation"
@@ -114,7 +121,7 @@
</RegistryKey>
</Component>
<Directory Id="WebResourcesLocation" Name="Web Resources">
- <Component Id="WebShortcutsComponent" Guid="7D2E24E9-533B-4119-A6D1-E48A33BF34C3">
+ <Component Id="WebShortcutsComponent" Win64="$(var.Win64)" Guid="7D2E24E9-533B-4119-A6D1-E48A33BF34C3">
<CreateFolder />
<util:InternetShortcut Id="MapGuideHome"
Directory="WebResourcesLocation"
Modified: trunk/Installer/build64.bat
===================================================================
--- trunk/Installer/build64.bat 2010-06-28 00:54:49 UTC (rev 4985)
+++ trunk/Installer/build64.bat 2010-06-28 06:55:03 UTC (rev 4986)
@@ -352,7 +352,7 @@
:generate
echo [generate]: MapGuide Installer
-SET PARAFFIN=paraffin.exe -guids -direXclude .svn
+SET PARAFFIN=paraffin.exe -Win64 -guids -direXclude .svn
SET WIX_INC_SERVER="%INSTALLER_DEV%\Libraries\MapGuide Server\FileIncludes"
SET WIX_INC_WEB="%INSTALLER_DEV%\Libraries\MapGuide Web Extensions\FileIncludes"
More information about the mapguide-commits
mailing list