[mapguide-commits] r7343 - in branches/2.5/Installer: . Installers/MapGuide Libraries/MapGuide Server

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Tue Feb 5 06:26:01 PST 2013 

Author: jng
Date: 2013-02-05 06:26:01 -0800 (Tue, 05 Feb 2013)
New Revision: 7343

Removed:
   branches/2.5/Installer/InstallerPreReq.sln
   branches/2.5/Installer/InstallerWix.sln
Modified:
   branches/2.5/Installer/Installers/MapGuide/MapGuide.wixproj
   branches/2.5/Installer/Libraries/MapGuide Server/FDO.wxs
   branches/2.5/Installer/Libraries/MapGuide Server/MapGuide Server.wixproj
   branches/2.5/Installer/build.bat
   branches/2.5/Installer/build64.bat
Log:
Installer updates for 2.5:
 - Remove VS2008 projects. We are not going to be building MapGuide/FDO with VS2008 ever again.
 - Parameterize the Have_ArcSde option. This way, we can control whether to bundle the ArcSDE FDO provider through the WITH_ARCSDE environment variable (yes = bundle, no = omit).

Deleted: branches/2.5/Installer/InstallerPreReq.sln
===================================================================
--- branches/2.5/Installer/InstallerPreReq.sln	2013-01-30 05:50:00 UTC (rev 7342)
+++ branches/2.5/Installer/InstallerPreReq.sln	2013-02-05 14:26:01 UTC (rev 7343)
@@ -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: branches/2.5/Installer/InstallerWix.sln
===================================================================
--- branches/2.5/Installer/InstallerWix.sln	2013-01-30 05:50:00 UTC (rev 7342)
+++ branches/2.5/Installer/InstallerWix.sln	2013-02-05 14:26:01 UTC (rev 7343)
@@ -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: branches/2.5/Installer/Installers/MapGuide/MapGuide.wixproj
===================================================================
--- branches/2.5/Installer/Installers/MapGuide/MapGuide.wixproj	2013-01-30 05:50:00 UTC (rev 7342)
+++ branches/2.5/Installer/Installers/MapGuide/MapGuide.wixproj	2013-02-05 14:26:01 UTC (rev 7343)
@@ -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: branches/2.5/Installer/Libraries/MapGuide Server/FDO.wxs
===================================================================
--- branches/2.5/Installer/Libraries/MapGuide Server/FDO.wxs	2013-01-30 05:50:00 UTC (rev 7342)
+++ branches/2.5/Installer/Libraries/MapGuide Server/FDO.wxs	2013-02-05 14:26:01 UTC (rev 7343)
@@ -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: branches/2.5/Installer/Libraries/MapGuide Server/MapGuide Server.wixproj
===================================================================
--- branches/2.5/Installer/Libraries/MapGuide Server/MapGuide Server.wixproj	2013-01-30 05:50:00 UTC (rev 7342)
+++ branches/2.5/Installer/Libraries/MapGuide Server/MapGuide Server.wixproj	2013-02-05 14:26:01 UTC (rev 7343)
@@ -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: branches/2.5/Installer/build.bat
===================================================================
--- branches/2.5/Installer/build.bat	2013-01-30 05:50:00 UTC (rev 7342)
+++ branches/2.5/Installer/build.bat	2013-02-05 14:26:01 UTC (rev 7343)
@@ -58,6 +58,9 @@
 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: branches/2.5/Installer/build64.bat
===================================================================
--- branches/2.5/Installer/build64.bat	2013-01-30 05:50:00 UTC (rev 7342)
+++ branches/2.5/Installer/build64.bat	2013-02-05 14:26:01 UTC (rev 7343)
@@ -60,12 +60,18 @@
 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

More information about the mapguide-commits mailing list