[mapguide-commits] r6553 - in trunk/Installer: . Installers/MapGuide Libraries/CS Map Libraries/MapGuide Server Libraries/MapGuide Web Extensions Support/Web/x64/configs/Apache2/conf

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Mon Mar 19 04:04:24 EDT 2012 

Author: jng
Date: 2012-03-19 01:04:24 -0700 (Mon, 19 Mar 2012)
New Revision: 6553

Modified:
   trunk/Installer/InstallerWix_VS2010.sln
   trunk/Installer/Installers/MapGuide/MapGuide.wixproj
   trunk/Installer/Libraries/CS Map/CS Map.wixproj
   trunk/Installer/Libraries/MapGuide Server/MapGuide Server.wixproj
   trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs
   trunk/Installer/Libraries/MapGuide Web Extensions/MapGuide Web Extensions.wixproj
   trunk/Installer/Support/Web/x64/configs/Apache2/conf/httpd.conf
   trunk/Installer/build64.bat
Log:
#1805: 64-bit configuration fixes

Modified: trunk/Installer/InstallerWix_VS2010.sln
===================================================================
--- trunk/Installer/InstallerWix_VS2010.sln	2012-03-19 06:01:51 UTC (rev 6552)
+++ trunk/Installer/InstallerWix_VS2010.sln	2012-03-19 08:04:24 UTC (rev 6553)
@@ -10,24 +10,38 @@
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{01313DB9-2AAF-4791-9B81-69BCE3194531}.Debug|x64.ActiveCfg = Debug|x86
 		{01313DB9-2AAF-4791-9B81-69BCE3194531}.Debug|x86.ActiveCfg = Debug|x86
 		{01313DB9-2AAF-4791-9B81-69BCE3194531}.Debug|x86.Build.0 = Debug|x86
+		{01313DB9-2AAF-4791-9B81-69BCE3194531}.Release|x64.ActiveCfg = Release|x86
+		{01313DB9-2AAF-4791-9B81-69BCE3194531}.Release|x64.Build.0 = Release|x86
 		{01313DB9-2AAF-4791-9B81-69BCE3194531}.Release|x86.ActiveCfg = Release|x86
 		{01313DB9-2AAF-4791-9B81-69BCE3194531}.Release|x86.Build.0 = Release|x86
+		{715E2D88-E822-4A9A-A5A2-DBB71CD9B320}.Debug|x64.ActiveCfg = Debug|x86
 		{715E2D88-E822-4A9A-A5A2-DBB71CD9B320}.Debug|x86.ActiveCfg = Debug|x86
 		{715E2D88-E822-4A9A-A5A2-DBB71CD9B320}.Debug|x86.Build.0 = Debug|x86
+		{715E2D88-E822-4A9A-A5A2-DBB71CD9B320}.Release|x64.ActiveCfg = Release|x86
+		{715E2D88-E822-4A9A-A5A2-DBB71CD9B320}.Release|x64.Build.0 = Release|x86
 		{715E2D88-E822-4A9A-A5A2-DBB71CD9B320}.Release|x86.ActiveCfg = Release|x86
 		{715E2D88-E822-4A9A-A5A2-DBB71CD9B320}.Release|x86.Build.0 = Release|x86
+		{D41D53C4-433E-47B5-B663-E79B5569EE22}.Debug|x64.ActiveCfg = Debug|x86
 		{D41D53C4-433E-47B5-B663-E79B5569EE22}.Debug|x86.ActiveCfg = Debug|x86
 		{D41D53C4-433E-47B5-B663-E79B5569EE22}.Debug|x86.Build.0 = Debug|x86
+		{D41D53C4-433E-47B5-B663-E79B5569EE22}.Release|x64.ActiveCfg = Release|x86
+		{D41D53C4-433E-47B5-B663-E79B5569EE22}.Release|x64.Build.0 = Release|x86
 		{D41D53C4-433E-47B5-B663-E79B5569EE22}.Release|x86.ActiveCfg = Release|x86
 		{D41D53C4-433E-47B5-B663-E79B5569EE22}.Release|x86.Build.0 = Release|x86
+		{12C62F60-6F52-4112-84AB-0FA8ED44EE77}.Debug|x64.ActiveCfg = Debug|x86
 		{12C62F60-6F52-4112-84AB-0FA8ED44EE77}.Debug|x86.ActiveCfg = Debug|x86
 		{12C62F60-6F52-4112-84AB-0FA8ED44EE77}.Debug|x86.Build.0 = Debug|x86
+		{12C62F60-6F52-4112-84AB-0FA8ED44EE77}.Release|x64.ActiveCfg = Release|x86
+		{12C62F60-6F52-4112-84AB-0FA8ED44EE77}.Release|x64.Build.0 = Release|x86
 		{12C62F60-6F52-4112-84AB-0FA8ED44EE77}.Release|x86.ActiveCfg = Release|x86
 		{12C62F60-6F52-4112-84AB-0FA8ED44EE77}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection

Modified: trunk/Installer/Installers/MapGuide/MapGuide.wixproj
===================================================================
--- trunk/Installer/Installers/MapGuide/MapGuide.wixproj	2012-03-19 06:01:51 UTC (rev 6552)
+++ trunk/Installer/Installers/MapGuide/MapGuide.wixproj	2012-03-19 08:04:24 UTC (rev 6553)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -31,6 +32,22 @@
     <Cultures>$(MgCulture)</Cultures>
     <SuppressIces>ICE47</SuppressIces>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <DefineConstants>Debug;MgTitle=$(MgTitle);MgVersion=$(MgVersion);MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform)</DefineConstants>
+    <Cultures>$(MgCulture)</Cultures>
+    <SuppressIces>ICE47</SuppressIces>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <SuppressValidation>False</SuppressValidation>
+    <SuppressPdbOutput>True</SuppressPdbOutput>
+    <DefineConstants>MgTitle=$(MgTitle);MgVersion=$(MgVersion);MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform)</DefineConstants>
+    <Cultures>$(MgCulture)</Cultures>
+    <SuppressIces>ICE47</SuppressIces>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="MapGuide.wxs" />
   </ItemGroup>

Modified: trunk/Installer/Libraries/CS Map/CS Map.wixproj
===================================================================
--- trunk/Installer/Libraries/CS Map/CS Map.wixproj	2012-03-19 06:01:51 UTC (rev 6552)
+++ trunk/Installer/Libraries/CS Map/CS Map.wixproj	2012-03-19 08:04:24 UTC (rev 6553)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -21,6 +22,16 @@
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <DefineConstants>MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform)</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <DefineConstants>Debug;MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform)</DefineConstants>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <DefineConstants>MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform)</DefineConstants>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="FileIncludes\incCSMapDictionaryFiles.wxs" />
     <Compile Include="CSMap.wxs" />

Modified: trunk/Installer/Libraries/MapGuide Server/MapGuide Server.wixproj
===================================================================
--- trunk/Installer/Libraries/MapGuide Server/MapGuide Server.wixproj	2012-03-19 06:01:51 UTC (rev 6552)
+++ trunk/Installer/Libraries/MapGuide Server/MapGuide Server.wixproj	2012-03-19 08:04:24 UTC (rev 6553)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -23,6 +24,17 @@
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <DefineConstants>MgCulture=$(MgCulture);MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform)</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <DefineConstants>Debug;MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform)</DefineConstants>
+    <LibBindFiles>True</LibBindFiles>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <DefineConstants>MgCulture=$(MgCulture);MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform)</DefineConstants>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="FDO.wxs" />
     <Compile Include="FileIncludes\incBinFiles.wxs" />

Modified: trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs	2012-03-19 06:01:51 UTC (rev 6552)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs	2012-03-19 08:04:24 UTC (rev 6553)
@@ -3,17 +3,22 @@
      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" ?>
+        <?define Win64 = "yes" ?>
+        <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
+        <!-- isapi_MapAgent.dll -->
+        <?define FCGI_MAP = "[!file_MAPAGENTFILES_100]" ?>
+        <!-- php-cgi.exe -->
+        <?define PHP_CGI_EXE = "[!file_PHPFILES_26]" ?>
     <?else ?>
-       <?define Win64 = "no" ?>
-       <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
+        <?define Win64 = "no" ?>
+        <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
+        <!-- isapi_MapAgent.dll -->
+        <?define FCGI_MAP = "[!file_MAPAGENTFILES_100]" ?>
+        <!-- php-cgi.exe -->
+        <?define PHP_CGI_EXE = "[!file_PHPFILES_32]" ?>
     <?endif ?>
-	<!-- isapi_MapAgent.dll -->
-    <?define FCGI_MAP = "[!file_MAPAGENTFILES_100]" ?>
 	<!-- fcgiext.dll -->
     <?define PHP_MAP = "[WindowsFolder]system32\inetsrv\fcgiext.dll" ?>
-    <?define PHP_CGI_EXE = "[!file_PHPFILES_32]" ?>
     <Fragment>
         <Property Id="FRAMEWORKDIR">
             <RegistrySearch

Modified: trunk/Installer/Libraries/MapGuide Web Extensions/MapGuide Web Extensions.wixproj
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/MapGuide Web Extensions.wixproj	2012-03-19 06:01:51 UTC (rev 6552)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/MapGuide Web Extensions.wixproj	2012-03-19 08:04:24 UTC (rev 6553)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -21,6 +22,16 @@
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <DefineConstants>MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform)</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <DefineConstants>Debug;MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform)</DefineConstants>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <DefineConstants>MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform)</DefineConstants>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="Apache.wxs" />
     <Compile Include="FileIncludes\incApacheFiles.wxs" />

Modified: trunk/Installer/Support/Web/x64/configs/Apache2/conf/httpd.conf
===================================================================
--- trunk/Installer/Support/Web/x64/configs/Apache2/conf/httpd.conf	2012-03-19 06:01:51 UTC (rev 6552)
+++ trunk/Installer/Support/Web/x64/configs/Apache2/conf/httpd.conf	2012-03-19 08:04:24 UTC (rev 6553)
@@ -192,7 +192,7 @@
 #LoadModule usertrack_module modules/mod_usertrack.so
 #LoadModule vhost_alias_module modules/mod_vhost_alias.so
 #LoadModule ssl_module modules/mod_ssl.so
-LoadModule php5_module modules/php5apache2_2.dll
+LoadModule php5_module "%MG_WEB_PHP%/php5apache2_2.dll"
 LoadModule mgmapagent_module modules/mod_mgmapagent.so
 
 #

Modified: trunk/Installer/build64.bat
===================================================================
--- trunk/Installer/build64.bat	2012-03-19 06:01:51 UTC (rev 6552)
+++ trunk/Installer/build64.bat	2012-03-19 08:04:24 UTC (rev 6553)
@@ -53,6 +53,7 @@
 SET TYPEBUILD=Release64
 SET CONFIGURATION=Release
 SET PLATFORM=x64
+SET CPUTYPE=x64
 SET CULTURE=en-US
 SET INSTALLER_VERSION_MAJOR_MINOR=2.4
 SET INSTALLER_VERSION_MAJOR_MINOR_REV=%INSTALLER_VERSION_MAJOR_MINOR%.0
@@ -61,7 +62,7 @@
 SET INSTALLER_TITLE="MapGuide Open Source %INSTALLER_VERSION_MAJOR_MINOR% Trunk (%TYPEBUILD%)"
 SET MG_REG_KEY=Software\OSGeo\MapGuide\%INSTALLER_VERSION_MAJOR_MINOR_REV%
 SET MG_SOURCE=%CD%\..\MgDev\%TYPEBUILD%
-SET MG_SOURCE_INC=
+SET MG_SOURCE_INC=%MG_SOURCE%
 rem Set to NO to build installers quicker (at the expense of file size)
 SET MAX_COMPRESSION=YES
 
@@ -69,7 +70,7 @@
 rem MapGuide Installer vars
 rem ==================================================
 SET INSTALLER_DEV=%CD%
-SET INSTALLER_OUTPUT=%INSTALLER_DEV%\Output\%CULTURE%\%TYPEBUILD%
+SET INSTALLER_OUTPUT=%INSTALLER_DEV%\Output\%CULTURE%
 SET INSTALLER_DEV_SUPPORT=%INSTALLER_DEV%\Support
 SET INSTALLER_DEV_BOOTSTRAP=%INSTALLER_DEV%\Bootstrapper

More information about the mapguide-commits mailing list