[mapguide-commits] r7355 - in trunk/Installer: . Installers/MapGuide Libraries/MapGuide Server Libraries/MapGuide Web Extensions scripts
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Feb 15 02:28:57 PST 2013
Author: jng
Date: 2013-02-15 02:28:57 -0800 (Fri, 15 Feb 2013)
New Revision: 7355
Added:
trunk/Installer/build64_vce.bat
Removed:
trunk/Installer/InstallerPreReq.sln
trunk/Installer/InstallerWix.sln
Modified:
trunk/Installer/Installers/MapGuide/MapGuide.wixproj
trunk/Installer/Installers/MapGuide/MapGuide.wxs
trunk/Installer/Libraries/MapGuide Server/FDO.wxs
trunk/Installer/Libraries/MapGuide Server/MapGuide Server.wixproj
trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs
trunk/Installer/build.bat
trunk/Installer/build64.bat
trunk/Installer/scripts/build.sh
trunk/Installer/scripts/build_oem_ubuntu.sh
trunk/Installer/scripts/mginstallcentos.sh
trunk/Installer/scripts/mginstallubuntu.sh
Log:
Merge back 2.5 installer changes to trunk
Deleted: trunk/Installer/InstallerPreReq.sln
===================================================================
--- trunk/Installer/InstallerPreReq.sln 2013-02-15 09:36:22 UTC (rev 7354)
+++ trunk/Installer/InstallerPreReq.sln 2013-02-15 10:28:57 UTC (rev 7355)
@@ -1,45 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual C++ Express 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "apache_actions", "Custom\apache_actions\apache_actions.vcproj", "{03FD713E-15EB-453E-AFDF-21F8DB45C11E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iis_actions", "Custom\iis_actions\iis_actions.vcproj", "{13697B62-C1CD-47EF-9D9B-39F5B01693BB}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FdoRegUtil", "FdoRegUtil\FdoRegUtil.vcproj", "{F671A5C4-A796-4CF4-A71F-97B0265B4FBE}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Debug|x64 = Debug|x64
- Release|Win32 = Release|Win32
- Release|x64 = Release|x64
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {03FD713E-15EB-453E-AFDF-21F8DB45C11E}.Debug|Win32.ActiveCfg = Debug|Win32
- {03FD713E-15EB-453E-AFDF-21F8DB45C11E}.Debug|Win32.Build.0 = Debug|Win32
- {03FD713E-15EB-453E-AFDF-21F8DB45C11E}.Debug|x64.ActiveCfg = Debug|Win32
- {03FD713E-15EB-453E-AFDF-21F8DB45C11E}.Debug|x64.Build.0 = Debug|Win32
- {03FD713E-15EB-453E-AFDF-21F8DB45C11E}.Release|Win32.ActiveCfg = Release|Win32
- {03FD713E-15EB-453E-AFDF-21F8DB45C11E}.Release|Win32.Build.0 = Release|Win32
- {03FD713E-15EB-453E-AFDF-21F8DB45C11E}.Release|x64.ActiveCfg = Release|Win32
- {03FD713E-15EB-453E-AFDF-21F8DB45C11E}.Release|x64.Build.0 = Release|Win32
- {13697B62-C1CD-47EF-9D9B-39F5B01693BB}.Debug|Win32.ActiveCfg = Debug|Win32
- {13697B62-C1CD-47EF-9D9B-39F5B01693BB}.Debug|Win32.Build.0 = Debug|Win32
- {13697B62-C1CD-47EF-9D9B-39F5B01693BB}.Debug|x64.ActiveCfg = Debug|Win32
- {13697B62-C1CD-47EF-9D9B-39F5B01693BB}.Debug|x64.Build.0 = Debug|Win32
- {13697B62-C1CD-47EF-9D9B-39F5B01693BB}.Release|Win32.ActiveCfg = Release|Win32
- {13697B62-C1CD-47EF-9D9B-39F5B01693BB}.Release|Win32.Build.0 = Release|Win32
- {13697B62-C1CD-47EF-9D9B-39F5B01693BB}.Release|x64.ActiveCfg = Release|Win32
- {13697B62-C1CD-47EF-9D9B-39F5B01693BB}.Release|x64.Build.0 = Release|Win32
- {F671A5C4-A796-4CF4-A71F-97B0265B4FBE}.Debug|Win32.ActiveCfg = Debug|Win32
- {F671A5C4-A796-4CF4-A71F-97B0265B4FBE}.Debug|Win32.Build.0 = Debug|Win32
- {F671A5C4-A796-4CF4-A71F-97B0265B4FBE}.Debug|x64.ActiveCfg = Debug|x64
- {F671A5C4-A796-4CF4-A71F-97B0265B4FBE}.Debug|x64.Build.0 = Debug|x64
- {F671A5C4-A796-4CF4-A71F-97B0265B4FBE}.Release|Win32.ActiveCfg = Release|Win32
- {F671A5C4-A796-4CF4-A71F-97B0265B4FBE}.Release|Win32.Build.0 = Release|Win32
- {F671A5C4-A796-4CF4-A71F-97B0265B4FBE}.Release|x64.ActiveCfg = Release|x64
- {F671A5C4-A796-4CF4-A71F-97B0265B4FBE}.Release|x64.Build.0 = Release|x64
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
Deleted: trunk/Installer/InstallerWix.sln
===================================================================
--- trunk/Installer/InstallerWix.sln 2013-02-15 09:36:22 UTC (rev 7354)
+++ trunk/Installer/InstallerWix.sln 2013-02-15 10:28:57 UTC (rev 7355)
@@ -1,38 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "CS Map", "Libraries\CS Map\CS Map.wixproj", "{01313DB9-2AAF-4791-9B81-69BCE3194531}"
-EndProject
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "MapGuide Server", "Libraries\MapGuide Server\MapGuide Server.wixproj", "{715E2D88-E822-4A9A-A5A2-DBB71CD9B320}"
-EndProject
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "MapGuide Web Extensions", "Libraries\MapGuide Web Extensions\MapGuide Web Extensions.wixproj", "{D41D53C4-433E-47B5-B663-E79B5569EE22}"
-EndProject
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "MapGuide", "Installers\MapGuide\MapGuide.wixproj", "{12C62F60-6F52-4112-84AB-0FA8ED44EE77}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|x86 = Debug|x86
- Release|x86 = Release|x86
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {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|x86.ActiveCfg = Release|x86
- {01313DB9-2AAF-4791-9B81-69BCE3194531}.Release|x86.Build.0 = Release|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|x86.ActiveCfg = Release|x86
- {715E2D88-E822-4A9A-A5A2-DBB71CD9B320}.Release|x86.Build.0 = Release|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|x86.ActiveCfg = Release|x86
- {D41D53C4-433E-47B5-B663-E79B5569EE22}.Release|x86.Build.0 = Release|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|x86.ActiveCfg = Release|x86
- {12C62F60-6F52-4112-84AB-0FA8ED44EE77}.Release|x86.Build.0 = Release|x86
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
Modified: trunk/Installer/Installers/MapGuide/MapGuide.wixproj
===================================================================
--- trunk/Installer/Installers/MapGuide/MapGuide.wixproj 2013-02-15 09:36:22 UTC (rev 7354)
+++ trunk/Installer/Installers/MapGuide/MapGuide.wixproj 2013-02-15 10:28:57 UTC (rev 7355)
@@ -19,7 +19,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);MgPlatform=$(MgPlatform)</DefineConstants>
+ <DefineConstants>Debug;MgTitle=$(MgTitle);MgVersion=$(MgVersion);MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform);Have_ArcSde=$(Have_ArcSde)</DefineConstants>
<Cultures>$(MgCulture)</Cultures>
<SuppressIces>ICE47</SuppressIces>
</PropertyGroup>
@@ -28,12 +28,12 @@
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
<SuppressValidation>False</SuppressValidation>
<SuppressPdbOutput>True</SuppressPdbOutput>
- <DefineConstants>MgTitle=$(MgTitle);MgVersion=$(MgVersion);MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform)</DefineConstants>
+ <DefineConstants>MgTitle=$(MgTitle);MgVersion=$(MgVersion);MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform);Have_ArcSde=$(Have_ArcSde)</DefineConstants>
<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>
+ <DefineConstants>Debug;MgTitle=$(MgTitle);MgVersion=$(MgVersion);MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform);Have_ArcSde=$(Have_ArcSde)</DefineConstants>
<Cultures>$(MgCulture)</Cultures>
<SuppressIces>ICE47</SuppressIces>
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
@@ -42,7 +42,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
<SuppressValidation>False</SuppressValidation>
<SuppressPdbOutput>True</SuppressPdbOutput>
- <DefineConstants>MgTitle=$(MgTitle);MgVersion=$(MgVersion);MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform)</DefineConstants>
+ <DefineConstants>MgTitle=$(MgTitle);MgVersion=$(MgVersion);MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform);Have_ArcSde=$(Have_ArcSde)</DefineConstants>
<Cultures>$(MgCulture)</Cultures>
<SuppressIces>ICE47</SuppressIces>
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
Modified: trunk/Installer/Installers/MapGuide/MapGuide.wxs
===================================================================
--- trunk/Installer/Installers/MapGuide/MapGuide.wxs 2013-02-15 09:36:22 UTC (rev 7354)
+++ trunk/Installer/Installers/MapGuide/MapGuide.wxs 2013-02-15 10:28:57 UTC (rev 7355)
@@ -48,8 +48,8 @@
<Property Id="APACHE_PORT" Secure="yes" Value="8008" />
<Property Id="APACHE_VERSION" Secure="yes" Value="2.2.21" />
<Property Id="PHP_VERSION" Secure="yes" Value="5.3.8" />
- <Property Id="MG_VERSION_MAJOR_MINOR" Secure="yes" Value="2.4" />
- <Property Id="APP_POOL_NAME" Secure="yes" Value="MapGuide24AppPool">
+ <Property Id="MG_VERSION_MAJOR_MINOR" Secure="yes" Value="2.5" />
+ <Property Id="APP_POOL_NAME" Secure="yes" Value="MapGuide25AppPool">
<RegistrySearch
Id="MgAppPoolNameRs"
Type="raw"
@@ -63,12 +63,12 @@
<Property Id="MG_CLIENT_PORT" Secure="yes" Value="2811" />
<Property Id="MG_SITE_PORT" Secure="yes" Value="2812" />
<!-- Used by FdoRegUtil.exe -->
- <Property Id="FDO_VERSION_SMALL" Secure="yes" Value="3.7" />
- <Property Id="FDO_VERSION" Secure="yes" Value="3.7.0.0" />
+ <Property Id="FDO_VERSION_SMALL" Secure="yes" Value="3.8" />
+ <Property Id="FDO_VERSION" Secure="yes" Value="3.8.0.0" />
<!-- IIS vars -->
<Property Id="ASPNETVERSION" Value="v4.0" />
- <Property Id="PHP_FCGI_HANDLER_NAME" Value="MapGuide_2.4_PHP_via_FastCGI" />
- <Property Id="MAPAGENT_ISAPI_NAME" Value="MapGuide 2.4 MapAgent ISAPI handler" />
+ <Property Id="PHP_FCGI_HANDLER_NAME" Value="MapGuide_2.5_PHP_via_FastCGI" />
+ <Property Id="MAPAGENT_ISAPI_NAME" Value="MapGuide 2.5 MapAgent ISAPI handler" />
<!--
These are currently static, though there is opportunity in the future for these
@@ -519,8 +519,8 @@
<Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="Remove" Value="WebExtMapViewerJSPFeature" Order="12">MGWEB_CONFIG="IIS"</Publish>
<Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="Remove" Value="WebExtJavaDevGuideSamplesFeature" Order="13">MGWEB_CONFIG="IIS"</Publish>
<Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="Remove" Value="WebExtJavaViewerSampleFeature" Order="14">MGWEB_CONFIG="IIS"</Publish>
- <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="Remove" Value="WebExtPhpDevGuideSamplesFeature">MGWEB_CONFIG="IIS"</Publish>
- <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="Remove" Value="WebExtPhpViewerSampleFeature">MGWEB_CONFIG="IIS"</Publish>
+ <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="Remove" Value="WebExtPhpDevGuideSamplesFeature">MGWEB_CONFIG="IIS"</Publish>
+ <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="Remove" Value="WebExtPhpViewerSampleFeature">MGWEB_CONFIG="IIS"</Publish>
<Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="NewDialog" Value="IPConfigDlg" Order="13">MGWEB_CONFIG="MANUAL"</Publish>
<Publish Dialog="WebServerConfigDlgIIS" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>
<Publish Dialog="WebServerConfigDlgIIS" Control="Cancel" Event="SpawnDialog" Value="CancelDlg">1</Publish>
@@ -529,7 +529,7 @@
<Publish Dialog="FastCgiWarningDlg" Control="Next" Event="NewDialog" Value="IISLangConfigDlg" Order="1">MGWEB_CONFIG="IIS" AND NETFRAMEWORK40FULL</Publish>
<Publish Dialog="FastCgiWarningDlg" Control="Next" Event="NewDialog" Value="IPConfigDlg" Order="2">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#5" AND (NOT NETFRAMEWORK40FULL)</Publish>
<Publish Dialog="FastCgiWarningDlg" Control="Next" Event="NewDialog" Value="IIS6ConfigDlg" Order="3">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#6" AND (NOT NETFRAMEWORK40FULL)</Publish>
- <Publish Dialog="FastCgiWarningDlg" Control="Next" Event="NewDialog" Value="IIS7ConfigDlg" Order="4">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND (NOT NETFRAMEWORK40FULL)</Publish>
+ <Publish Dialog="FastCgiWarningDlg" Control="Next" Event="NewDialog" Value="IIS7ConfigDlg" Order="4">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND (NOT NETFRAMEWORK40FULL)</Publish>
<Publish Dialog="FastCgiWarningDlg" Control="Back" Event="NewDialog" Value="WebServerConfigDlgIIS">1</Publish>
<Publish Dialog="FastCgiWarningDlg" Control="Cancel" Event="SpawnDialog" Value="CancelDlg">1</Publish>
@@ -603,7 +603,7 @@
<Publish Dialog="IISLangConfigDlg" Control="Next" Event="NewDialog" Value="IPConfigDlg" Order="2">IISVERSIONMAJOR="#5"</Publish>
<Publish Dialog="IISLangConfigDlg" Control="Next" Event="NewDialog" Value="IIS6ConfigDlg" Order="3">IISVERSIONMAJOR="#6"</Publish>
- <Publish Dialog="IISLangConfigDlg" Control="Next" Event="NewDialog" Value="IIS7ConfigDlg" Order="4">IISVERSIONMAJOR="#7"</Publish>
+ <Publish Dialog="IISLangConfigDlg" Control="Next" Event="NewDialog" Value="IIS7ConfigDlg" Order="4">IISVERSIONMAJOR>="#7"</Publish>
<!-- Default feature settings for PHP API - AddLocal required in case user changes mind and comes back -->
<Publish Dialog="IISLangConfigDlg" Control="Next" Event="Remove" Value="WebExtMapViewerASPXFeature">IIS_API_TYPE="PHP"</Publish>
<Publish Dialog="IISLangConfigDlg" Control="Next" Event="Remove" Value="WebExtDotNetDevGuideSamplesFeature">IIS_API_TYPE="PHP"</Publish>
@@ -634,7 +634,7 @@
<Publish Dialog="IPConfigDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg">1</Publish>
<Publish Dialog="IPConfigDlg" Control="Back" Event="NewDialog" Value="IISLangConfigDlg" Order="1">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#5" AND NETFRAMEWORK40FULL</Publish>
<Publish Dialog="IPConfigDlg" Control="Back" Event="NewDialog" Value="IIS6ConfigDlg" Order="2">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#6"</Publish>
- <Publish Dialog="IPConfigDlg" Control="Back" Event="NewDialog" Value="IIS7ConfigDlg" Order="3">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7"</Publish>
+ <Publish Dialog="IPConfigDlg" Control="Back" Event="NewDialog" Value="IIS7ConfigDlg" Order="3">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7"</Publish>
<Publish Dialog="IPConfigDlg" Control="Back" Event="NewDialog" Value="ApacheConfigDlg" Order="4">MGWEB_CONFIG="APACHE"</Publish>
<Publish Dialog="IPConfigDlg" Control="Back" Event="DoAction" Value="MgWeb_Config_To_IIS_CA" Order="5">(NOT IISVERSIONMAJOR="#0") AND ( (IISVERSIONMAJOR="#5" AND (NOT NETFRAMEWORK40FULL)) OR (MGWEB_CONFIG="MANUAL" ))</Publish>
<Publish Dialog="IPConfigDlg" Control="Back" Event="NewDialog" Value="WebServerConfigDlgIIS" Order="6">(NOT IISVERSIONMAJOR="#0") AND ( (IISVERSIONMAJOR="#5" AND (NOT NETFRAMEWORK40FULL) AND MGWEB_CONFIG="IIS" ) OR (MGWEB_CONFIG="MANUAL" ))</Publish>
@@ -749,129 +749,129 @@
<InstallExecuteSequence>
<!-- IIS7 Base properties for deferred actions -->
- <Custom Action="MapGuideIIS7_I_AppCmd_Cmd" After="CostFinalize">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_CreateFastCgi_Cmd" After="MapGuideIIS7_I_AppCmd_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_CreateAppPool_Cmd" After="MapGuideIIS7_I_CreateFastCgi_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_SetAppPoolProp_Cmd" After="MapGuideIIS7_I_CreateAppPool_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_AppCmd_Cmd" After="CostFinalize">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_CreateFastCgi_Cmd" After="MapGuideIIS7_I_AppCmd_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_CreateAppPool_Cmd" After="MapGuideIIS7_I_CreateFastCgi_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_SetAppPoolProp_Cmd" After="MapGuideIIS7_I_CreateAppPool_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
<?if "$(var.MgPlatform)" = "x64" ?>
- <Custom Action="MapGuideIIS7_I_UnlockSrvHandlers_Cmd" After="MapGuideIIS7_I_SetAppPoolProp_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_UnlockSrvHandlers_Cmd" After="MapGuideIIS7_I_SetAppPoolProp_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
<?else ?>
- <Custom Action="MapGuideIIS7_I_Set32BitAppPool_Cmd" After="MapGuideIIS7_I_SetAppPoolProp_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_UnlockSrvHandlers_Cmd" After="MapGuideIIS7_I_Set32BitAppPool_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_Set32BitAppPool_Cmd" After="MapGuideIIS7_I_SetAppPoolProp_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_UnlockSrvHandlers_Cmd" After="MapGuideIIS7_I_Set32BitAppPool_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
<?endif ?>
- <Custom Action="MapGuideIIS7_I_UnlockSiteHandlers_Cmd" After="MapGuideIIS7_I_UnlockSrvHandlers_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_CreateMapGuideApp_Cmd" After="MapGuideIIS7_I_UnlockSiteHandlers_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_SelectXmlCompat_Cmd" After="MapGuideIIS7_I_CreateMapGuideApp_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_CreatePhpScriptMapping_Cmd" After="MapGuideIIS7_I_SelectXmlCompat_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_CreateMapAgentApp_Cmd" After="MapGuideIIS7_I_CreatePhpScriptMapping_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_SetMapAgentHandlerAccess_Cmd" After="MapGuideIIS7_I_CreateMapAgentApp_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_CreateMapAgentScriptHandling_Cmd" After="MapGuideIIS7_I_SetMapAgentHandlerAccess_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_EnableMapAgentExtension_Cmd" After="MapGuideIIS7_I_CreateMapAgentScriptHandling_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_AssignMapGuideAppPool_Cmd" After="MapGuideIIS7_I_EnableMapAgentExtension_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_AssignMapAgentAppPool_Cmd" After="MapGuideIIS7_I_AssignMapGuideAppPool_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_UnlockHttpErrorsMain_Cmd" After="MapGuideIIS7_I_AssignMapAgentAppPool_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_UnlockHttpErrorsWebSite_Cmd" After="MapGuideIIS7_I_UnlockHttpErrorsMain_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_UnlockHttpErrorsMapGuide_Cmd" After="MapGuideIIS7_I_UnlockHttpErrorsWebSite_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_Reset401Handler_Cmd" After="MapGuideIIS7_I_UnlockHttpErrorsMapGuide_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_AddJsonMime_Cmd" After="MapGuideIIS7_I_Reset401Handler_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_UnlockSiteHandlers_Cmd" After="MapGuideIIS7_I_UnlockSrvHandlers_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_CreateMapGuideApp_Cmd" After="MapGuideIIS7_I_UnlockSiteHandlers_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_SelectXmlCompat_Cmd" After="MapGuideIIS7_I_CreateMapGuideApp_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_CreatePhpScriptMapping_Cmd" After="MapGuideIIS7_I_SelectXmlCompat_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_CreateMapAgentApp_Cmd" After="MapGuideIIS7_I_CreatePhpScriptMapping_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_SetMapAgentHandlerAccess_Cmd" After="MapGuideIIS7_I_CreateMapAgentApp_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_CreateMapAgentScriptHandling_Cmd" After="MapGuideIIS7_I_SetMapAgentHandlerAccess_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_EnableMapAgentExtension_Cmd" After="MapGuideIIS7_I_CreateMapAgentScriptHandling_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_AssignMapGuideAppPool_Cmd" After="MapGuideIIS7_I_EnableMapAgentExtension_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_AssignMapAgentAppPool_Cmd" After="MapGuideIIS7_I_AssignMapGuideAppPool_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_UnlockHttpErrorsMain_Cmd" After="MapGuideIIS7_I_AssignMapAgentAppPool_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_UnlockHttpErrorsWebSite_Cmd" After="MapGuideIIS7_I_UnlockHttpErrorsMain_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_UnlockHttpErrorsMapGuide_Cmd" After="MapGuideIIS7_I_UnlockHttpErrorsWebSite_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_Reset401Handler_Cmd" After="MapGuideIIS7_I_UnlockHttpErrorsMapGuide_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_AddJsonMime_Cmd" After="MapGuideIIS7_I_Reset401Handler_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
<!-- IIS7 PHP Viewer properties for deferred actions -->
- <Custom Action="MapGuideIIS7_I_CreateViewerPhp_Cmd" After="MapGuideIIS7_I_AddJsonMime_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="PHP" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_SetViewerDocPhp_Cmd" After="MapGuideIIS7_I_CreateViewerPhp_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="PHP" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_AssignViewerAppPoolPhp_Cmd" After="MapGuideIIS7_I_SetViewerDocPhp_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="PHP" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_CreateViewerPhp_Cmd" After="MapGuideIIS7_I_AddJsonMime_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="PHP" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_SetViewerDocPhp_Cmd" After="MapGuideIIS7_I_CreateViewerPhp_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="PHP" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_AssignViewerAppPoolPhp_Cmd" After="MapGuideIIS7_I_SetViewerDocPhp_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="PHP" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
<!-- IIS7 ASP.Net Viewer properties for deferred actions -->
- <Custom Action="MapGuideIIS7_I_CreateViewerNet_Cmd" After="MapGuideIIS7_I_Reset401Handler_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_SetViewerDocNet_Cmd" After="MapGuideIIS7_I_CreateViewerNet_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_AssignViewerAppPoolNet_Cmd" After="MapGuideIIS7_I_SetViewerDocNet_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_CreateViewerNet_Cmd" After="MapGuideIIS7_I_Reset401Handler_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_SetViewerDocNet_Cmd" After="MapGuideIIS7_I_CreateViewerNet_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_AssignViewerAppPoolNet_Cmd" After="MapGuideIIS7_I_SetViewerDocNet_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
<!-- mapviewernet -->
- <Custom Action="MapGuideIIS7_I_CreateMapViewerNet_Cmd" After="MapGuideIIS7_I_AssignViewerAppPoolNet_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_SetMapViewerDocNet_Cmd" After="MapGuideIIS7_I_CreateMapViewerNet_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_AssignMapViewerAppPoolNet_Cmd" After="MapGuideIIS7_I_SetMapViewerDocNet_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_CreateMapViewerNet_Cmd" After="MapGuideIIS7_I_AssignViewerAppPoolNet_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_SetMapViewerDocNet_Cmd" After="MapGuideIIS7_I_CreateMapViewerNet_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_AssignMapViewerAppPoolNet_Cmd" After="MapGuideIIS7_I_SetMapViewerDocNet_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
<!-- .net viewer sample -->
- <Custom Action="MapGuideIIS7_I_CreateViewerSampleNet_Cmd" After="MapGuideIIS7_I_AssignMapViewerAppPoolNet_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2 AND &WebExtDotNetViewerSampleFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_SetViewerDocViewerSampleNet_Cmd" After="MapGuideIIS7_I_CreateViewerSampleNet_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2 AND &WebExtDotNetViewerSampleFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_AssignViewerAppPoolViewerSampleNet_Cmd" After="MapGuideIIS7_I_SetViewerDocViewerSampleNet_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2 AND &WebExtDotNetViewerSampleFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_CreateViewerSampleNet_Cmd" After="MapGuideIIS7_I_AssignMapViewerAppPoolNet_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2 AND &WebExtDotNetViewerSampleFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_SetViewerDocViewerSampleNet_Cmd" After="MapGuideIIS7_I_CreateViewerSampleNet_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2 AND &WebExtDotNetViewerSampleFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_AssignViewerAppPoolViewerSampleNet_Cmd" After="MapGuideIIS7_I_SetViewerDocViewerSampleNet_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2 AND &WebExtDotNetViewerSampleFeature>2</Custom>
<!-- .net devguide sample -->
- <Custom Action="MapGuideIIS7_I_CreateViewerDevGuideSamplesNet_Cmd" After="MapGuideIIS7_I_AssignViewerAppPoolViewerSampleNet_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2 AND &WebExtDotNetDevGuideSamplesFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_SetViewerDocDevGuideSamplesNet_Cmd" After="MapGuideIIS7_I_CreateViewerDevGuideSamplesNet_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2 AND &WebExtDotNetDevGuideSamplesFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_AssignViewerAppPoolDevGuideSamplesNet_Cmd" After="MapGuideIIS7_I_SetViewerDocDevGuideSamplesNet_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2 AND &WebExtDotNetDevGuideSamplesFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_CreateViewerDevGuideSamplesNet_Cmd" After="MapGuideIIS7_I_AssignViewerAppPoolViewerSampleNet_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2 AND &WebExtDotNetDevGuideSamplesFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_SetViewerDocDevGuideSamplesNet_Cmd" After="MapGuideIIS7_I_CreateViewerDevGuideSamplesNet_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2 AND &WebExtDotNetDevGuideSamplesFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_AssignViewerAppPoolDevGuideSamplesNet_Cmd" After="MapGuideIIS7_I_SetViewerDocDevGuideSamplesNet_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2 AND &WebExtDotNetDevGuideSamplesFeature>2</Custom>
<!-- IIS7 Base deferred CAs -->
- <Custom Action="MapGuideIIS7_I_CreateAppPool" After="InstallFiles">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_CreateFastCgi" After="MapGuideIIS7_I_CreateAppPool">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_SetAppPoolProp" After="MapGuideIIS7_I_CreateFastCgi">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_CreateAppPool" After="InstallFiles">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_CreateFastCgi" After="MapGuideIIS7_I_CreateAppPool">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_SetAppPoolProp" After="MapGuideIIS7_I_CreateFastCgi">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
<?if "$(var.MgPlatform)" = "x64" ?>
- <Custom Action="MapGuideIIS7_I_UnlockSrvHandlers" After="MapGuideIIS7_I_SetAppPoolProp">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_UnlockSrvHandlers" After="MapGuideIIS7_I_SetAppPoolProp">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
<?else ?>
- <Custom Action="MapGuideIIS7_I_Set32BitAppPool" After="MapGuideIIS7_I_SetAppPoolProp">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_UnlockSrvHandlers" After="MapGuideIIS7_I_Set32BitAppPool">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_Set32BitAppPool" After="MapGuideIIS7_I_SetAppPoolProp">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_UnlockSrvHandlers" After="MapGuideIIS7_I_Set32BitAppPool">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
<?endif ?>
- <Custom Action="MapGuideIIS7_I_UnlockSiteHandlers" After="MapGuideIIS7_I_UnlockSrvHandlers">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_CreateMapGuideApp" After="MapGuideIIS7_I_UnlockSiteHandlers">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_SelectXmlCompat" After="MapGuideIIS7_I_CreateMapGuideApp">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_CreatePhpScriptMapping" After="MapGuideIIS7_I_SelectXmlCompat">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_CreateMapAgentApp" After="MapGuideIIS7_I_CreatePhpScriptMapping">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_SetMapAgentHandlerAccess" After="MapGuideIIS7_I_CreateMapAgentApp">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_CreateMapAgentScriptHandling" After="MapGuideIIS7_I_SetMapAgentHandlerAccess">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_EnableMapAgentExtension" After="MapGuideIIS7_I_CreateMapAgentScriptHandling">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_AssignMapGuideAppPool" After="MapGuideIIS7_I_EnableMapAgentExtension">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_AssignMapAgentAppPool" After="MapGuideIIS7_I_AssignMapGuideAppPool">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_UnlockHttpErrorsMain" After="MapGuideIIS7_I_AssignMapAgentAppPool">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_UnlockHttpErrorsWebSite" After="MapGuideIIS7_I_UnlockHttpErrorsMain">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_UnlockHttpErrorsMapGuide" After="MapGuideIIS7_I_UnlockHttpErrorsWebSite">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_Reset401Handler" After="MapGuideIIS7_I_UnlockHttpErrorsMapGuide">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_AddJsonMime" After="MapGuideIIS7_I_Reset401Handler">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_UnlockSiteHandlers" After="MapGuideIIS7_I_UnlockSrvHandlers">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_CreateMapGuideApp" After="MapGuideIIS7_I_UnlockSiteHandlers">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_SelectXmlCompat" After="MapGuideIIS7_I_CreateMapGuideApp">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_CreatePhpScriptMapping" After="MapGuideIIS7_I_SelectXmlCompat">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_CreateMapAgentApp" After="MapGuideIIS7_I_CreatePhpScriptMapping">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_SetMapAgentHandlerAccess" After="MapGuideIIS7_I_CreateMapAgentApp">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_CreateMapAgentScriptHandling" After="MapGuideIIS7_I_SetMapAgentHandlerAccess">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_EnableMapAgentExtension" After="MapGuideIIS7_I_CreateMapAgentScriptHandling">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_AssignMapGuideAppPool" After="MapGuideIIS7_I_EnableMapAgentExtension">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_AssignMapAgentAppPool" After="MapGuideIIS7_I_AssignMapGuideAppPool">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_UnlockHttpErrorsMain" After="MapGuideIIS7_I_AssignMapAgentAppPool">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_UnlockHttpErrorsWebSite" After="MapGuideIIS7_I_UnlockHttpErrorsMain">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_UnlockHttpErrorsMapGuide" After="MapGuideIIS7_I_UnlockHttpErrorsWebSite">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_Reset401Handler" After="MapGuideIIS7_I_UnlockHttpErrorsMapGuide">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_AddJsonMime" After="MapGuideIIS7_I_Reset401Handler">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
<!-- IIS7 PHP Viewer deferred CAs -->
- <Custom Action="MapGuideIIS7_I_CreateViewerPhp" After="MapGuideIIS7_I_AddJsonMime">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="PHP" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_SetViewerDocPhp" After="MapGuideIIS7_I_CreateViewerPhp">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="PHP" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_AssignViewerAppPoolPhp" After="MapGuideIIS7_I_SetViewerDocPhp">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="PHP" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_CreateViewerPhp" After="MapGuideIIS7_I_AddJsonMime">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="PHP" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_SetViewerDocPhp" After="MapGuideIIS7_I_CreateViewerPhp">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="PHP" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_AssignViewerAppPoolPhp" After="MapGuideIIS7_I_SetViewerDocPhp">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="PHP" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
<!-- IIS7 DOTNET Viewer deferred CAs -->
- <Custom Action="MapGuideIIS7_I_CreateViewerNet" After="MapGuideIIS7_I_Reset401Handler">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_SetViewerDocNet" After="MapGuideIIS7_I_CreateViewerNet">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_AssignViewerAppPoolNet" After="MapGuideIIS7_I_SetViewerDocNet">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_CreateViewerNet" After="MapGuideIIS7_I_Reset401Handler">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_SetViewerDocNet" After="MapGuideIIS7_I_CreateViewerNet">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_AssignViewerAppPoolNet" After="MapGuideIIS7_I_SetViewerDocNet">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_CreateMapViewerNet" After="MapGuideIIS7_I_AssignViewerAppPoolNet">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2 AND &WebExtMapViewerASPXFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_SetMapViewerDocNet" After="MapGuideIIS7_I_CreateMapViewerNet">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2 AND &WebExtMapViewerASPXFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_AssignMapViewerAppPoolNet" After="MapGuideIIS7_I_SetMapViewerDocNet">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2 AND &WebExtMapViewerASPXFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_CreateMapViewerNet" After="MapGuideIIS7_I_AssignViewerAppPoolNet">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2 AND &WebExtMapViewerASPXFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_SetMapViewerDocNet" After="MapGuideIIS7_I_CreateMapViewerNet">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2 AND &WebExtMapViewerASPXFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_AssignMapViewerAppPoolNet" After="MapGuideIIS7_I_SetMapViewerDocNet">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2 AND &WebExtMapViewerASPXFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_CreateViewerSampleNet" After="MapGuideIIS7_I_AssignMapViewerAppPoolNet">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2 AND &WebExtDotNetViewerSampleFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_SetViewerDocViewerSampleNet" After="MapGuideIIS7_I_CreateViewerSampleNet">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2 AND &WebExtDotNetViewerSampleFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_AssignViewerAppPoolViewerSampleNet" After="MapGuideIIS7_I_SetViewerDocViewerSampleNet">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2 AND &WebExtDotNetViewerSampleFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_CreateViewerSampleNet" After="MapGuideIIS7_I_AssignMapViewerAppPoolNet">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2 AND &WebExtDotNetViewerSampleFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_SetViewerDocViewerSampleNet" After="MapGuideIIS7_I_CreateViewerSampleNet">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2 AND &WebExtDotNetViewerSampleFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_AssignViewerAppPoolViewerSampleNet" After="MapGuideIIS7_I_SetViewerDocViewerSampleNet">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2 AND &WebExtDotNetViewerSampleFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_CreateViewerDevGuideSamplesNet" After="MapGuideIIS7_I_AssignViewerAppPoolViewerSampleNet">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2 AND &WebExtDotNetDevGuideSamplesFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_SetViewerDocDevGuideSamplesNet" After="MapGuideIIS7_I_CreateViewerDevGuideSamplesNet">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2 AND &WebExtDotNetDevGuideSamplesFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_AssignViewerAppPoolDevGuideSamplesNet" After="MapGuideIIS7_I_SetViewerDocDevGuideSamplesNet">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2 AND &WebExtDotNetDevGuideSamplesFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_CreateViewerDevGuideSamplesNet" After="MapGuideIIS7_I_AssignViewerAppPoolViewerSampleNet">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2 AND &WebExtDotNetDevGuideSamplesFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_SetViewerDocDevGuideSamplesNet" After="MapGuideIIS7_I_CreateViewerDevGuideSamplesNet">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2 AND &WebExtDotNetDevGuideSamplesFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_AssignViewerAppPoolDevGuideSamplesNet" After="MapGuideIIS7_I_SetViewerDocDevGuideSamplesNet">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature>2 AND &WebExtDotNetDevGuideSamplesFeature>2</Custom>
<!-- IIS7 UNINSTALL deferred action properties -->
- <Custom Action="MapGuideIIS7_U_AppCmd_Cmd" After="InstallInitialize">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature=2</Custom>
- <Custom Action="MapGuideIIS7_U_ClearMapAgentRestriction_Cmd" After="MapGuideIIS7_U_AppCmd_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature=2</Custom>
- <Custom Action="MapGuideIIS7_U_RemoveDotNetSamples_Cmd" After="MapGuideIIS7_U_ClearMapAgentRestriction_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature=2</Custom>
- <Custom Action="MapGuideIIS7_U_RemoveDotNetViewerSample_Cmd" After="MapGuideIIS7_U_RemoveDotNetSamples_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature=2</Custom>
- <Custom Action="MapGuideIIS7_U_RemoveViewer_Cmd" After="MapGuideIIS7_U_RemoveDotNetViewerSample_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature=2</Custom>
- <Custom Action="MapGuideIIS7_U_RemoveViewerNet_Cmd" After="MapGuideIIS7_U_RemoveViewer_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature=2</Custom>
- <Custom Action="MapGuideIIS7_U_RemoveMapAgent_Cmd" After="MapGuideIIS7_U_RemoveViewerNet_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature=2</Custom>
- <Custom Action="MapGuideIIS7_U_RemoveMapGuide_Cmd" After="MapGuideIIS7_U_RemoveMapAgent_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature=2</Custom>
- <Custom Action="MapGuideIIS7_U_DeleteAppPool_Cmd" After="MapGuideIIS7_U_RemoveMapGuide_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature=2</Custom>
+ <Custom Action="MapGuideIIS7_U_AppCmd_Cmd" After="InstallInitialize">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature=2</Custom>
+ <Custom Action="MapGuideIIS7_U_ClearMapAgentRestriction_Cmd" After="MapGuideIIS7_U_AppCmd_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature=2</Custom>
+ <Custom Action="MapGuideIIS7_U_RemoveDotNetSamples_Cmd" After="MapGuideIIS7_U_ClearMapAgentRestriction_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature=2</Custom>
+ <Custom Action="MapGuideIIS7_U_RemoveDotNetViewerSample_Cmd" After="MapGuideIIS7_U_RemoveDotNetSamples_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature=2</Custom>
+ <Custom Action="MapGuideIIS7_U_RemoveViewer_Cmd" After="MapGuideIIS7_U_RemoveDotNetViewerSample_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature=2</Custom>
+ <Custom Action="MapGuideIIS7_U_RemoveViewerNet_Cmd" After="MapGuideIIS7_U_RemoveViewer_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature=2</Custom>
+ <Custom Action="MapGuideIIS7_U_RemoveMapAgent_Cmd" After="MapGuideIIS7_U_RemoveViewerNet_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature=2</Custom>
+ <Custom Action="MapGuideIIS7_U_RemoveMapGuide_Cmd" After="MapGuideIIS7_U_RemoveMapAgent_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature=2</Custom>
+ <Custom Action="MapGuideIIS7_U_DeleteAppPool_Cmd" After="MapGuideIIS7_U_RemoveMapGuide_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature=2</Custom>
<!-- IIS7 UNINSTALL deferred CAs -->
- <Custom Action="MapGuideIIS7_U_ClearMapAgentRestriction" After="MapGuideIIS7_U_DeleteAppPool_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature=2</Custom>
- <Custom Action="MapGuideIIS7_U_RemoveDotNetSamples" After="MapGuideIIS7_U_ClearMapAgentRestriction">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature=2</Custom>
- <Custom Action="MapGuideIIS7_U_RemoveDotNetViewerSample" After="MapGuideIIS7_U_RemoveDotNetSamples">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature=2</Custom>
- <Custom Action="MapGuideIIS7_U_RemoveViewer" After="MapGuideIIS7_U_RemoveDotNetViewerSample">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature=2</Custom>
- <Custom Action="MapGuideIIS7_U_RemoveViewerNet" After="MapGuideIIS7_U_RemoveViewer">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature=2</Custom>
- <Custom Action="MapGuideIIS7_U_RemoveMapAgent" After="MapGuideIIS7_U_RemoveViewerNet">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature=2</Custom>
- <Custom Action="MapGuideIIS7_U_RemoveMapGuide" After="MapGuideIIS7_U_RemoveMapAgent">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature=2</Custom>
- <Custom Action="MapGuideIIS7_U_DeleteAppPool" After="MapGuideIIS7_U_RemoveMapGuide">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature=2</Custom>
+ <Custom Action="MapGuideIIS7_U_ClearMapAgentRestriction" After="MapGuideIIS7_U_DeleteAppPool_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature=2</Custom>
+ <Custom Action="MapGuideIIS7_U_RemoveDotNetSamples" After="MapGuideIIS7_U_ClearMapAgentRestriction">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature=2</Custom>
+ <Custom Action="MapGuideIIS7_U_RemoveDotNetViewerSample" After="MapGuideIIS7_U_RemoveDotNetSamples">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature=2</Custom>
+ <Custom Action="MapGuideIIS7_U_RemoveViewer" After="MapGuideIIS7_U_RemoveDotNetViewerSample">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature=2</Custom>
+ <Custom Action="MapGuideIIS7_U_RemoveViewerNet" After="MapGuideIIS7_U_RemoveViewer">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature=2</Custom>
+ <Custom Action="MapGuideIIS7_U_RemoveMapAgent" After="MapGuideIIS7_U_RemoveViewerNet">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature=2</Custom>
+ <Custom Action="MapGuideIIS7_U_RemoveMapGuide" After="MapGuideIIS7_U_RemoveMapAgent">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature=2</Custom>
+ <Custom Action="MapGuideIIS7_U_DeleteAppPool" After="MapGuideIIS7_U_RemoveMapGuide">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7" AND &WebExtensionsFeature=2</Custom>
<!-- IIS6 properties for deferred actions -->
<Custom Action="AspNetRegIIS_Cmd" After="CostFinalize">NETFRAMEWORK40FULL AND MGWEB_CONFIG="IIS" AND (IISVERSIONMAJOR="#5" OR IISVERSIONMAJOR="#6") AND &WebExtensionsFeature>2</Custom>
@@ -961,15 +961,15 @@
<Custom
Action="StartApacheServiceCA"
After="InstallApacheServiceCA">MGWEB_CONFIG="APACHE" AND &WebExtApacheFeature>2</Custom>
- <!-- Something's wrong with the Tomcat actions. So disable them for now -->
- <!--
+ <!-- Something's wrong with the Tomcat actions. So disable them for now -->
+ <!--
<Custom
Action="InstallTomcatServiceCA"
Before="InstallFinalize">MGWEB_CONFIG="APACHE" AND &WebExtTomcatFeature>2</Custom>
<Custom
Action="StartTomcatServiceCA"
Before="InstallTomcatServiceCA">MGWEB_CONFIG="APACHE" AND &WebExtTomcatFeature>2</Custom>
- -->
+ -->
<Custom
Action="MgServerInstallCA"
Before="InstallFinalize">&ServerFeature>2</Custom>
Modified: trunk/Installer/Libraries/MapGuide Server/FDO.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Server/FDO.wxs 2013-02-15 09:36:22 UTC (rev 7354)
+++ trunk/Installer/Libraries/MapGuide Server/FDO.wxs 2013-02-15 10:28:57 UTC (rev 7355)
@@ -1,10 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <?define Have_ArcSde = "no" ?>
- <?define Fdo_VS2010 = "yes" ?>
- <?if "$(var.Fdo_VS2010)" = "yes" ?>
- <?define Have_ArcSde = "yes" ?>
- <?endif ?>
<?if "$(var.MgPlatform)" = "x64" ?>
<?define Win64 = "yes" ?>
<?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
@@ -93,13 +88,8 @@
<!-- FDO Core -->
<Component Id="FdoCoreCompnent" Win64="$(var.Win64)" Guid="90F4CB26-524F-499B-AA22-BD17036B167D">
<File Id="FdoRegUtil" Checksum="yes" Source="$(var.MgSource)\Server\FDO\FdoRegUtil.exe" />
- <?if "$(var.Fdo_VS2010)" = "no" ?>
- <File Id="FdoBoostDateTime" Checksum="yes" Source="$(var.MgSource)\Server\FDO\boost_date_time-vc90-mt-1_42.dll" />
- <File Id="FdoBoostThread" Checksum="yes" Source="$(var.MgSource)\Server\FDO\boost_thread-vc90-mt-1_42.dll" />
- <?else?>
<File Id="FdoBoostDateTime" Checksum="yes" Source="$(var.MgSource)\Server\FDO\boost_date_time-vc100-mt-1_42.dll" />
<File Id="FdoBoostThread" Checksum="yes" Source="$(var.MgSource)\Server\FDO\boost_thread-vc100-mt-1_42.dll" />
- <?endif ?>
<File Id="XalanLib" Checksum="yes" Source="$(var.MgSource)\Server\FDO\Xalan-C_1_11.dll" />
<File Id="XalanMessagesLib" Checksum="yes" Source="$(var.MgSource)\Server\FDO\XalanMessages_1_11.dll" />
<File Id="XercesLib" Checksum="yes" Source="$(var.MgSource)\Server\FDO\xerces-c_3_1.dll" />
@@ -119,7 +109,7 @@
</Component>
<!-- ArcSDE Provider -->
<Component Id="FdoArcSdeComponent" Win64="$(var.Win64)" Guid="73E0719B-243F-49E9-BF74-F1B7CF7EA35F">
- <?if Have_ArcSde = "yes" ?>
+ <?if "$(var.Have_ArcSde)" = "yes" ?>
<File Id="ArcSdeMessage" Checksum="yes" Source="$(var.MgSource)\Server\FDO\ArcSDEMessage.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" />
@@ -195,7 +185,7 @@
<ComponentRef Id="FdoComponent"/>
<ComponentRef Id="FdoComComponent" />
<ComponentRef Id="FdoCoreCompnent" />
- <?if Have_ArcSde = "yes" ?>
+ <?if "$(var.Have_ArcSde)" = "yes" ?>
<Feature Id="FdoArcSdeProviderFeature" Title="!(loc.ArcSdeProvider)" Level="1" Description="!(loc.ArcSdeProviderDesc)" AllowAdvertise="no" TypicalDefault="install" InstallDefault="local">
<ComponentRef Id="FdoArcSdeComponent" />
</Feature>
Modified: trunk/Installer/Libraries/MapGuide Server/MapGuide Server.wixproj
===================================================================
--- trunk/Installer/Libraries/MapGuide Server/MapGuide Server.wixproj 2013-02-15 09:36:22 UTC (rev 7354)
+++ trunk/Installer/Libraries/MapGuide Server/MapGuide Server.wixproj 2013-02-15 10:28:57 UTC (rev 7355)
@@ -16,22 +16,22 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
- <DefineConstants>Debug;MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform)</DefineConstants>
+ <DefineConstants>Debug;MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform);Have_ArcSde=$(Have_ArcSde)</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);MgPlatform=$(MgPlatform)</DefineConstants>
+ <DefineConstants>MgCulture=$(MgCulture);MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform);Have_ArcSde=$(Have_ArcSde)</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
- <DefineConstants>Debug;MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform)</DefineConstants>
+ <DefineConstants>Debug;MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform);Have_ArcSde=$(Have_ArcSde)</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>
+ <DefineConstants>MgCulture=$(MgCulture);MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform);Have_ArcSde=$(Have_ArcSde)</DefineConstants>
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
</PropertyGroup>
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs 2013-02-15 09:36:22 UTC (rev 7354)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs 2013-02-15 10:28:57 UTC (rev 7355)
@@ -11,7 +11,7 @@
<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.4">
+ <Directory Id="MapGuideOpenSourceMenuLocation" Name="MapGuide Open Source 2.5">
<Component Id="GenericShortcutComponent" Win64="$(var.Win64)" Guid="243CE0F3-D6BC-476B-910E-6F34DA54A2E2">
<CreateFolder />
<RegistryKey Root="HKCU" Key="$(var.MgRegKey)\GenericShortcut">
Modified: trunk/Installer/build.bat
===================================================================
--- trunk/Installer/build.bat 2013-02-15 09:36:22 UTC (rev 7354)
+++ trunk/Installer/build.bat 2013-02-15 10:28:57 UTC (rev 7355)
@@ -53,11 +53,14 @@
SET CPUTYPE=x86
SET TYPEBUILD=Release
SET CULTURE=en-US
-SET INSTALLER_VERSION_MAJOR_MINOR=2.4
+SET INSTALLER_VERSION_MAJOR_MINOR=2.5
SET INSTALLER_VERSION_MAJOR_MINOR_REV=%INSTALLER_VERSION_MAJOR_MINOR%.0
SET INSTALLER_NAME=MapGuideOpenSource-%INSTALLER_VERSION_MAJOR_MINOR_REV%-Trunk-%CULTURE%-%TYPEBUILD%-%CPUTYPE%
SET INSTALLER_VERSION=%INSTALLER_VERSION_MAJOR_MINOR_REV%.0
SET INSTALLER_TITLE="MapGuide Open Source %INSTALLER_VERSION_MAJOR_MINOR% Trunk (%TYPEBUILD%)"
+rem Default to no (omit the ArcSDE installer feature and don't look for ArcSDE provider dlls in staging area)
+rem Only when we're packaging against the official FDO SDK can we set this to yes
+SET MG_WITH_ARCSDE=no
SET MG_REG_KEY=Software\OSGeo\MapGuide\%INSTALLER_VERSION_MAJOR_MINOR_REV%
SET MG_SOURCE=%CD%\..\MgDev\%TYPEBUILD%
SET MG_SOURCE_WEB=%CD%\..\MgDev\Web
@@ -65,6 +68,9 @@
rem Set to NO to build installers quicker (at the expense of file size)
SET MAX_COMPRESSION=YES
+rem Unlike other parameters, this is an env-var to faciliate ease of invocation from a CI like Jenkins
+IF "%WITH_ARCSDE%"=="yes" SET MG_WITH_ARCSDE=yes
+
rem ==================================================
rem MapGuide Installer vars
rem ==================================================
@@ -202,6 +208,7 @@
echo MG Source Directory: %MG_SOURCE%
echo Locale: %CULTURE%
echo Registry Root: %MG_REG_KEY%
+echo Bundling ArcSDE Provider: %MG_WITH_ARCSDE%
echo ===================================================
if "%TYPEACTION%"=="build" goto build
@@ -464,7 +471,7 @@
goto quit
:build
-SET RUN_BUILD=%MSBUILD% /p:OutputName=%INSTALLER_NAME%;MgCulture=%CULTURE%;MgTitle=%INSTALLER_TITLE%;MgVersion=%INSTALLER_VERSION%;MgRegKey=%MG_REG_KEY%;MgPlatform=%CPUTYPE%
+SET RUN_BUILD=%MSBUILD% /p:OutputName=%INSTALLER_NAME%;MgCulture=%CULTURE%;MgTitle=%INSTALLER_TITLE%;MgVersion=%INSTALLER_VERSION%;MgRegKey=%MG_REG_KEY%;MgPlatform=%CPUTYPE%;Have_ArcSde=%MG_WITH_ARCSDE%
if not ""=="%MG_SOURCE_INC%" set RUN_BUILD=%RUN_BUILD%;MgSource=%MG_SOURCE_INC%
echo [build]: Installer
%RUN_BUILD% InstallerWix%VS_SLN_SUFFIX%.sln
Modified: trunk/Installer/build64.bat
===================================================================
--- trunk/Installer/build64.bat 2013-02-15 09:36:22 UTC (rev 7354)
+++ trunk/Installer/build64.bat 2013-02-15 10:28:57 UTC (rev 7355)
@@ -55,17 +55,23 @@
SET PLATFORM=x64
SET CPUTYPE=x64
SET CULTURE=en-US
-SET INSTALLER_VERSION_MAJOR_MINOR=2.4
+SET INSTALLER_VERSION_MAJOR_MINOR=2.5
SET INSTALLER_VERSION_MAJOR_MINOR_REV=%INSTALLER_VERSION_MAJOR_MINOR%.0
SET INSTALLER_NAME=MapGuideOpenSource-%INSTALLER_VERSION_MAJOR_MINOR_REV%-Trunk-%CULTURE%-%TYPEBUILD%-%PLATFORM%
SET INSTALLER_VERSION=%INSTALLER_VERSION_MAJOR_MINOR_REV%.0
SET INSTALLER_TITLE="MapGuide Open Source %INSTALLER_VERSION_MAJOR_MINOR% Trunk (%TYPEBUILD%)"
+rem Default to no (omit the ArcSDE installer feature and don't look for ArcSDE provider dlls in staging area)
+rem Only when we're packaging against the official FDO SDK can we set this to yes
+SET MG_WITH_ARCSDE=no
SET MG_REG_KEY=Software\OSGeo\MapGuide\%INSTALLER_VERSION_MAJOR_MINOR_REV%
SET MG_SOURCE=%CD%\..\MgDev\%TYPEBUILD%
SET MG_SOURCE_INC=%MG_SOURCE%
rem Set to NO to build installers quicker (at the expense of file size)
SET MAX_COMPRESSION=YES
+rem Unlike other parameters, this is an env-var to faciliate ease of invocation from a CI like Jenkins
+IF "%WITH_ARCSDE%"=="yes" SET MG_WITH_ARCSDE=yes
+
rem ==================================================
rem MapGuide Installer vars
rem ==================================================
@@ -225,6 +231,7 @@
echo MG Source Directory: %MG_SOURCE%
echo Locale: %CULTURE%
echo Registry Root: %MG_REG_KEY%
+echo Bundling ArcSDE Provider: %MG_WITH_ARCSDE%
echo ===================================================
if "%TYPEACTION%"=="build" goto build
@@ -485,7 +492,7 @@
goto quit
:build
-SET RUN_BUILD=%MSBUILD% /p:OutputName=%INSTALLER_NAME%;MgCulture=%CULTURE%;MgTitle=%INSTALLER_TITLE%;MgVersion=%INSTALLER_VERSION%;MgRegKey=%MG_REG_KEY%;MgPlatform=%PLATFORM%
+SET RUN_BUILD=%MSBUILD% /p:OutputName=%INSTALLER_NAME%;MgCulture=%CULTURE%;MgTitle=%INSTALLER_TITLE%;MgVersion=%INSTALLER_VERSION%;MgRegKey=%MG_REG_KEY%;MgPlatform=%PLATFORM%;Have_ArcSde=%MG_WITH_ARCSDE%
if not ""=="%MG_SOURCE_INC%" set RUN_BUILD=%RUN_BUILD%;MgSource=%MG_SOURCE_INC%
echo [build]: Installer
%RUN_BUILD% InstallerWix%VS_SLN_SUFFIX%.sln
Copied: trunk/Installer/build64_vce.bat (from rev 7350, branches/2.5/Installer/build64_vce.bat)
===================================================================
--- trunk/Installer/build64_vce.bat (rev 0)
+++ trunk/Installer/build64_vce.bat 2013-02-15 10:28:57 UTC (rev 7355)
@@ -0,0 +1,3 @@
+SET TARGET_CPU=amd64
+SET EXTRA_MSBUILD_OPTIONS=/p:PlatformToolset=Windows7.1SDK
+%MSBUILD% %EXTRA_MSBUILD_OPTIONS% InstallerPreReq%VS_SLN_SUFFIX%.sln
\ No newline at end of file
Modified: trunk/Installer/scripts/build.sh
===================================================================
--- trunk/Installer/scripts/build.sh 2013-02-15 09:36:22 UTC (rev 7354)
+++ trunk/Installer/scripts/build.sh 2013-02-15 10:28:57 UTC (rev 7355)
@@ -1,10 +1,11 @@
#!/bin/bash
# Global vars for this script. Modify as necessary
-APIVERSION=2.4
+APIVERSION=2.5
BUILDNUM=${APIVERSION}.0
BUILDROOT=`pwd`
INSTALLROOT=/usr/local/mapguideopensource-${BUILDNUM}
+#INSTALLROOT=/usr/local/mapguideopensource-trunk
LOCKFILEDIR=/var/lock/mgserver
MGSOURCE=${BUILDROOT}/mgdev
VERFILE=${MGSOURCE}/Common/ProductVersion.h
@@ -15,7 +16,7 @@
#SVNRELPATH=/mg-2.4/MgDev
#SVNROOT="svn://svn.bld.mgproto.net"
#SVNROOT="http://svn.osgeo.org"
-SVNRELPATH=/mapguide/branches/2.4/MgDev
+SVNRELPATH=/mapguide/branches/2.5/MgDev
MY_MAKE_OPTS="-j 4"
UBUNTU=1
PRESERVE_BUILD_ROOT=1
@@ -76,6 +77,9 @@
svn export -q -r ${REVISION} ${SVNROOT}${SVNRELPATH} ${MGSOURCE}
fi
fi
+
+start_time=`date +%s`
+
echo "Building Revision ${BUILDNUM}.${REVISION}"
cd ${MGSOURCE}
@@ -122,13 +126,19 @@
libtoolize --force
automake --add-missing --copy
autoconf
-./configure --enable-optimized --prefix=${INSTALLROOT}
+if [ $(uname -m) = "x86_64" ]; then
+ ./configure --enable-optimized --enable-64bit --prefix=${INSTALLROOT}
+else
+ ./configure --enable-optimized --prefix=${INSTALLROOT}
+fi
make $MY_MAKE_OPTS
check_build
BUILD_COMPONENT="MapGuide Install"
make install
check_build
+end_time=`date +%s`
+
echo "Preparing binaries for packaging"
# Prepare binaries for packaging by removing unnecessary
# .la and .a files and stripping unneeded symbols from the binaries
@@ -160,3 +170,4 @@
tar -zcf bin/mapguideopensource-${BUILDNUM}.${REVISION}.tar.gz ${INSTALLROOT} ${LOCKFILEDIR}
echo "Build complete!"
+echo Main build execution: `expr $end_time - $start_time` s
Modified: trunk/Installer/scripts/build_oem_ubuntu.sh
===================================================================
--- trunk/Installer/scripts/build_oem_ubuntu.sh 2013-02-15 09:36:22 UTC (rev 7354)
+++ trunk/Installer/scripts/build_oem_ubuntu.sh 2013-02-15 10:28:57 UTC (rev 7355)
@@ -11,7 +11,7 @@
#**********************************************************
echo "MapGuide Open Source build script for OEM components"
-INSTALLDIR=/usr/local/mapguideopensource-2.4.0
+INSTALLDIR=/usr/local/mapguideopensource-2.5.0
MY_MAKE_OPTS="-j 4"
CLEAN_FLAG=0
while [ $# -gt 0 ]; do # Until you run out of parameters...
@@ -203,7 +203,11 @@
libtoolize --copy --force
autoconf
automake --add-missing --copy --force-missing
- sh ./configure --prefix="${INSTALLDIR}"
+ if [ $(uname -m) = "x86_64" ]; then
+ sh ./configure --with-pic --prefix="${INSTALLDIR}"
+ else
+ sh ./configure --prefix="${INSTALLDIR}"
+ fi
make $MY_MAKE_OPTS
# The check build is disabled as the build will fail with automake version < 2.59
# check_build
@@ -410,7 +414,13 @@
{
pushd gd/lpng
cp scripts/makefile.std makefile
- make $MY_MAKE_OPTS
+ if [ $(uname -m) = "x86_64" ]; then
+ #Inject -fPIC to CFLAGS for 64-bit
+ sed 's/^CFLAGS=/CFLAGS= -fPIC /g' makefile > makefile64
+ make -fmakefile64 $MY_MAKE_OPTS
+ else
+ make $MY_MAKE_OPTS
+ fi
check_build
popd
}
@@ -436,8 +446,16 @@
build_jpeg()
{
pushd gd/jpeg
- sh ./configure --enable-static --disable-shared
- make $MY_MAKE_OPTS
+ if [ $(uname -m) = "x86_64" ]; then
+ sh ./configure --enable-static --disable-shared
+ #--with-pic does nothing (probably ancient configure script), so do some sed trickery
+ #to inject this flag. Know a better way? Enlighten us :)
+ sed 's/^CFLAGS=/CFLAGS= -fPIC/g' Makefile > Makefile64
+ make -fMakefile64 $MY_MAKE_OPTS
+ else
+ sh ./configure --enable-static --disable-shared
+ make $MY_MAKE_OPTS
+ fi
check_build
popd
}
@@ -463,7 +481,11 @@
build_freetype()
{
pushd gd/freetype
- sh ./configure --enable-static --disable-shared
+ if [ $(uname -m) = "x86_64" ]; then
+ sh ./configure --enable-static --disable-shared --with-pic
+ else
+ sh ./configure --enable-static --disable-shared
+ fi
make $MY_MAKE_OPTS
check_build
popd
@@ -490,7 +512,11 @@
build_gd()
{
pushd gd/gd
- sh ./configure --enable-static --disable-shared --without-fontconfig
+ if [ $(uname -m) = "x86_64" ]; then
+ sh ./configure --enable-static --disable-shared --without-fontconfig --with-pic
+ else
+ sh ./configure --enable-static --disable-shared --without-fontconfig
+ fi
make $MY_MAKE_OPTS
check_build
popd
@@ -517,7 +543,11 @@
build_agg()
{
pushd agg-2.4
- make $MY_MAKE_OPTS
+ if [ $(uname -m) = "x86_64" ]; then
+ make $MY_MAKE_OPTS EXTRACXXFLAGS=-fPIC
+ else
+ make $MY_MAKE_OPTS
+ fi
check_build
popd
}
@@ -570,11 +600,23 @@
pushd CsMap
mkdir -p .libs
pushd Source
- make -fLibrary.mak $MY_MAKE_OPTS
+ if [ $(uname -m) = "x86_64" ]; then
+ #Need to build CS-Map with -fPIC because linking libraries will be built with -fPIC
+ sed 's/^C_FLG =/C_FLG = -fPIC/g' Library.mak | sed 's/CPP_FLG =/CPP_FLG = -fPIC/g' > Library64.mak
+ make -fLibrary64.mak $MY_MAKE_OPTS
+ else
+ make -fLibrary.mak $MY_MAKE_OPTS
+ fi
cp CsMap.a ../.libs/libCsmap.a
popd
pushd Dictionaries
- make -fCompiler.mak $MY_MAKE_OPTS
+ if [ $(uname -m) = "x86_x64" ]; then
+ #Need to build CS-Map with -fPIC because linking libraries will be built with -fPIC
+ sed 's/^C_FLG =/C_FLG = -fPIC/g' Library.mak | sed 's/CPP_FLG =/CPP_FLG = -fPIC/g' > Compiler64.mak
+ make -fCompiler64.mak $MY_MAKE_OPTS
+ else
+ make -fCompiler.mak $MY_MAKE_OPTS
+ fi
./CS_Comp -b . .
popd
check_build
Modified: trunk/Installer/scripts/mginstallcentos.sh
===================================================================
--- trunk/Installer/scripts/mginstallcentos.sh 2013-02-15 09:36:22 UTC (rev 7354)
+++ trunk/Installer/scripts/mginstallcentos.sh 2013-02-15 10:28:57 UTC (rev 7355)
@@ -1,14 +1,16 @@
#!/bin/bash
-#URL="http://download.osgeo.org/mapguide/releases/2.4.0/Beta1"
-URL="http://192.168.0.3/downloads/"
-FDOVER_MAJOR_MINOR=3.7
+URL="http://download.osgeo.org/mapguide/releases/2.5.0/Beta1"
+#URL="http://192.168.0.4/downloads"
+FDOVER_MAJOR_MINOR=3.8
FDOVER_MAJOR_MINOR_REV=${FDOVER_MAJOR_MINOR}.0
-FDOVER=${FDOVER_MAJOR_MINOR_REV}.6479
-MGVER_MAJOR_MINOR=2.4
+FDOVER=${FDOVER_MAJOR_MINOR_REV}_14601
+MGVER_MAJOR_MINOR=2.5
MGVER_MAJOR_MINOR_REV=${MGVER_MAJOR_MINOR}.0
-MGVER=${MGVER_MAJOR_MINOR_REV}.6757
-FDO_TARBALL=fdosdk-centos5-${FDOVER}.tgz
+MGVER=${MGVER_MAJOR_MINOR_REV}.7345
+FDO_TARBALL=fdosdk-centos5-${FDOVER}.tar.gz
MG_TARBALL=mapguideopensource-${MGVER}.tar.gz
+MG_URL=${URL}/${MG_TARBALL}
+FDO_URL="http://download.osgeo.org/fdo/3.8.0/beta1/binaries/linux/${FDO_TARBALL}"
# Must have root
if [[ $EUID -ne 0 ]]; then
@@ -17,13 +19,15 @@
fi
if [ ! -f ${FDO_TARBALL} ]; then
-wget -N ${URL}${FDO_TARBALL}
+wget -N ${FDO_URL}
fi
-tar -C / -zxvf ${FDO_TARBALL}
+#tar -C / -zxvf ${FDO_TARBALL}
+mkdir -p /usr/local/fdo-3.8.0
+tar -C /usr/local/fdo-3.8.0/ -zxvf ${FDO_TARBALL}
if [ ! -f ${MG_TARBALL} ]; then
-wget -N ${URL}${MG_TARBALL}
+wget -N ${MG_URL}
fi
tar -C / -zxvf ${MG_TARBALL}
Modified: trunk/Installer/scripts/mginstallubuntu.sh
===================================================================
--- trunk/Installer/scripts/mginstallubuntu.sh 2013-02-15 09:36:22 UTC (rev 7354)
+++ trunk/Installer/scripts/mginstallubuntu.sh 2013-02-15 10:28:57 UTC (rev 7355)
@@ -1,13 +1,15 @@
#!/bin/bash
TEMPDIR=/tmp/build_mapguide
-#URL="http://download.osgeo.org/mapguide/releases/2.4.0/Beta1/ubuntu12"
-URL="http://192.168.0.3/downloads/ubuntu12"
-FDOVER_MAJOR_MINOR=3.7
+URL="http://download.osgeo.org/mapguide/releases/2.5.0/Beta1/ubuntu12"
+#URL="http://192.168.0.4/downloads/ubuntu12"
+FDOVER_MAJOR_MINOR=3.8
FDOVER_MAJOR_MINOR_REV=${FDOVER_MAJOR_MINOR}.0
-FDOVER=${FDOVER_MAJOR_MINOR_REV}-6479_i386
-MGVER_MAJOR_MINOR=2.4
+FDOBUILD=14601
+FDOVER=${FDOVER_MAJOR_MINOR_REV}-${FDOBUILD}_i386
+MGVER_MAJOR_MINOR=2.5
MGVER_MAJOR_MINOR_REV=${MGVER_MAJOR_MINOR}.0
-MGVER=${MGVER_MAJOR_MINOR_REV}-6757_i386
+MGBUILD=7345
+MGVER=${MGVER_MAJOR_MINOR_REV}-${MGBUILD}_i386
# Must have root
if [[ $EUID -ne 0 ]]; then
@@ -118,7 +120,7 @@
done
# Nuke the old providers.xml, we're rebuiding it
- providersxml=/usr/local/fdo-3.7.0/lib/providers.xml
+ providersxml=/usr/local/fdo-${FDOVER_MAJOR_MINOR_REV}/lib/providers.xml
echo -ne "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"no\" ?>" > ${providersxml}
echo -ne "\n<FeatureProviderRegistry>" >> ${providersxml}
for file in $choice
More information about the mapguide-commits
mailing list