[mapguide-commits] r7711 - in trunk/Installer: . Bootstrapper Custom Custom/apache_actions FdoRegUtil Installers/MapGuide Installers/MapGuide/Lang Libraries/MapGuide Server Libraries/MapGuide Web Extensions
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Aug 1 09:21:30 PDT 2013
Author: jng
Date: 2013-08-01 09:21:30 -0700 (Thu, 01 Aug 2013)
New Revision: 7711
Added:
trunk/Installer/Bootstrapper/vcredist_2012_x64.exe
trunk/Installer/Bootstrapper/vcredist_2012_x86.exe
trunk/Installer/InstallerPreReq.sln
trunk/Installer/InstallerWix.sln
Removed:
trunk/Installer/Custom/apache_actions/apache_actions.def
trunk/Installer/Custom/iis_actions/
trunk/Installer/InstallerPreReq_VS2010.sln
trunk/Installer/InstallerWix_VS2010.sln
trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs
trunk/Installer/build64.bat
trunk/Installer/build64_vce.bat
Modified:
trunk/Installer/Bootstrapper/Setup.nsi
trunk/Installer/Custom/apache_actions/
trunk/Installer/Custom/apache_actions/apache_actions.cpp
trunk/Installer/Custom/apache_actions/apache_actions.vcxproj
trunk/Installer/Custom/apache_actions/apache_actions.vcxproj.filters
trunk/Installer/FdoRegUtil/
trunk/Installer/FdoRegUtil/FdoRegUtil.vcxproj
trunk/Installer/Installers/MapGuide/Lang/MapGuide_en-US.wxl
trunk/Installer/Installers/MapGuide/MapGuide.wxs
trunk/Installer/Libraries/MapGuide Server/FDO.wxs
trunk/Installer/Libraries/MapGuide Web Extensions/Apache.wxs
trunk/Installer/Libraries/MapGuide Web Extensions/MapGuide Web Extensions.wixproj
trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs
trunk/Installer/build.bat
Log:
#2324: Installer updates for VS2012
- Include vcredist 2012 installers. Have this auto-install by the NSIS bootstrapper
- Remove apache_actions.def and just __declspec(dllexport) the necessary functions
- Remove Windows XP/2003 support
- Remove the iis_actions project as we no longer have to configure IIS6
- Remove all references to IIS6 and below in the Wix installer
- Rename InstallerPreReq_VS2010.sln to InstallerPreReq.sln
- Update InstallerPreReq.sln and FdoRegUtil to VS2012
- Remove build64.bat and build64_vce.bat and unify differences into build.bat
- Fix tomcat file offsets due to MapGuideJavaApiEx.dll
Modified: trunk/Installer/Bootstrapper/Setup.nsi
===================================================================
--- trunk/Installer/Bootstrapper/Setup.nsi 2013-08-01 14:55:20 UTC (rev 7710)
+++ trunk/Installer/Bootstrapper/Setup.nsi 2013-08-01 16:21:30 UTC (rev 7711)
@@ -119,6 +119,18 @@
Banner::destroy
BeginInstall:
+ ; Install VC 2012 redist. Not going to check here. I think we can trust the vcredist install to not trample over anything
+ Banner::show /NOUNLOAD "Installing Visual C++ 2012 Redistributable"
+ Banner::getWindow /NOUNLOAD
+!if ${CPU} = "x64"
+ File /r "${INSTALLER_OUTPUT}\vcredist_2012_x64.exe"
+ ExecWait '"$OUTDIR\vcredist_2012_x64.exe" /install /quiet /norestart'
+!else
+ File /r "${INSTALLER_OUTPUT}\vcredist_2012_x86.exe"
+ ExecWait '"$OUTDIR\vcredist_2012_x86.exe" /install /quiet /norestart'
+!endif
+ Banner::destroy
+
Banner::show /NOUNLOAD "Extracting files. Please Wait"
Banner::getWindow /NOUNLOAD
File "${INSTALLER_OUTPUT}\${OUTNAME}.msi"
@@ -128,11 +140,13 @@
; Delete the MGOS installer and any other extracted after completion
Delete "$OUTDIR\${OUTNAME}.msi"
!if ${CPU} = "x64"
- Delete "$OUTDIR\vcredist_2008_x64.exe"
+ ;Delete "$OUTDIR\vcredist_2008_x64.exe"
Delete "$OUTDIR\vcredist_2010_x64.exe"
+ Delete "$OUTDIR\vcredist_2012_x64.exe"
!else
- Delete "$OUTDIR\vcredist_2008_x86.exe"
+ ;Delete "$OUTDIR\vcredist_2008_x86.exe"
Delete "$OUTDIR\vcredist_2010_x86.exe"
+ Delete "$OUTDIR\vcredist_2012_x86.exe"
!endif
SectionEnd
\ No newline at end of file
Added: trunk/Installer/Bootstrapper/vcredist_2012_x64.exe
===================================================================
(Binary files differ)
Property changes on: trunk/Installer/Bootstrapper/vcredist_2012_x64.exe
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/Installer/Bootstrapper/vcredist_2012_x86.exe
===================================================================
(Binary files differ)
Property changes on: trunk/Installer/Bootstrapper/vcredist_2012_x86.exe
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/Installer/Custom/apache_actions
___________________________________________________________________
Modified: svn:ignore
- *.user
Debug
Release
+ *.user
Debug
Release
bin110_Win32
bin110_x64
Release110_Win32
Release110_x64
Modified: trunk/Installer/Custom/apache_actions/apache_actions.cpp
===================================================================
--- trunk/Installer/Custom/apache_actions/apache_actions.cpp 2013-08-01 14:55:20 UTC (rev 7710)
+++ trunk/Installer/Custom/apache_actions/apache_actions.cpp 2013-08-01 16:21:30 UTC (rev 7711)
@@ -105,7 +105,7 @@
*
*****************************************************************************/
-UINT __stdcall
+UINT __declspec(dllexport) __stdcall
GetApacheDir(MSIHANDLE hMSI)
{
HRESULT hRes = 0;
@@ -148,7 +148,7 @@
*
*****************************************************************************/
-UINT __stdcall
+UINT __declspec(dllexport) __stdcall
UpdatePhpIni(MSIHANDLE hMSI)
{
// Method overview:
@@ -225,7 +225,7 @@
*
*****************************************************************************/
-UINT __stdcall
+UINT __declspec(dllexport) __stdcall
UpdateApacheConfig(MSIHANDLE hMSI)
{
// Method overview:
Deleted: trunk/Installer/Custom/apache_actions/apache_actions.def
===================================================================
--- trunk/Installer/Custom/apache_actions/apache_actions.def 2013-08-01 14:55:20 UTC (rev 7710)
+++ trunk/Installer/Custom/apache_actions/apache_actions.def 2013-08-01 16:21:30 UTC (rev 7711)
@@ -1,9 +0,0 @@
-; apache_actions.def : Declares the module parameters for the DLL.
-
-LIBRARY "apache_actions"
-DESCRIPTION 'apache_actions Windows Dynamic Link Library'
-
-EXPORTS
-GetApacheDir @2
-UpdatePhpIni @3
-UpdateApacheConfig @4
Modified: trunk/Installer/Custom/apache_actions/apache_actions.vcxproj
===================================================================
--- trunk/Installer/Custom/apache_actions/apache_actions.vcxproj 2013-08-01 14:55:20 UTC (rev 7710)
+++ trunk/Installer/Custom/apache_actions/apache_actions.vcxproj 2013-08-01 16:21:30 UTC (rev 7711)
@@ -5,10 +5,18 @@
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{03FD713E-15EB-453E-AFDF-21F8DB45C11E}</ProjectGuid>
@@ -19,10 +27,21 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <PlatformToolset>v110</PlatformToolset>
+ </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
@@ -30,20 +49,38 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\bin$(PlatformToolsetVersion)_$(Platform)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release$(PlatformToolsetVersion)_$(Platform)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug$(PlatformToolsetVersion)_$(Platform)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug$(PlatformToolsetVersion)_$(Platform)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <OutDir>.\bin$(PlatformToolsetVersion)_$(Platform)\</OutDir>
+ <IntDir>.\Release$(PlatformToolsetVersion)_$(Platform)\</IntDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <OutDir>.\Debug$(PlatformToolsetVersion)_$(Platform)\</OutDir>
+ <IntDir>.\Debug$(PlatformToolsetVersion)_$(Platform)\</IntDir>
+ </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -63,10 +100,11 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
- <PrecompiledHeaderOutputFile>.\Release/apache_actions.pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
- <ObjectFileName>.\Release/</ObjectFileName>
- <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
+ <PrecompiledHeaderOutputFile>.\Release$(PlatformToolsetVersion)_$(Platform)\apache_actions.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>
+ </AssemblerListingLocation>
+ <ObjectFileName>.\Release$(PlatformToolsetVersion)_$(Platform)\</ObjectFileName>
+ <ProgramDataBaseFileName>.\Release$(PlatformToolsetVersion)_$(Platform)\</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
</ClCompile>
@@ -78,12 +116,13 @@
<AdditionalDependencies>msi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>.\apache_actions.def</ModuleDefinitionFile>
- <ProgramDatabaseFile>.\../bin/apache_actions.pdb</ProgramDatabaseFile>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>.\bin$(PlatformToolsetVersion)_$(Platform)\apache_actions.pdb</ProgramDatabaseFile>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <ImportLibrary>.\../bin/apache_actions.lib</ImportLibrary>
+ <ImportLibrary>.\bin$(PlatformToolsetVersion)_$(Platform)\apache_actions.lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<Bscmake>
@@ -91,6 +130,53 @@
<OutputFile>.\../bin/apache_actions.bsc</OutputFile>
</Bscmake>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\../bin/apache_actions.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;APACHE_ACTIONS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
+ <PrecompiledHeaderOutputFile>.\Release$(PlatformToolsetVersion)_$(Platform)\apache_actions.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>
+ </AssemblerListingLocation>
+ <ObjectFileName>.\Release$(PlatformToolsetVersion)_$(Platform)\</ObjectFileName>
+ <ProgramDataBaseFileName>.\Release$(PlatformToolsetVersion)_$(Platform)\</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>msi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <ProgramDatabaseFile>.\bin$(PlatformToolsetVersion)_$(Platform)\apache_actions.pdb</ProgramDatabaseFile>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <ImportLibrary>.\bin$(PlatformToolsetVersion)_$(Platform)\apache_actions.lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\../bin/apache_actions.bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -109,10 +195,10 @@
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
- <PrecompiledHeaderOutputFile>.\Debug/apache_actions.pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
- <ObjectFileName>.\Debug/</ObjectFileName>
- <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
+ <PrecompiledHeaderOutputFile>.\Debug$(PlatformToolsetVersion)_$(Platform)\apache_actions.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>.\Debug$(PlatformToolsetVersion)_$(Platform)\</AssemblerListingLocation>
+ <ObjectFileName>.\Debug$(PlatformToolsetVersion)_$(Platform)\</ObjectFileName>
+ <ProgramDataBaseFileName>.\Debug$(PlatformToolsetVersion)_$(Platform)\</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -123,15 +209,16 @@
</ResourceCompile>
<Link>
<AdditionalDependencies>odbc32.lib;odbccp32.lib;msi.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>.\Debug/apache_actions.dll</OutputFile>
+ <OutputFile>.\Debug$(PlatformToolsetVersion)_$(Platform)\apache_actions.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>.\apache_actions.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>.\Debug/apache_actions.pdb</ProgramDatabaseFile>
+ <ProgramDatabaseFile>.\Debug$(PlatformToolsetVersion)_$(Platform)\apache_actions.pdb</ProgramDatabaseFile>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <ImportLibrary>.\Debug/apache_actions.lib</ImportLibrary>
+ <ImportLibrary>.\Debug$(PlatformToolsetVersion)_$(Platform)\apache_actions.lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<Bscmake>
@@ -139,21 +226,69 @@
<OutputFile>.\Debug/apache_actions.bsc</OutputFile>
</Bscmake>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TypeLibraryName>.\Debug/apache_actions.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;APACHE_ACTIONS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
+ <PrecompiledHeaderOutputFile>.\Debug$(PlatformToolsetVersion)_$(Platform)\apache_actions.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>.\Debug$(PlatformToolsetVersion)_$(Platform)\</AssemblerListingLocation>
+ <ObjectFileName>.\Debug$(PlatformToolsetVersion)_$(Platform)\</ObjectFileName>
+ <ProgramDataBaseFileName>.\Debug$(PlatformToolsetVersion)_$(Platform)\</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;msi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>.\Debug$(PlatformToolsetVersion)_$(Platform)\apache_actions.dll</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>.\Debug$(PlatformToolsetVersion)_$(Platform)\apache_actions.pdb</ProgramDatabaseFile>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <ImportLibrary>.\Debug$(PlatformToolsetVersion)_$(Platform)\apache_actions.lib</ImportLibrary>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\Debug/apache_actions.bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="apache_actions.cpp">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="StdAfx.cpp">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <None Include="apache_actions.def" />
- </ItemGroup>
- <ItemGroup>
<ResourceCompile Include="resources.rc" />
</ItemGroup>
<ItemGroup>
Modified: trunk/Installer/Custom/apache_actions/apache_actions.vcxproj.filters
===================================================================
--- trunk/Installer/Custom/apache_actions/apache_actions.vcxproj.filters 2013-08-01 14:55:20 UTC (rev 7710)
+++ trunk/Installer/Custom/apache_actions/apache_actions.vcxproj.filters 2013-08-01 16:21:30 UTC (rev 7711)
@@ -23,11 +23,6 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <None Include="apache_actions.def">
- <Filter>Source Files</Filter>
- </None>
- </ItemGroup>
- <ItemGroup>
<ResourceCompile Include="resources.rc">
<Filter>Source Files</Filter>
</ResourceCompile>
Property changes on: trunk/Installer/FdoRegUtil
___________________________________________________________________
Modified: svn:ignore
- Release
Release64
*.user
*.ncb
+ Release
Release64
*.user
*.ncb
Debug
Debug64
Modified: trunk/Installer/FdoRegUtil/FdoRegUtil.vcxproj
===================================================================
--- trunk/Installer/FdoRegUtil/FdoRegUtil.vcxproj 2013-08-01 14:55:20 UTC (rev 7710)
+++ trunk/Installer/FdoRegUtil/FdoRegUtil.vcxproj 2013-08-01 16:21:30 UTC (rev 7711)
@@ -28,19 +28,23 @@
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Copied: trunk/Installer/InstallerPreReq.sln (from rev 7453, trunk/Installer/InstallerPreReq_VS2010.sln)
===================================================================
--- trunk/Installer/InstallerPreReq.sln (rev 0)
+++ trunk/Installer/InstallerPreReq.sln 2013-08-01 16:21:30 UTC (rev 7711)
@@ -0,0 +1,35 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Express 2012 for Windows Desktop
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "apache_actions", "Custom\apache_actions\apache_actions.vcxproj", "{03FD713E-15EB-453E-AFDF-21F8DB45C11E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FdoRegUtil", "FdoRegUtil\FdoRegUtil.vcxproj", "{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|x64
+ {03FD713E-15EB-453E-AFDF-21F8DB45C11E}.Release|x64.Build.0 = Release|x64
+ {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/InstallerPreReq_VS2010.sln
===================================================================
--- trunk/Installer/InstallerPreReq_VS2010.sln 2013-08-01 14:55:20 UTC (rev 7710)
+++ trunk/Installer/InstallerPreReq_VS2010.sln 2013-08-01 16:21:30 UTC (rev 7711)
@@ -1,45 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "apache_actions", "Custom\apache_actions\apache_actions.vcxproj", "{03FD713E-15EB-453E-AFDF-21F8DB45C11E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iis_actions", "Custom\iis_actions\iis_actions.vcxproj", "{13697B62-C1CD-47EF-9D9B-39F5B01693BB}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FdoRegUtil", "FdoRegUtil\FdoRegUtil.vcxproj", "{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
Copied: trunk/Installer/InstallerWix.sln (from rev 7453, trunk/Installer/InstallerWix_VS2010.sln)
===================================================================
--- trunk/Installer/InstallerWix.sln (rev 0)
+++ trunk/Installer/InstallerWix.sln 2013-08-01 16:21:30 UTC (rev 7711)
@@ -0,0 +1,51 @@
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+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|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
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Deleted: trunk/Installer/InstallerWix_VS2010.sln
===================================================================
--- trunk/Installer/InstallerWix_VS2010.sln 2013-08-01 14:55:20 UTC (rev 7710)
+++ trunk/Installer/InstallerWix_VS2010.sln 2013-08-01 16:21:30 UTC (rev 7711)
@@ -1,51 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-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|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
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
Modified: trunk/Installer/Installers/MapGuide/Lang/MapGuide_en-US.wxl
===================================================================
--- trunk/Installer/Installers/MapGuide/Lang/MapGuide_en-US.wxl 2013-08-01 14:55:20 UTC (rev 7710)
+++ trunk/Installer/Installers/MapGuide/Lang/MapGuide_en-US.wxl 2013-08-01 16:21:30 UTC (rev 7711)
@@ -60,8 +60,8 @@
<String Id="IIS6ConfigDlg_Title">IIS 6.0 Configuration</String>
<String Id="IIS6ConfigDlg_Description">Configure IIS 6.0 Settings</String>
<String Id="IIS6ConfigDlg_InstallTo">Install Web Extensions to the following website</String>
- <String Id="IIS6ConfigDlg_AppPool">Create an application pool</String>
- <String Id="IIS6ConfigDlg_AppPoolDescription">An application pool allows MapGuide applications to be isolated from other applications running on the web server</String>
+ <String Id="IIS7ConfigDlg_AppPool">Create an application pool</String>
+ <String Id="IIS7ConfigDlg_AppPoolDescription">An application pool allows MapGuide applications to be isolated from other applications running on the web server</String>
<String Id="NoIISDlg_Title">IIS not found</String>
<String Id="NoIISDlg_Description">IIS not found</String>
Modified: trunk/Installer/Installers/MapGuide/MapGuide.wxs
===================================================================
--- trunk/Installer/Installers/MapGuide/MapGuide.wxs 2013-08-01 14:55:20 UTC (rev 7710)
+++ trunk/Installer/Installers/MapGuide/MapGuide.wxs 2013-08-01 16:21:30 UTC (rev 7711)
@@ -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.5" />
- <Property Id="APP_POOL_NAME" Secure="yes" Value="MapGuide25AppPool">
+ <Property Id="MG_VERSION_MAJOR_MINOR" Secure="yes" Value="2.6" />
+ <Property Id="APP_POOL_NAME" Secure="yes" Value="MapGuide26AppPool">
<RegistrySearch
Id="MgAppPoolNameRs"
Type="raw"
@@ -63,12 +63,13 @@
<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.8" />
- <Property Id="FDO_VERSION" Secure="yes" Value="3.8.0.0" />
+ <Property Id="FDO_VERSION_SMALL" Secure="yes" Value="3.9" />
+ <Property Id="FDO_VERSION" Secure="yes" Value="3.9.0.0" />
<!-- IIS vars -->
<Property Id="ASPNETVERSION" Value="v4.0" />
- <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" />
+ <!-- Don't try to use MG_VERSION_MAJOR_MINOR here. I tried. Just accept it and hardcode the number -->
+ <Property Id="PHP_FCGI_HANDLER_NAME" Value="MapGuide_2.6_PHP_via_FastCGI" />
+ <Property Id="MAPAGENT_ISAPI_NAME" Value="MapGuide 2.6 MapAgent ISAPI handler" />
<!--
These are currently static, though there is opportunity in the future for these
@@ -395,33 +396,6 @@
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.CancelButtonText)" />
</Dialog>
- <!-- Dialog to configure IIS6 specific things: web-site installation and application pool (w/ Trac #361 enhancements) -->
- <Dialog Id="IIS6ConfigDlg" Width="370" Height="270" Title="!(loc.InstallerTitle)">
- <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="{\WixUI_Font_Title}!(loc.IIS6ConfigDlg_Title)" />
- <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.IIS6ConfigDlg_Description)" />
- <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.InstallDirDlgBannerBitmap)" />
- <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
- <!--
-
- Install Web Extensions to the following website:
- ________________________________________________|V|
- Create an application pool: ___________________________
-
- It is recommended to create an application pool if you are running mixed
- ASP.net application environments on your web server.
-
- -->
- <Control Id="LblWebSite" Type="Text" Text="!(loc.IIS6ConfigDlg_InstallTo)" X="20" Y="80" Width="240" Height="15" />
- <Control Id="LstWebSite" Type="ListBox" Property="MG_WEBSITE" X="20" Y="100" Width="240" Height="60" />
- <Control Id="LblAppPool" Type="Text" Text="!(loc.IIS6ConfigDlg_AppPool)" X="20" Y="170" Width="240" Height="15" />
- <Control Id="TxtAppPool" Type="Edit" Property="APP_POOL_NAME" X="20" Y="190" Width="140" Height="15" />
- <Control Id="LblAppPoolDescription" Type="Text" Text="!(loc.IIS6ConfigDlg_AppPoolDescription)" X="20" Y="210" Width="240" Height="30" />
-
- <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.NextButtonText)" />
- <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.BackButtonText)" />
- <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.CancelButtonText)" />
- </Dialog>
-
<!-- Dialog to configure IIS7 specific things -->
<Dialog Id="IIS7ConfigDlg" Width="370" Height="270" Title="!(loc.InstallerTitle)">
<Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="{\WixUI_Font_Title}IIS 7.0 Configuration" />
@@ -437,9 +411,9 @@
ASP.net application environments on your web server.
-->
- <Control Id="LblAppPool" Type="Text" Text="!(loc.IIS6ConfigDlg_AppPool)" X="20" Y="80" Width="240" Height="15" />
+ <Control Id="LblAppPool" Type="Text" Text="!(loc.IIS7ConfigDlg_AppPool)" X="20" Y="80" Width="240" Height="15" />
<Control Id="TxtAppPool" Type="Edit" Property="APP_POOL_NAME" X="20" Y="100" Width="240" Height="15" />
- <Control Id="LblAppPoolDescription" Type="Text" Text="!(loc.IIS6ConfigDlg_AppPoolDescription)" X="20" Y="120" Width="240" Height="45" />
+ <Control Id="LblAppPoolDescription" Type="Text" Text="!(loc.IIS7ConfigDlg_AppPoolDescription)" X="20" Y="120" Width="240" Height="45" />
<Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.NextButtonText)" />
<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.BackButtonText)" />
@@ -527,9 +501,7 @@
<!-- Show the FastCGI warning before advancing to any IIS configuration dialog -->
<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="2">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>
@@ -601,9 +573,7 @@
<Publish Dialog="ApacheConfigDlg" Control="Back" Event="NewDialog" Value="WebServerConfigDlgIIS" Order="2">NOT IISVERSIONMAJOR="#0"</Publish>
<Publish Dialog="ApacheConfigDlg" Control="Cancel" Event="SpawnDialog" Value="CancelDlg">1</Publish>
- <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="1">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>
@@ -619,12 +589,6 @@
<Publish Dialog="IISLangConfigDlg" Control="Back" Event="NewDialog" Value="WebServerConfigDlgIIS" Order="2">1</Publish>
<Publish Dialog="IISLangConfigDlg" Control="Cancel" Event="SpawnDialog" Value="CancelDlg">1</Publish>
- <Publish Dialog="IIS6ConfigDlg" Control="Next" Event="NewDialog" Value="IPConfigDlg">1</Publish>
- <Publish Dialog="IIS6ConfigDlg" Control="Back" Event="NewDialog" Value="IISLangConfigDlg" Order="1">NETFRAMEWORK40FULL</Publish>
- <Publish Dialog="IIS6ConfigDlg" Control="Back" Event="DoAction" Value="MgWeb_Config_To_IIS_CA" Order="2">NOT NETFRAMEWORK40FULL</Publish>
- <Publish Dialog="IIS6ConfigDlg" Control="Back" Event="NewDialog" Value="WebServerConfigDlgIIS" Order="3">NOT NETFRAMEWORK40FULL</Publish>
- <Publish Dialog="IIS6ConfigDlg" Control="Cancel" Event="SpawnDialog" Value="CancelDlg">1</Publish>
-
<Publish Dialog="IIS7ConfigDlg" Control="Next" Event="NewDialog" Value="IPConfigDlg">1</Publish>
<Publish Dialog="IIS7ConfigDlg" Control="Back" Event="NewDialog" Value="IISLangConfigDlg" Order="1">NETFRAMEWORK40FULL</Publish>
<Publish Dialog="IIS7ConfigDlg" Control="Back" Event="DoAction" Value="MgWeb_Config_To_IIS_CA" Order="2">NOT NETFRAMEWORK40FULL</Publish>
@@ -632,14 +596,12 @@
<Publish Dialog="IIS7ConfigDlg" Control="Cancel" Event="SpawnDialog" Value="CancelDlg">1</Publish>
<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="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>
- <Publish Dialog="IPConfigDlg" Control="Back" Event="DoAction" Value="MgWeb_Config_To_NoIIS_CA" Order="7">IISVERSIONMAJOR="#0"</Publish>
- <Publish Dialog="IPConfigDlg" Control="Back" Event="NewDialog" Value="WebServerConfigDlgNoIIS" Order="8">IISVERSIONMAJOR="#0" AND MGWEB_CONFIG="MANUAL"</Publish>
+ <Publish Dialog="IPConfigDlg" Control="Back" Event="NewDialog" Value="IIS7ConfigDlg" Order="1">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR>="#7"</Publish>
+ <Publish Dialog="IPConfigDlg" Control="Back" Event="NewDialog" Value="ApacheConfigDlg" Order="2">MGWEB_CONFIG="APACHE"</Publish>
+ <Publish Dialog="IPConfigDlg" Control="Back" Event="DoAction" Value="MgWeb_Config_To_IIS_CA" Order="3">(NOT IISVERSIONMAJOR="#0") AND ( (IISVERSIONMAJOR="#5" AND (NOT NETFRAMEWORK40FULL)) OR (MGWEB_CONFIG="MANUAL" ))</Publish>
+ <Publish Dialog="IPConfigDlg" Control="Back" Event="NewDialog" Value="WebServerConfigDlgIIS" Order="4">(NOT IISVERSIONMAJOR="#0") AND ( (IISVERSIONMAJOR="#5" AND (NOT NETFRAMEWORK40FULL) AND MGWEB_CONFIG="IIS" ) OR (MGWEB_CONFIG="MANUAL" ))</Publish>
+ <Publish Dialog="IPConfigDlg" Control="Back" Event="DoAction" Value="MgWeb_Config_To_NoIIS_CA" Order="5">IISVERSIONMAJOR="#0"</Publish>
+ <Publish Dialog="IPConfigDlg" Control="Back" Event="NewDialog" Value="WebServerConfigDlgNoIIS" Order="6">IISVERSIONMAJOR="#0" AND MGWEB_CONFIG="MANUAL"</Publish>
<Publish Dialog="IPConfigDlg" Control="Cancel" Event="SpawnDialog" Value="CancelDlg">1</Publish>
<Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="IPConfigDlg">1</Publish>
@@ -741,10 +703,7 @@
<ProgressText Action="FdoUnRegSlt">!(loc.FdoUnRegSlt)</ProgressText>
</UI>
- <!-- Trac #361: Run our custom CA as part of the UI install sequence -->
- <InstallUISequence>
- <Custom Action="EnumerateIIS6WebSites" After="CostFinalize" Overridable="yes">NOT Installed AND IISVERSIONMAJOR="#6"</Custom>
- </InstallUISequence>
+ <InstallUISequence />
<InstallExecuteSequence>
@@ -872,14 +831,6 @@
<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>
-
- <!-- IIS6 deferred actions ConfigureIIS is a WiX built-in action; I'm overriding and making the action conditional -->
- <Custom Action="ConfigureIIs" After="InstallFiles">MGWEB_CONFIG="IIS" AND (IISVERSIONMAJOR="#5" OR IISVERSIONMAJOR="#6") AND (&WebExtensionsFeature>2 OR &WebExtensionsFeature=2)</Custom>
- <Custom Action="AspNetRegIIS" After="ConfigureIIs">NETFRAMEWORK40FULL AND MGWEB_CONFIG="IIS" AND (IISVERSIONMAJOR="#5" OR IISVERSIONMAJOR="#6") AND &WebExtensionsFeature>2</Custom>
-
<Custom Action="FdoRegCmd" After="InstallInitialize"></Custom>
<!-- FDO Provider Registration Immediate Actions -->
Modified: trunk/Installer/Libraries/MapGuide Server/FDO.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Server/FDO.wxs 2013-08-01 14:55:20 UTC (rev 7710)
+++ trunk/Installer/Libraries/MapGuide Server/FDO.wxs 2013-08-01 16:21:30 UTC (rev 7711)
@@ -88,12 +88,14 @@
<!-- 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" />
- <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" />
+ <File Id="FdoBoostChrono" Checksum="yes" Source="$(var.MgSource)\Server\FDO\boost_chrono-vc100-mt-1_54.dll" />
+ <File Id="FdoBoostSystem" Checksum="yes" Source="$(var.MgSource)\Server\FDO\boost_system-vc100-mt-1_54.dll" />
+ <File Id="FdoBoostDateTime" Checksum="yes" Source="$(var.MgSource)\Server\FDO\boost_date_time-vc100-mt-1_54.dll" />
+ <File Id="FdoBoostThread" Checksum="yes" Source="$(var.MgSource)\Server\FDO\boost_thread-vc100-mt-1_54.dll" />
<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" />
- <File Id="GdalLib" Checksum="yes" Source="$(var.MgSource)\Server\FDO\gdal19.dll" />
+ <File Id="GdalLib" Checksum="yes" Source="$(var.MgSource)\Server\FDO\gdal110.dll" />
<File Id="FdoExpressionEngine" Checksum="yes" Source="$(var.MgSource)\Server\FDO\ExpressionEngine.dll" />
<File Id="FdoCore" Checksum="yes" Source="$(var.MgSource)\Server\FDO\FDO.dll" />
<File Id="FdoCommon" Checksum="yes" Source="$(var.MgSource)\Server\FDO\FDOCommon.dll" />
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/Apache.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/Apache.wxs 2013-08-01 14:55:20 UTC (rev 7710)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/Apache.wxs 2013-08-01 16:21:30 UTC (rev 7711)
@@ -4,19 +4,23 @@
<!-- httpd.exe -->
<?define HTTP_MAP = "file_APACHEFILES_19" ?>
<!-- tomcat7.exe -->
- <?define TOMCAT_MAP = "file_TOMCATFILES_39" ?>
+ <?define TOMCAT_MAP = "file_TOMCATFILES_40" ?>
<!-- service.bat -->
- <?define TOMCAT_BAT = "file_TOMCATFILES_29" ?>
+ <?define TOMCAT_BAT = "file_TOMCATFILES_30" ?>
+ <!-- apache_actions.dll path -->
+ <?define ACTION_DLL_PATH = "..\..\Custom\apache_actions\bin110_x64\apache_actions.dll" ?>
<?else ?>
<!-- httpd.exe -->
<?define HTTP_MAP = "file_APACHEFILES_19" ?>
<!-- tomcat7.exe -->
- <?define TOMCAT_MAP = "file_TOMCATFILES_39" ?>
+ <?define TOMCAT_MAP = "file_TOMCATFILES_40" ?>
<!-- service.bat -->
- <?define TOMCAT_BAT = "file_TOMCATFILES_29" ?>
+ <?define TOMCAT_BAT = "file_TOMCATFILES_30" ?>
+ <!-- apache_actions.dll path -->
+ <?define ACTION_DLL_PATH = "..\..\Custom\apache_actions\bin110_Win32\apache_actions.dll" ?>
<?endif ?>
<Fragment>
- <Binary Id="ApacheActions" SourceFile="..\..\Custom\bin\apache_actions.dll" />
+ <Binary Id="ApacheActions" SourceFile="$(var.ACTION_DLL_PATH)" />
<CustomAction Id="UpdateApacheConfig.SetValues" Property="UpdateApacheConfig" Value="[WEBEXTENSIONSLOCATION];[APACHE_API_TYPE];[APACHE_PORT];[APACHELOCATION];[PHPLOCATION];[WEBROOTLOCATION];[VIRTUALDIR]" />
<CustomAction Id="UpdateApacheConfig" Return="check" BinaryKey="ApacheActions" Execute="deferred" DllEntry="UpdateApacheConfig" />
<CustomAction Id="UpdatePhpIni.SetValues" Property="UpdatePhpIni" Value='[PHPLOCATION];2;[WEBTEMPLOCATION]' />
Deleted: trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs 2013-08-01 14:55:20 UTC (rev 7710)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs 2013-08-01 16:21:30 UTC (rev 7711)
@@ -1,297 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
- xmlns:iis="http://schemas.microsoft.com/wix/IIsExtension"
- xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
- <?if "$(var.MgPlatform)" = "x64" ?>
- <?define Win64 = "yes" ?>
- <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
- <!-- 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" ?>
- <!-- isapi_MapAgent.dll -->
- <?define FCGI_MAP = "[!file_MAPAGENTFILES_100]" ?>
- <!-- php-cgi.exe -->
- <?define PHP_CGI_EXE = "[!file_PHPFILES_32]" ?>
- <?endif ?>
- <!-- fcgiext.dll -->
- <?define PHP_MAP = "[WindowsFolder]system32\inetsrv\fcgiext.dll" ?>
- <Fragment>
- <Property Id="FRAMEWORKDIR">
- <RegistrySearch
- Id="DotNetSearch"
- Root="HKLM"
- Win64="$(var.Win64)"
- Key="Software\Microsoft\.NETFramework"
- Name="InstallRoot"
- Type="directory" />
- </Property>
- <PropertyRef Id="MGWEB_CONFIG"/>
- <PropertyRef Id="IISVERSIONMAJOR"/>
- <PropertyRef Id="IIS_API_TYPE"/>
-
- <CustomAction Id="AspNetRegIIS_Cmd" Property="AspNetRegIIS" Execute="immediate"
- Value=""[FRAMEWORKDIR]v4.0.30319\aspnet_regiis.exe" -s W3SVC/[SITE_ID]/ROOT/[VIRTUALDIR]" />
- <CustomAction Id="AspNetRegIIS" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no" />
-
- <!-- Begin Trac Ticket #361 stuff -->
-
-
- <!-- CA dll reference -->
- <Binary Id="iis_uihelper" SourceFile="..\..\Custom\bin\iis_actions.dll" />
- <CustomAction Id="EnumerateIIS6WebSites" BinaryKey="iis_uihelper" DllEntry="PopulateWebSites" Return="check" Execute="immediate" />
-
- <!--
- This is no longer a pointer, this will reference the site we choose from the UI selection. The key is in
- the SiteId attribute, which is * to allow for a selection by web site name, instead of name/port/ip/header
-
- For more information: http://www.mail-archive.com/wix-users@lists.sourceforge.net/msg27928.html
- -->
- <iis:WebSite Id="IISDefaultWebSite" Description="[MG_WEBSITE]" SiteId="*">
- <iis:WebAddress Id="AllUnassigned" Port="80" />
- </iis:WebSite>
-
- <!-- End Trac Ticket #361 stuff -->
-
- <Feature Id="IISSetupFeature" Level="1" Display="hidden" >
- <Component Id="IISFastCgiConfigComponent" Win64="$(var.Win64)" Guid="2C29D170-15B0-41E6-AD72-91DA094A28CC" Directory="IISROOTLOCATION">
- <Condition>MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#5" OR IISVERSIONMAJOR="#6"</Condition>
- <CreateFolder />
- <IniFile Id="IniRegPhpType"
- Action="addLine"
- Directory="IISROOTLOCATION"
- Key="php"
- Name="fcgiext.ini"
- Section="Types"
- Value="PHP"/>
- <IniFile Id="IniSetPhpExe"
- Action="addLine"
- Directory="IISROOTLOCATION"
- Key="ExePath"
- Name="fcgiext.ini"
- Section="PHP"
- Value="$(var.PHP_CGI_EXE)"/>
- </Component>
-
- <!-- IIS5 Base component -->
- <!--
- NOTE: Always check the file offsets whenever PHP is updated and/or the mapagent is updated, because we may be creating script
- maps to files that have moved up or down, and thus the offset is no longer valid
- -->
- <Component Id="IIS5BaseMapGuideComponent" Win64="$(var.Win64)" Guid="4174B322-8449-4299-813F-E2B1FCB4ECB4" Directory="WEBEXTENSIONSLOCATION">
- <Condition>MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#5"</Condition>
- <CreateFolder />
- <iis:WebVirtualDir Id="IIS5MapGuideVDir" Alias="[VIRTUALDIR]" Directory="WEBROOTLOCATION" WebSite="IISDefaultWebSite">
- <iis:WebDirProperties Id="IIS5MapGuideDocuments" DefaultDocuments="index.php,index.html,index.htm,default.aspx,index.aspx,default.htm,default.html" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no"/>
- <iis:WebApplication Id="IIS5MapGuideWebApp" Name="[VIRTUALDIR]">
- <iis:WebApplicationExtension Extension="php" Script="yes" Verbs="GET,POST,HEAD" CheckPath="yes" Executable="$(var.PHP_MAP)" />
- </iis:WebApplication>
- <iis:WebVirtualDir Id="IIS5MapAgentVDir" Alias="mapagent" Directory="dir_mapagent_0" >
- <iis:WebDirProperties Id="IIS5MapAgentProperties" DefaultDocuments="index.html" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no"/>
- <!-- Moving to WiX 3.5 broke this. So we'll disable for now -->
- <!--
- <iis:WebError ErrorCode="401" SubCode="0" />
- <iis:WebError ErrorCode="401" SubCode="1" />
- <iis:WebError ErrorCode="401" SubCode="2" />
- <iis:WebError ErrorCode="401" SubCode="3" />
- <iis:WebError ErrorCode="401" SubCode="4" />
- <iis:WebError ErrorCode="401" SubCode="5" />
- -->
- <iis:WebApplication Id="IIS5MapAgentWebApp" Name="mapagent" >
- <iis:WebApplicationExtension Extension="fcgi" Script="yes" Verbs="GET,POST" CheckPath="no" Executable="$(var.FCGI_MAP)" />
- <iis:WebApplicationExtension Extension="php" Script="yes" Verbs="GET,POST" CheckPath="no" Executable="$(var.PHP_MAP)" />
- </iis:WebApplication>
- </iis:WebVirtualDir>
- <iis:WebVirtualDir Id="IIS5MapAdminVDir" Alias="mapadmin" Directory="dir_mapadmin_0" >
- <iis:WebDirProperties Id="IIS5MapAdminDocument" DefaultDocuments="login.php" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no"/>
- </iis:WebVirtualDir>
- </iis:WebVirtualDir>
- </Component>
-
- <!-- IIS5 PHP MapViewer component -->
- <Component Id="IIS5PhpViewerComponent" Win64="$(var.Win64)" Guid="1E56B410-1305-4406-BDFB-1252E159B746" Directory="WEBEXTENSIONSLOCATION">
- <Condition>MGWEB_CONFIG="IIS" AND IIS_API_TYPE="PHP" AND IISVERSIONMAJOR="#5"</Condition>
- <CreateFolder />
- <iis:WebVirtualDir Id="IIS5PhpViewerVDir" Alias="[VIRTUALDIR]/mapviewerajax" Directory="dir_mapviewerphp_0" WebSite="IISDefaultWebSite">
- <iis:WebDirProperties Id="IIS5PhpViewerDocument" DefaultDocuments="ajaxviewer.php" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no"/>
- </iis:WebVirtualDir>
- </Component>
-
- <!-- IIS5 PHP Viewer Sample component -->
- <Component Id="IIS5PhpViewerSampleComponent" Win64="$(var.Win64)" Guid="2CB24A26-985E-4EEF-8412-A54282542B04" Directory="WEBEXTENSIONSLOCATION">
- <Condition>MGWEB_CONFIG="IIS" AND IIS_API_TYPE="PHP" AND IISVERSIONMAJOR="#5"</Condition>
- <CreateFolder />
- <iis:WebVirtualDir Id="IIS5PhpViewerSampleVDir" Alias="[VIRTUALDIR]/phpviewersample" Directory="dir_phpviewersample_0" WebSite="IISDefaultWebSite">
- <iis:WebDirProperties Id="IIS5PhpViewerSampleDocument" DefaultDocuments="ajaxviewersample.php" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no" />
- <iis:WebApplication Id="IIS5PhpViewerSampleWebApp" Name="phpviewersample" />
- </iis:WebVirtualDir>
- </Component>
-
- <!-- IIS5 PHP DevGuide Sample component -->
- <Component Id="IIS5PhpDevGuideSampleComponent" Win64="$(var.Win64)" Guid="58BB8334-650E-481D-8033-BF1C212FE57E" Directory="WEBEXTENSIONSLOCATION">
- <Condition>MGWEB_CONFIG="IIS" AND IIS_API_TYPE="PHP" AND IISVERSIONMAJOR="#5"</Condition>
- <CreateFolder />
- <iis:WebVirtualDir Id="IIS5PhpDevGuideSampleVDir" Alias="[VIRTUALDIR]/phpsamples" Directory="dir_phpsamples_0" WebSite="IISDefaultWebSite">
- <iis:WebDirProperties Id="IIS5PhpDevGuideSampleDocument" DefaultDocuments="main.php" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no" />
- <iis:WebApplication Id="IIS5PhpDevGuideSampleWebApp" Name="phpsamples" />
- </iis:WebVirtualDir>
- </Component>
-
- <!-- IIS5 DotNet MapViewer component -->
- <Component Id="IIS5DotNetViewerComponent" Win64="$(var.Win64)" Guid="EC460125-D5D4-4596-BD03-B8D920F02E7F" Directory="WEBEXTENSIONSLOCATION">
- <Condition>NETFRAMEWORK40FULL AND MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#5"</Condition>
- <CreateFolder />
- <iis:WebVirtualDir Id="IIS5DotNetViewerVDir" Alias="[VIRTUALDIR]/mapviewerajax" Directory="dir_mapviewernet_0" WebSite="IISDefaultWebSite">
- <iis:WebDirProperties Id="IIS5DotNetViewerDocument" DefaultDocuments="ajaxviewer.aspx" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no" />
- <iis:WebApplication Id="IIS5MapViewerWebApp" Name="mapviewerajax" />
- </iis:WebVirtualDir>
- </Component>
-
- <!-- IIS5 DotNet MapViewer component -->
- <Component Id="IIS5DotNetViewerComponent2" Win64="$(var.Win64)" Guid="DAEBD87A-CAC4-45AA-A5FD-0AF8472EB13C" Directory="WEBEXTENSIONSLOCATION">
- <Condition>NETFRAMEWORK40FULL AND MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#5"</Condition>
- <CreateFolder />
- <iis:WebVirtualDir Id="IIS5DotNetViewerVDir2" Alias="[VIRTUALDIR]/mapviewernet" Directory="dir_mapviewernet_0" WebSite="IISDefaultWebSite">
- <iis:WebDirProperties Id="IIS5DotNetViewerDocument2" DefaultDocuments="ajaxviewer.aspx" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no" />
- <iis:WebApplication Id="IIS5MapViewerWebApp2" Name="mapviewernet" />
- </iis:WebVirtualDir>
- </Component>
-
- <!-- IIS5 DotNet Viewer Sample component -->
- <Component Id="IIS5DotNetViewerSampleComponent" Win64="$(var.Win64)" Guid="81AE3F12-5CC5-48F6-AC62-5F225A9743EB" Directory="WEBEXTENSIONSLOCATION">
- <Condition>NETFRAMEWORK40FULL AND MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#5"</Condition>
- <CreateFolder />
- <iis:WebVirtualDir Id="IIS5DotNetViewerSampleVDir" Alias="[VIRTUALDIR]/dotnetviewersample" Directory="dir_dotnetviewersample_0" WebSite="IISDefaultWebSite">
- <iis:WebDirProperties Id="IIS5DotNetViewerSampleDocument" DefaultDocuments="ajaxviewersample.aspx" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no" />
- <iis:WebApplication Id="IIS5DotNetViewerSampleWebApp" Name="dotnetviewersample" />
- </iis:WebVirtualDir>
- </Component>
-
- <!-- IIS5 DotNet DevGuide Sample component -->
- <Component Id="IIS5DotNetDevGuideSampleComponent" Win64="$(var.Win64)" Guid="91FA4F55-0673-4043-BEBD-19E4094A8A32" Directory="WEBEXTENSIONSLOCATION">
- <Condition>NETFRAMEWORK40FULL AND MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#5"</Condition>
- <CreateFolder />
- <iis:WebVirtualDir Id="IIS5DotNetDevGuideSampleVDir" Alias="[VIRTUALDIR]/dotnetsamples" Directory="dir_dotnetsamples_0" WebSite="IISDefaultWebSite">
- <iis:WebDirProperties Id="IIS5DotNetDevGuideSampleDocument" DefaultDocuments="main.aspx" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no" />
- <iis:WebApplication Id="IIS5DotNetDevGuideSampleWebApp" Name="dotnetsamples" />
- </iis:WebVirtualDir>
- </Component>
-
- <!-- Trac #361 -->
- <Component Id="PersistWebsiteSelection" Win64="$(var.Win64)" Guid="0C0CBB26-C99B-486a-9367-15D49AC9726B" Directory="WEBEXTENSIONSLOCATION">
- <RegistryKey Root="HKLM" Key="$(var.MgRegKey)">
- <RegistryValue Name="MG_WEBSITE" Type="string" Value="[MG_WEBSITE]" />
- </RegistryKey>
- </Component>
-
- <!-- IIS6 Base component -->
- <!--
- NOTE: Always check the file offsets whenever PHP is updated and/or the mapagent is updated, because we may be creating script
- maps to files that have moved up or down, and thus the offset is no longer valid
- -->
- <Component Id="IIS6BaseMapGuideComponent" Win64="$(var.Win64)" Guid="BC77760D-55D5-4111-BC1D-50CEC0482D60" Directory="WEBEXTENSIONSLOCATION">
- <Condition>MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#6"</Condition>
- <CreateFolder />
- <iis:WebAppPool Id="IIS6MapGuideAppPool" Name="[APP_POOL_NAME]" />
- <iis:WebServiceExtension Id="IIS6PhpWebServiceExt" Allow="yes" Description="[PHP_FCGI_HANDLER_NAME]" File="$(var.PHP_MAP)" />
- <iis:WebServiceExtension Id="IIS6MapGuideWebServiceExt" Allow="yes" Description="[MAPAGENT_ISAPI_NAME]" File="$(var.FCGI_MAP)" />
- <iis:WebVirtualDir Id="IIS6MapGuideVDir" Alias="[VIRTUALDIR]" Directory="WEBROOTLOCATION" WebSite="IISDefaultWebSite" >
- <iis:WebDirProperties Id="IIS6MapGuideDocuments" DefaultDocuments="index.php,index.html,index.htm,default.aspx,index.aspx,default.htm,default.html" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no" />
- <iis:MimeMap Id="IIS6JsonMimeType" Type="application/json" Extension =".json" />
- <iis:WebApplication Id="IIS6MapGuideWebApp" Name="[VIRTUALDIR]" WebAppPool="IIS6MapGuideAppPool" >
- <iis:WebApplicationExtension Extension="php" Script="yes" Verbs="GET,POST,HEAD" CheckPath="yes" Executable="$(var.PHP_MAP)" />
- </iis:WebApplication>
- <iis:WebVirtualDir Id="IIS6MapAgentVDir" Alias="mapagent" Directory="dir_mapagent_0" >
- <iis:WebDirProperties Id="IIS6MapAgentProperties" DefaultDocuments="index.html" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no" />
- <!-- Moving to WiX 3.5 broke this. So we'll disable for now -->
- <!--
- <iis:WebError ErrorCode="401" SubCode="0"/>
- <iis:WebError ErrorCode="401" SubCode="1" />
- <iis:WebError ErrorCode="401" SubCode="2" />
- <iis:WebError ErrorCode="401" SubCode="3" />
- <iis:WebError ErrorCode="401" SubCode="4" />
- <iis:WebError ErrorCode="401" SubCode="5" />
- -->
- <iis:WebApplication Id="IIS6MapAgentWebApp" Name="mapagent" WebAppPool="IIS6MapGuideAppPool">
- <iis:WebApplicationExtension Extension="fcgi" Script="yes" Verbs="GET,POST" CheckPath="no" Executable="$(var.FCGI_MAP)" />
- <iis:WebApplicationExtension Extension="php" Script="yes" Verbs="GET,POST" CheckPath="no" Executable="$(var.PHP_MAP)" />
- </iis:WebApplication>
- </iis:WebVirtualDir>
- <iis:WebVirtualDir Id="IIS6MapAdminVDir" Alias="mapadmin" Directory="dir_mapadmin_0" >
- <iis:WebDirProperties Id="IIS6MapAdminDocument" DefaultDocuments="login.php" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no" />
- </iis:WebVirtualDir>
- </iis:WebVirtualDir>
- </Component>
-
- <!-- IIS6 PHP MapViewer component -->
- <Component Id="IIS6PhpViewerComponent" Win64="$(var.Win64)" Guid="6CDC8E73-B6B1-4A2E-98E3-953C399D1D0D" Directory="WEBEXTENSIONSLOCATION">
- <Condition>MGWEB_CONFIG="IIS" AND IIS_API_TYPE="PHP" AND IISVERSIONMAJOR="#6"</Condition>
- <CreateFolder />
- <iis:WebVirtualDir Id="IIS6PhpViewerVDir" Alias="[VIRTUALDIR]/mapviewerajax" Directory="dir_mapviewerphp_0" WebSite="IISDefaultWebSite">
- <iis:WebDirProperties Id="IIS6PhpViewerDocument" DefaultDocuments="ajaxviewer.php" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no" />
- </iis:WebVirtualDir>
- </Component>
-
- <!-- IIS6 PHP Viewer Sample component -->
- <Component Id="IIS6PhpViewerSampleComponent" Win64="$(var.Win64)" Guid="88AACC15-76BC-47B9-B5C3-698142A3BE07" Directory="WEBEXTENSIONSLOCATION">
- <Condition>MGWEB_CONFIG="IIS" AND IIS_API_TYPE="PHP" AND IISVERSIONMAJOR="#6"</Condition>
- <CreateFolder />
- <iis:WebVirtualDir Id="IIS6PhpViewerSampleVDir" Alias="[VIRTUALDIR]/phpviewersample" Directory="dir_phpviewersample_0" WebSite="IISDefaultWebSite">
- <iis:WebDirProperties Id="IIS6PhpViewerSampleDocument" DefaultDocuments="ajaxviewersample.php" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no" />
- </iis:WebVirtualDir>
- </Component>
-
- <!-- IIS6 PHP DevGuide Sample component -->
- <Component Id="IIS6PhpDevGuideSampleComponent" Win64="$(var.Win64)" Guid="EFE0BE5D-4D36-4366-A81F-F05414DE766F" Directory="WEBEXTENSIONSLOCATION">
- <Condition>MGWEB_CONFIG="IIS" AND IIS_API_TYPE="PHP" AND IISVERSIONMAJOR="#6"</Condition>
- <CreateFolder />
- <iis:WebVirtualDir Id="IIS6PhpDevGuideSampleVDir" Alias="[VIRTUALDIR]/phpsamples" Directory="dir_phpsamples_0" WebSite="IISDefaultWebSite">
- <iis:WebDirProperties Id="IIS6PhpDevGuideSampleDocument" DefaultDocuments="main.php" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no" />
- </iis:WebVirtualDir>
- </Component>
-
- <!-- IIS6 DotNet MapViewer component -->
- <Component Id="IIS6DotNetViewerComponent" Win64="$(var.Win64)" Guid="357E1C68-9E29-474F-A783-6F8FD8BCEAB4" Directory="WEBEXTENSIONSLOCATION">
- <Condition>NETFRAMEWORK40FULL AND MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#6"</Condition>
- <CreateFolder />
- <iis:WebVirtualDir Id="IIS6DotNetViewerVDir" Alias="[VIRTUALDIR]/mapviewerajax" Directory="dir_mapviewernet_0" WebSite="IISDefaultWebSite">
- <iis:WebDirProperties Id="IIS6DotNetViewerDocument" DefaultDocuments="ajaxviewer.aspx" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no" />
- <iis:WebApplication Id="IIS6MapViewerWebApp" Name="mapviewerajax" WebAppPool="IIS6MapGuideAppPool" />
- </iis:WebVirtualDir>
- </Component>
-
- <!-- IIS6 DotNet MapViewer component -->
- <Component Id="IIS6DotNetViewerComponent2" Win64="$(var.Win64)" Guid="44807D96-F0FB-4D2E-A863-335AA034ECB4" Directory="WEBEXTENSIONSLOCATION">
- <Condition>NETFRAMEWORK40FULL AND MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#6"</Condition>
- <CreateFolder />
- <iis:WebVirtualDir Id="IIS6DotNetViewerVDir2" Alias="[VIRTUALDIR]/mapviewernet" Directory="dir_mapviewernet_0" WebSite="IISDefaultWebSite">
- <iis:WebDirProperties Id="IIS6DotNetViewerDocument2" DefaultDocuments="ajaxviewer.aspx" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no" />
- <iis:WebApplication Id="IIS6MapViewerWebApp2" Name="mapviewernet" WebAppPool="IIS6MapGuideAppPool" />
- </iis:WebVirtualDir>
- </Component>
-
- <!-- IIS6 DotNet Viewer Sample component -->
- <Component Id="IIS6DotNetViewerSampleComponent" Win64="$(var.Win64)" Guid="E2330508-5E84-4451-9D34-F813B452039D" Directory="WEBEXTENSIONSLOCATION">
- <Condition>NETFRAMEWORK40FULL AND MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#6"</Condition>
- <CreateFolder />
- <iis:WebVirtualDir Id="IIS6DotNetViewerSampleVDir" Alias="[VIRTUALDIR]/dotnetviewersample" Directory="dir_dotnetviewersample_0" WebSite="IISDefaultWebSite">
- <iis:WebDirProperties Id="IIS6DotNetViewerSampleDocument" DefaultDocuments="ajaxviewersample.aspx" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no" />
- <iis:WebApplication Id="IIS6DotNetViewerSampleWebApp" Name="dotnetviewersample" WebAppPool="IIS6MapGuideAppPool" />
- </iis:WebVirtualDir>
- </Component>
-
- <!-- IIS6 DotNet DevGuide Sample component -->
- <Component Id="IIS6DotNetDevGuideSampleComponent" Win64="$(var.Win64)" Guid="71EDDC8E-A1BA-4c69-B7E3-F52E32FB3CA1" Directory="WEBEXTENSIONSLOCATION">
- <Condition>NETFRAMEWORK40FULL AND MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#6"</Condition>
- <CreateFolder />
- <iis:WebVirtualDir Id="IIS6DotNetDevGuideSampleVDir" Alias="[VIRTUALDIR]/dotnetsamples" Directory="dir_dotnetsamples_0" WebSite="IISDefaultWebSite">
- <iis:WebDirProperties Id="IIS6DotNetDevGuideSampleDocument" DefaultDocuments="main.aspx" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no" />
- <iis:WebApplication Id="IIS6DotNetDevGuideSampleWebApp" Name="dotnetsamples" WebAppPool="IIS6MapGuideAppPool" />
- </iis:WebVirtualDir>
- </Component>
- </Feature>
- </Fragment>
-</Wix>
\ No newline at end of file
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/MapGuide Web Extensions.wixproj
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/MapGuide Web Extensions.wixproj 2013-08-01 14:55:20 UTC (rev 7710)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/MapGuide Web Extensions.wixproj 2013-08-01 16:21:30 UTC (rev 7711)
@@ -56,7 +56,6 @@
<Compile Include="FileIncludes\incTomcatFiles.wxs" />
<Compile Include="FileIncludes\incWebInfFiles.wxs" />
<Compile Include="FileIncludes\incWebRootFiles.wxs" />
- <Compile Include="IIS.wxs" />
<Compile Include="IIS7.wxs" />
<Compile Include="MapGuideWebExtensions.wxs" />
<Compile Include="Shortcuts.wxs" />
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs 2013-08-01 14:55:20 UTC (rev 7710)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs 2013-08-01 16:21:30 UTC (rev 7711)
@@ -238,7 +238,6 @@
<Feature Id="WebStdIconsFeature" Title="!(loc.WebStdIconsFeature)" Display="hidden" Level="1" Description="!(loc.WebStdIconsFeature_Description)" AllowAdvertise="no" TypicalDefault="install" InstallDefault="local">
<ComponentGroupRef Id="group_MAPVIEWERSTDICONFILES" />
</Feature>
- <FeatureRef Id="IISSetupFeature" />
<Feature Id="SvnMetadataFeature" Title="!(loc.SvnMetadataFeature)" Level="1" Description="!(loc.SvnMetadataFeature_Description)" AllowAdvertise="no" TypicalDefault="install" InstallDefault="local">
<ComponentGroupRef Id="incDotNetDevGuideFiles_SVNMETADATA" />
<ComponentGroupRef Id="incDotNetViewerSampleFiles_SVNMETADATA" />
Modified: trunk/Installer/build.bat
===================================================================
--- trunk/Installer/build.bat 2013-08-01 14:55:20 UTC (rev 7710)
+++ trunk/Installer/build.bat 2013-08-01 16:21:30 UTC (rev 7711)
@@ -15,7 +15,6 @@
rem
rem build.bat [-h]
rem [-v]
-rem [-c=BuildType]
rem [-a=Action]
rem [-lang=Culture]
rem [-srv=ServerDirectory]
@@ -24,9 +23,8 @@
rem [-name=MapGuideInstallerFilename]
rem [-title=MapGuideInstallerTitle]
rem
-rem BuildType: Release(default), Debug
rem Action: build(default), clean, regen, prepare, generate (only use generate when creating new GIDs)
-rem SourceDirectory: The directory that was used for MapGuide build ouput
+rem SourceDirectory: The directory that was used for MapGuide build output
rem MapGuideVersion: The version associated with the installer in the format 2.1.0.0
rem MapGuideInstallerFilename: File name of output .exe in the format MapGuideOpenSource-2.1.0-Something
rem MapGuideInstallerTitle: Title to appear in the installer.
@@ -37,25 +35,14 @@
SET OLDPATH=%PATH%
rem ==================================================
-rem Update solution suffix if using VC10 compiler.
-rem NOTE: VS10 solution files are suffixed with _VS2010
-rem which is why we can do it like this
-rem ==================================================
-
-SET VS_SLN_SUFFIX=
-IF "%VC_COMPILER_VERSION%" == "10" SET VS_SLN_SUFFIX=_VS2010
-
-rem ==================================================
rem Command Line Option Defaults
rem ==================================================
SET TYPEACTION=build
-SET CPUTYPE=x86
-SET TYPEBUILD=Release
SET CULTURE=en-US
-SET INSTALLER_VERSION_MAJOR_MINOR=2.5
+SET INSTALLER_VERSION_MAJOR_MINOR=2.6
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_NAME=MapGuideOpenSource-%INSTALLER_VERSION_MAJOR_MINOR_REV%-Trunk-%CULTURE%-%TYPEBUILD%-%PLATFORM_CLR%
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)
@@ -64,7 +51,7 @@
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
-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
@@ -96,44 +83,21 @@
SET HTTPD_VERSION=2.2.21
SET PHP_VERSION=5.3.8
SET TOMCAT_VERSION=7.0.23
-SET HTTPD_PACKAGE=httpd-%HTTPD_VERSION%-x86-vc10.zip
-SET TOMCAT_PACKAGE=apache-tomcat-%TOMCAT_VERSION%-windows-x86.zip
-SET PHP_TS_PACKAGE=php-%PHP_VERSION%-x86-vc10.zip
+SET HTTPD_PACKAGE=httpd-%HTTPD_VERSION%-%PLATFORM_CLR%-vc10.zip
+SET TOMCAT_PACKAGE=apache-tomcat-%TOMCAT_VERSION%-windows-%PLATFORM_CLR%.zip
+SET PHP_TS_PACKAGE=php-%PHP_VERSION%-%PLATFORM_CLR%-vc10.zip
-rem ==================================================
-rem MSBuild Settings
-rem ==================================================
-
-rem If the NUMBER_OF_PROCESSORS environment variable is wrong for any reason. Change this value.
-SET CPU_CORES=%NUMBER_OF_PROCESSORS%
-
-rem Uncomment the line below to enable msbuild logging
-rem SET MSBUILD_LOG=/l:FileLogger,Microsoft.Build.Engine;logfile=Build.log;verbosity=diagnostic
-SET MSBUILD_VERBOSITY=/v:n
-
-rem ==================================================
-rem Command aliases
-rem ==================================================
-rem SET XCOPY=xcopy /E /Y /I /F
-SET XCOPY=xcopy /E /Y /I /Q
-SET MSBUILD=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%TYPEBUILD% %MSBUILD_VERBOSITY% %MSBUILD_LOG%
-SET MSBUILD_CLEAN=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%TYPEBUILD% /t:Clean %MSBUILD_VERBOSITY%
-
:study_params
if (%1)==() goto start_build
if "%1"=="-help" goto help_show
if "%1"=="-h" goto help_show
-if "%1"=="-c" goto get_conf
-if "%1"=="-config" goto get_conf
-
if "%1"=="-a" goto get_action
if "%1"=="-action" goto get_action
if "%1"=="-lang" goto get_language
-if "%1"=="-v" goto get_verbose
if "%1"=="-source" goto get_source
if "%1"=="-version" goto get_version
@@ -152,12 +116,6 @@
SET INSTALLER_OUTPUT=%INSTALLER_DEV%\Output\%CULTURE%
goto next_param
-:get_verbose
-SET MSBUILD_VERBOSITY=/v:d
-SET MSBUILD=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%TYPEBUILD% %MSBUILD_VERBOSITY% %MSBUILD_LOG%
-SET MSBUILD_CLEAN=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%TYPEBUILD% /t:Clean %MSBUILD_VERBOSITY%
-goto next_param
-
:get_source
SET MG_SOURCE=%2
SET MG_SOURCE_INC=%MG_SOURCE%
@@ -175,19 +133,6 @@
SET INSTALLER_TITLE=%2
goto next_param
-:get_conf
-SET TYPEBUILD=%2
-REM SET INSTALLER_OUTPUT=%CD%\Installers\MapGuide\bin\%TYPEBUILD%
-SET MSBUILD=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%TYPEBUILD% /p:Platform=Win32 %MSBUILD_VERBOSITY% %MSBUILD_LOG%
-SET MSBUILD_CLEAN=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%TYPEBUILD% /p:Platform=Win32 /t:Clean %MSBUILD_VERBOSITY%
-SET MG_SOURCE=%CD%\..\MgDev\%TYPEBUILD%
-IF NOT ""=="%MG_SOURCE_INC%" SET MG_SOURCE_INC=%MG_SOURCE%
-
-if "%2"=="Release" goto next_param
-if "%2"=="Debug" goto next_param
-SET ERRORMSG=Unrecognised configuration: %2
-goto custom_error
-
:get_action
SET TYPEACTION=%2
if "%2"=="build" goto next_param
@@ -201,7 +146,7 @@
:start_build
echo ===================================================
echo Configuration is [%TYPEBUILD%]
-echo CPU type is: [%CPUTYPE%]
+echo CPU type is: [%PLATFORM_CLR%]
echo Action is [%TYPEACTION%]
echo CPU cores: %CPU_CORES%
echo Installer Output Directory: %INSTALLER_OUTPUT%
@@ -219,9 +164,9 @@
:clean
echo [clean]: Installer Pre-Reqs
-%MSBUILD_CLEAN% InstallerPreReq%VS_SLN_SUFFIX%.sln
+%MSBUILD_CLEAN% InstallerPreReq.sln
echo [clean]: Installer
-%MSBUILD_CLEAN% InstallerWix%VS_SLN_SUFFIX%.sln
+%MSBUILD_CLEAN_CLR% InstallerWix.sln
goto quit
:prepare
@@ -230,42 +175,42 @@
if not exist "%MG_SOURCE%\Web" goto error_mg_web_not_found
if not exist "%MG_SOURCE%\CS-Map" goto error_mg_csmap_not_found
echo [prepare] Installer Pre-Requisites
-%MSBUILD% InstallerPreReq%VS_SLN_SUFFIX%.sln
+%MSBUILD% InstallerPreReq.sln
copy %INSTALLER_FDO_REG_UTIL%\%TYPEBUILD%\FdoRegUtil.exe %MG_SOURCE%\Server\FDO
popd
echo [prepare] Unpack Apache httpd
-pushd "%INSTALLER_DEV_SUPPORT%\Web\%CPUTYPE%"
+pushd "%INSTALLER_DEV_SUPPORT%\Web\%PLATFORM_CLR%"
7z x %HTTPD_PACKAGE% -y -o"%MG_SOURCE%\Web\Apache2"
popd
echo [prepare] Unpack Tomcat
-pushd "%INSTALLER_DEV_SUPPORT%\Web\%CPUTYPE%"
+pushd "%INSTALLER_DEV_SUPPORT%\Web\%PLATFORM_CLR%"
copy /Y mod_jk.so "%MG_SOURCE%\Web\Apache2\modules"
REM we unpack to root because Tomcat is the root dir in the zip file
7z x %TOMCAT_PACKAGE% -y -o"%MG_SOURCE%\Web"
popd
pushd "%MG_SOURCE%\Web"
if exist Tomcat (
-xcopy /S /Y apache-tomcat-7.0.23\*.* Tomcat
-rd /S /Q apache-tomcat-7.0.23
+xcopy /S /Y apache-tomcat-%TOMCAT_VERSION%\*.* Tomcat
+rd /S /Q apache-tomcat-%TOMCAT_VERSION%
) else (
-rename apache-tomcat-7.0.23 Tomcat
+rename apache-tomcat-%TOMCAT_VERSION% Tomcat
)
popd
echo [prepare] Unpack PHP (Thread Safe)
-pushd "%INSTALLER_DEV_SUPPORT%\Web\%CPUTYPE%"
+pushd "%INSTALLER_DEV_SUPPORT%\Web\%PLATFORM_CLR%"
7z x %PHP_TS_PACKAGE% -y -o"%MG_SOURCE%\Web\Php"
popd
rem copy template configs on top
echo [prepare] Tomcat config
-%XCOPY% "%INSTALLER_DEV%\Support\Web\%CPUTYPE%\configs\Tomcat" "%MG_SOURCE%\Web\Tomcat" /EXCLUDE:svn_excludes.txt
+%XCOPY% "%INSTALLER_DEV%\Support\Web\%PLATFORM_CLR%\configs\Tomcat" "%MG_SOURCE%\Web\Tomcat" /EXCLUDE:svn_excludes.txt
echo [prepare] Php config
-%XCOPY% "%INSTALLER_DEV%\Support\Web\%CPUTYPE%\configs\Php" "%MG_SOURCE%\Web\Php" /EXCLUDE:svn_excludes.txt
+%XCOPY% "%INSTALLER_DEV%\Support\Web\%PLATFORM_CLR%\configs\Php" "%MG_SOURCE%\Web\Php" /EXCLUDE:svn_excludes.txt
echo [prepare] Apache2 config
-%XCOPY% "%INSTALLER_DEV%\Support\Web\%CPUTYPE%\configs\Apache2" "%MG_SOURCE%\Web\Apache2" /EXCLUDE:svn_excludes.txt
+%XCOPY% "%INSTALLER_DEV%\Support\Web\%PLATFORM_CLR%\configs\Apache2" "%MG_SOURCE%\Web\Apache2" /EXCLUDE:svn_excludes.txt
echo [prepare] Apache2 mapagent so
-copy /Y "%MG_SOURCE_WEB%\src\mapagent\mod_mgmapagent.so" "%MG_SOURCE%\Web\Apache2\modules"
+copy /Y "%MG_BUILD_MAPAGENT%" "%MG_SOURCE%\Web\Apache2\modules"
echo [prepare] FDO providers.xml
-copy /Y "%INSTALLER_DEV%\Support\Web\%CPUTYPE%\configs\FDO\providers.xml" "%MG_SOURCE%\Server\FDO\"
+copy /Y "%INSTALLER_DEV%\Support\Web\%PLATFORM_CLR%\configs\FDO\providers.xml" "%MG_SOURCE%\Server\FDO\"
goto quit
@@ -273,6 +218,7 @@
echo [regen]: MapGuide Installer
SET PARAFFIN=paraffin.exe -update
+IF "%PLATFORM_CLR%" == "x64" SET PARAFFIN=paraffin.exe -update -Win64
SET WIX_INC_SERVER="%INSTALLER_DEV%\Libraries\MapGuide Server\FileIncludes"
SET WIX_INC_WEB="%INSTALLER_DEV%\Libraries\MapGuide Web Extensions\FileIncludes"
@@ -387,7 +333,8 @@
:generate
echo [generate]: MapGuide Installer
-SET PARAFFIN=paraffin.exe -guids
+SET PARAFFIN=paraffin.exe -guids
+IF "%PLATFORM_CLR%" == "x64" SET PARAFFIN=paraffin.exe -Win64 -guids
SET WIX_INC_SERVER="%INSTALLER_DEV%\Libraries\MapGuide Server\FileIncludes"
SET WIX_INC_WEB="%INSTALLER_DEV%\Libraries\MapGuide Web Extensions\FileIncludes"
@@ -471,15 +418,17 @@
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%;Have_ArcSde=%MG_WITH_ARCSDE%
+SET RUN_BUILD=%MSBUILD_CLR% /p:OutputName=%INSTALLER_NAME%;MgCulture=%CULTURE%;MgTitle=%INSTALLER_TITLE%;MgVersion=%INSTALLER_VERSION%;MgRegKey=%MG_REG_KEY%;MgPlatform=%PLATFORM_CLR%;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
+%RUN_BUILD% InstallerWix.sln
if "%errorlevel%"=="1" goto error
pushd "%INSTALLER_DEV_BOOTSTRAP%"
echo [bootstrap]: Copying vcredist
-copy /Y vcredist_2008_x86.exe "%INSTALLER_OUTPUT%\vcredist_2008_x86.exe"
-copy /Y vcredist_2010_x86.exe "%INSTALLER_OUTPUT%\vcredist_2010_x86.exe"
+copy /Y vcredist_2008_x86.exe "%INSTALLER_OUTPUT%\vcredist_2008_%PLATFORM_CLR%.exe"
+copy /Y vcredist_2010_x86.exe "%INSTALLER_OUTPUT%\vcredist_2010_%PLATFORM_CLR%.exe"
+copy /Y vcredist_2012_x86.exe "%INSTALLER_OUTPUT%\vcredist_2012_%PLATFORM_CLR%.exe"
popd
if "%errorlevel%"=="1" goto error
if "%MAX_COMPRESSION%"=="YES" goto build_max_compress
@@ -531,8 +480,6 @@
:help_show
echo ************************************************************************
echo build.bat [-h]
-echo [-v]
-echo [-c=BuildType]
echo [-a=Action]
echo [-lang=Culture]
echo [-source=SourceDirectory]
@@ -541,8 +488,6 @@
echo [-title=MapGuideInstallerTitle]
echo
echo Help: -h
-echo Verbose: -v
-echo BuildType: Release(default), Debug
echo Action: build(default), clean, regen, prepare, generate (only use generate for creating new GIDs, or if not installing from ..\MgDev\Release)
echo SourceDirectory: The directory that the MapGuide build process installed the source files into
echo MapGuideVersion: The version associated with the installer in the format 2.1.0.0
@@ -551,11 +496,6 @@
echo ************************************************************************
:quit
SET TYPEACTION=
-SET TYPEBUILD=
SET INSTALLER_OUTPUT=
SET INSTALLER_DEV=
-SET MSBUILD_LOG=
-SET MSBUILD_VERBOSITY=
-SET XCOPY=
-SET MSBUILD=
SET PATH=%OLDPATH%
Deleted: trunk/Installer/build64.bat
===================================================================
--- trunk/Installer/build64.bat 2013-08-01 14:55:20 UTC (rev 7710)
+++ trunk/Installer/build64.bat 2013-08-01 16:21:30 UTC (rev 7711)
@@ -1,584 +0,0 @@
- at echo off
-rem MapGuide Installer build script for windows
-rem
-rem Author: Jackie Ng (jumpinjackie at gmail.com)
-rem
-rem This script will build all the MapGuide Installer components, if the output path is specified
-rem it will also copy the installer to the specified output path. Otherwise it will use the default
-rem value of INSTALLER_OUTPUT defined in this file
-rem
-rem Requirements:
-rem 1. Wix 3.5 (http://wix.codeplex.com)
-rem 2. Paraffin (http://www.wintellect.com/CS/blogs/jrobbins/archive/2008/12/22/paraffin-3-0-now-with-full-wix-3-0-support.aspx)
-rem
-rem Usage:
-rem
-rem build.bat [-h]
-rem [-v]
-rem [-c=BuildType]
-rem [-a=Action]
-rem [-lang=Culture]
-rem [-srv=ServerDirectory]
-rem [-source=SourceDirectory]
-rem [-version=MapGuideVersion]
-rem [-name=MapGuideInstallerFilename]
-rem [-title=MapGuideInstallerTitle]
-rem
-rem BuildType: Release(default), Debug, Release64, Debug64
-rem Action: build(default), clean, regen, prepare, generate (only use generate when creating new GIDs)
-rem SourceDirectory: The directory that was used for MapGuide build ouput
-rem MapGuideVersion: The version associated with the installer in the format 2.1.0.0
-rem MapGuideInstallerFilename: File name of output .exe in the format MapGuideOpenSource-2.1.0-Something
-rem MapGuideInstallerTitle: Title to appear in the installer.
-
-rem ==================================================
-rem Top-level vars
-rem ==================================================
-SET OLDPATH=%PATH%
-
-rem ==================================================
-rem Update solution suffix if using VC10 compiler.
-rem NOTE: VS10 solution files are suffixed with _VS2010
-rem which is why we can do it like this
-rem ==================================================
-
-SET VS_SLN_SUFFIX=
-IF "%VC_COMPILER_VERSION%" == "10" SET VS_SLN_SUFFIX=_VS2010
-
-rem ==================================================
-rem Command Line Option Defaults
-rem ==================================================
-
-SET TYPEACTION=build
-SET TYPEBUILD=Release64
-SET CONFIGURATION=Release
-SET PLATFORM=x64
-SET CPUTYPE=x64
-SET CULTURE=en-US
-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 ==================================================
-SET INSTALLER_DEV=%CD%
-SET INSTALLER_OUTPUT=%INSTALLER_DEV%\Output\%CULTURE%
-SET INSTALLER_DEV_SUPPORT=%INSTALLER_DEV%\Support
-SET INSTALLER_DEV_BOOTSTRAP=%INSTALLER_DEV%\Bootstrapper
-
-SET INSTALLER_FDO_REG_UTIL=%INSTALLER_DEV%\FdoRegUtil
-SET INSTALLER_DEV_CSMAP=%INSTALLER_DEV%\Libraries\CS Map
-SET INSTALLER_DEV_FDO=%INSTALLER_DEV%\Libraries\FDO
-SET INSTALLER_DEV_MGSERVER=%INSTALLER_DEV%\Libraries\MapGuide Server
-SET INSTALLER_DEV_MGWEB=%INSTALLER_DEV%\Libraries\MapGuide Web Extensions
-SET INSTALLER_DEV_INSTALLER=%INSTALLER_DEV%\Installers\MapGuide
-
-SET NSIS=%CD%\Support\NSIS
-SET PARAFFIN=%CD%
-SET PATH=%PATH%;%PARAFFIN%;%NSIS%
-
-rem ==================================================
-rem Web dependencies
-rem ==================================================
-SET HTTPD_VERSION=2.2.21
-SET PHP_VERSION=5.3.8
-SET TOMCAT_VERSION=7.0.23
-SET HTTPD_PACKAGE=httpd-%HTTPD_VERSION%-x64-vc10.zip
-SET TOMCAT_PACKAGE=apache-tomcat-%TOMCAT_VERSION%-windows-x64.zip
-SET PHP_TS_PACKAGE=php-%PHP_VERSION%-x64-vc10.zip
-
-rem ==================================================
-rem MSBuild Settings
-rem ==================================================
-
-rem If the NUMBER_OF_PROCESSORS environment variable is wrong for any reason. Change this value.
-SET CPU_CORES=%NUMBER_OF_PROCESSORS%
-
-rem Uncomment the line below to enable msbuild logging
-rem SET MSBUILD_LOG=/l:FileLogger,Microsoft.Build.Engine;logfile=Build.log;verbosity=diagnostic
-SET MSBUILD_VERBOSITY=/v:q
-
-rem ==================================================
-rem Command aliases
-rem ==================================================
-rem SET XCOPY=xcopy /E /Y /I /F
-SET XCOPY=xcopy /E /Y /I /Q
-SET MSBUILD=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%CONFIGURATION% /p:Platform=%PLATFORM% %MSBUILD_VERBOSITY% %MSBUILD_LOG%
-SET MSBUILD_CLEAN=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%CONFIGURATION% /p:Platform=%PLATFORM% /t:Clean %MSBUILD_VERBOSITY%
-
-:study_params
-if (%1)==() goto start_build
-
-if "%1"=="-help" goto help_show
-if "%1"=="-h" goto help_show
-
-if "%1"=="-c" goto get_conf
-if "%1"=="-config" goto get_conf
-
-if "%1"=="-a" goto get_action
-if "%1"=="-action" goto get_action
-
-if "%1"=="-lang" goto get_language
-
-if "%1"=="-v" goto get_verbose
-if "%1"=="-source" goto get_source
-
-if "%1"=="-version" goto get_version
-if "%1"=="-name" goto get_name
-if "%1"=="-title" goto get_title
-
-goto custom_error
-
-:next_param
-shift
-shift
-goto study_params
-
-:get_language
-SET CULTURE=%2
-SET INSTALLER_OUTPUT=%INSTALLER_DEV%\Output\%CULTURE%
-goto next_param
-
-:get_verbose
-SET MSBUILD_VERBOSITY=/v:d
-SET MSBUILD=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%CONFIGURATION% /p:Platform=%PLATFORM% %MSBUILD_VERBOSITY% %MSBUILD_LOG%
-SET MSBUILD_CLEAN=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%CONFIGURATION% /p:Platform=%PLATFORM% /t:Clean %MSBUILD_VERBOSITY%
-goto next_param
-
-:get_source
-SET MG_SOURCE=%2
-SET MG_SOURCE_INC=%MG_SOURCE%
-goto next_param
-
-:get_version
-SET INSTALLER_VERSION=%2
-goto next_param
-
-:get_name
-SET INSTALLER_NAME=%2
-goto next_param
-
-:get_title
-SET INSTALLER_TITLE=%2
-goto next_param
-
-:get_conf
-SET TYPEBUILD=%2
-SET CONFIGURATION=invalid
-SET PLATFORM=invalid
-
-IF "%2"=="Release" (
-SET CONFIGURATION=Release
-SET PLATFORM=Win32
-)
-
-IF "%2"=="Release64" (
-SET CONFIGURATION=Release
-SET PLATFORM=x64
-)
-
-if "%2"=="Debug" (
-SET CONFIGURATION=Debug
-SET PLATFORM=Win32
-)
-
-if "%2"=="Debug64" (
-SET CONFIGURATION=Debug
-SET PLATFORM=x64
-)
-if "%2"=="Debug" goto next_param
-SET INSTALLER_OUTPUT=%CD%\Installers\MapGuide\bin\%TYPEBUILD%
-SET MSBUILD=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%CONFIGURATION% /p:Platform=%PLATFORM% %MSBUILD_VERBOSITY% %MSBUILD_LOG%
-SET MSBUILD_CLEAN=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%CONFIGURATION% /p:Platform=%PLATFORM% /t:Clean %MSBUILD_VERBOSITY%
-SET MG_SOURCE=%CD%\..\MgDev\%TYPEBUILD%
-IF NOT ""=="%MG_SOURCE_INC%" SET MG_SOURCE_INC=%MG_SOURCE%
-
-if NOT %CONFIGURATION%=="invalid" goto next_param
-SET ERRORMSG=Unrecognised configuration: %2
-goto custom_error
-
-:get_action
-SET TYPEACTION=%2
-if "%2"=="build" goto next_param
-if "%2"=="clean" goto next_param
-if "%2"=="regen" goto next_param
-if "%2"=="generate" goto next_param
-if "%2"=="prepare" goto next_param
-SET ERRORMSG=Unrecognised action: %2
-goto custom_error
-
-:start_build
-echo ===================================================
-echo Configuration is [%TYPEBUILD%]
-echo CPU type is: [%PLATFORM%]
-echo Action is [%TYPEACTION%]
-echo CPU cores: %CPU_CORES%
-echo Installer Output Directory: %INSTALLER_OUTPUT%
-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
-if "%TYPEACTION%"=="prepare" goto prepare
-if "%TYPEACTION%"=="clean" goto clean
-if "%TYPEACTION%"=="generate" goto generate
-if "%TYPEACTION%"=="regen" goto regen
-
-:clean
-echo [clean]: Installer Pre-Reqs
-%MSBUILD_CLEAN% InstallerPreReq%VS_SLN_SUFFIX%.sln
-echo [clean]: Installer
-%MSBUILD_CLEAN% InstallerWix%VS_SLN_SUFFIX%.sln
-goto quit
-
-:prepare
-echo [prepare] MapGuide Installer
-if not exist "%MG_SOURCE%\Server" goto error_mg_server_not_found
-if not exist "%MG_SOURCE%\Web" goto error_mg_web_not_found
-if not exist "%MG_SOURCE%\CS-Map" goto error_mg_csmap_not_found
-echo [prepare] Installer Pre-Requisites
-%MSBUILD% InstallerPreReq%VS_SLN_SUFFIX%.sln
-REM Uncomment line below (and comment line above) if you are building 64-bit with Visual C++ 2010 express
-REM call build64_vce.bat
-copy %INSTALLER_FDO_REG_UTIL%\%TYPEBUILD%\FdoRegUtil.exe %MG_SOURCE%\Server\FDO
-popd
-echo [prepare] Unpack Apache httpd
-pushd "%INSTALLER_DEV_SUPPORT%\Web\%CPUTYPE%"
-7z x %HTTPD_PACKAGE% -y -o"%MG_SOURCE%\Web\Apache2"
-popd
-echo [prepare] Unpack Tomcat
-pushd "%INSTALLER_DEV_SUPPORT%\Web\%CPUTYPE%"
-copy /Y mod_jk.so "%MG_SOURCE%\Web\Apache2\modules"
-REM we unpack to root because Tomcat is the root dir in the zip file
-7z x %TOMCAT_PACKAGE% -y -o"%MG_SOURCE%\Web"
-popd
-pushd "%MG_SOURCE%\Web"
-if exist Tomcat (
-xcopy /S /Y apache-tomcat-7.0.23\*.* Tomcat
-rd /S /Q apache-tomcat-7.0.23
-) else (
-rename apache-tomcat-7.0.23 Tomcat
-)
-popd
-echo [prepare] Unpack PHP (Thread Safe)
-pushd "%INSTALLER_DEV_SUPPORT%\Web\%CPUTYPE%"
-7z x %PHP_TS_PACKAGE% -y -o"%MG_SOURCE%\Web\Php"
-popd
-rem copy template configs on top
-echo [prepare] Tomcat config
-%XCOPY% "%INSTALLER_DEV%\Support\Web\%PLATFORM%\configs\Tomcat" "%MG_SOURCE%\Web\Tomcat" /EXCLUDE:svn_excludes.txt
-echo [prepare] Php config
-%XCOPY% "%INSTALLER_DEV%\Support\Web\%PLATFORM%\configs\Php" "%MG_SOURCE%\Web\Php" /EXCLUDE:svn_excludes.txt
-echo [prepare] Apache2 config
-%XCOPY% "%INSTALLER_DEV%\Support\Web\%PLATFORM%\configs\Apache2" "%MG_SOURCE%\Web\Apache2" /EXCLUDE:svn_excludes.txt
-echo [prepare] FDO providers.xml
-copy /Y "%INSTALLER_DEV%\Support\Web\%PLATFORM%\configs\FDO\providers.xml" "%MG_SOURCE%\Server\FDO\"
-
-goto quit
-
-:regen
-echo [regen]: MapGuide Installer
-
-SET PARAFFIN=paraffin.exe -update -Win64
-
-SET WIX_INC_SERVER="%INSTALLER_DEV%\Libraries\MapGuide Server\FileIncludes"
-SET WIX_INC_WEB="%INSTALLER_DEV%\Libraries\MapGuide Web Extensions\FileIncludes"
-SET WIX_INC_CSMAP="%INSTALLER_DEV%\Libraries\CS Map\FileIncludes"
-
-echo [regen]: Server - binaries
-%PARAFFIN% %WIX_INC_SERVER%\incBinFiles.wxs
-move /Y %WIX_INC_SERVER%\incBinFiles.PARAFFIN %WIX_INC_SERVER%\incBinFiles.wxs
-
-echo [regen]: Server - RepositoryAdmin
-%PARAFFIN% %WIX_INC_SERVER%\incRepositoryAdminFiles.wxs
-move /Y %WIX_INC_SERVER%\incRepositoryAdminFiles.PARAFFIN %WIX_INC_SERVER%\incRepositoryAdminFiles.wxs
-
-echo [regen]: Server - resources
-%PARAFFIN% %WIX_INC_SERVER%\incResourcesFiles.wxs
-move /Y %WIX_INC_SERVER%\incResourcesFiles.PARAFFIN %WIX_INC_SERVER%\incResourcesFiles.wxs
-
-echo [regen]: Server - schema
-%PARAFFIN% %WIX_INC_SERVER%\incSchemaFiles.wxs
-move /Y %WIX_INC_SERVER%\incSchemaFiles.PARAFFIN %WIX_INC_SERVER%\incSchemaFiles.wxs
-
-echo [regen]: Server - WMS
-%PARAFFIN% %WIX_INC_SERVER%\incWmsFiles.wxs
-move /Y %WIX_INC_SERVER%\incWmsFiles.PARAFFIN %WIX_INC_SERVER%\incWmsFiles.wxs
-
-echo [regen]: Server - WFS
-%PARAFFIN% %WIX_INC_SERVER%\incWfsFiles.wxs
-move /Y %WIX_INC_SERVER%\incWfsFiles.PARAFFIN %WIX_INC_SERVER%\incWfsFiles.wxs
-
-echo [regen]: CS-Map - dictionaries
-%PARAFFIN% %WIX_INC_CSMAP%\incCSMapDictionaryFiles.wxs
-move /Y %WIX_INC_CSMAP%\incCSMapDictionaryFiles.PARAFFIN %WIX_INC_CSMAP%\incCSMapDictionaryFiles.wxs
-
-echo [regen]: Web - Apache
-%PARAFFIN% %WIX_INC_WEB%\incApacheFiles.wxs
-move /Y %WIX_INC_WEB%\incApacheFiles.PARAFFIN %WIX_INC_WEB%\incApacheFiles.wxs
-
-echo [regen]: Web - Php
-%PARAFFIN% %WIX_INC_WEB%\incPhpFiles.wxs
-move /Y %WIX_INC_WEB%\incPhpFiles.PARAFFIN %WIX_INC_WEB%\incPhpFiles.wxs
-
-echo [regen]: Web - Tomcat
-%PARAFFIN% %WIX_INC_WEB%\incTomcatFiles.wxs
-move /Y %WIX_INC_WEB%\incTomcatFiles.PARAFFIN %WIX_INC_WEB%\incTomcatFiles.wxs
-
-echo [regen]: Web - Help
-%PARAFFIN% %WIX_INC_WEB%\incHelpFiles.wxs
-move /Y %WIX_INC_WEB%\incHelpFiles.PARAFFIN %WIX_INC_WEB%\incHelpFiles.wxs
-
-echo [regen]: Web - devguide PHP
-%PARAFFIN% %WIX_INC_WEB%\incPhpDevGuideFiles.wxs
-move /Y %WIX_INC_WEB%\incPhpDevGuideFiles.PARAFFIN %WIX_INC_WEB%\incPhpDevGuideFiles.wxs
-
-echo [regen]: Web - devguide Java
-%PARAFFIN% %WIX_INC_WEB%\incJavaDevGuideFiles.wxs
-move /Y %WIX_INC_WEB%\incJavaDevGuideFiles.PARAFFIN %WIX_INC_WEB%\incJavaDevGuideFiles.wxs
-
-echo [regen]: Web - devguide DotNet
-%PARAFFIN% %WIX_INC_WEB%\incDotNetDevGuideFiles.wxs
-move /Y %WIX_INC_WEB%\incDotNetDevGuideFiles.PARAFFIN %WIX_INC_WEB%\incDotNetDevGuideFiles.wxs
-
-echo [regen]: Web - viewer sample PHP
-%PARAFFIN% %WIX_INC_WEB%\incPhpViewerSampleFiles.wxs
-move /Y %WIX_INC_WEB%\incPhpViewerSampleFiles.PARAFFIN %WIX_INC_WEB%\incPhpViewerSampleFiles.wxs
-
-echo [regen]: Web - viewer sample Java
-%PARAFFIN% %WIX_INC_WEB%\incJavaViewerSampleFiles.wxs
-move /Y %WIX_INC_WEB%\incJavaViewerSampleFiles.PARAFFIN %WIX_INC_WEB%\incJavaViewerSampleFiles.wxs
-
-echo [regen]: Web - viewer sample DotNet
-%PARAFFIN% %WIX_INC_WEB%\incDotNetViewerSampleFiles.wxs
-move /Y %WIX_INC_WEB%\incDotNetViewerSampleFiles.PARAFFIN %WIX_INC_WEB%\incDotNetViewerSampleFiles.wxs
-
-echo [regen]: Web - mapagent
-%PARAFFIN% %WIX_INC_WEB%\incMapAgentFiles.wxs
-move /Y %WIX_INC_WEB%\incMapAgentFiles.PARAFFIN %WIX_INC_WEB%\incMapAgentFiles.wxs
-
-echo [regen]: Web - mapviewernet
-%PARAFFIN% %WIX_INC_WEB%\incMapViewerAspxFiles.wxs
-move /Y %WIX_INC_WEB%\incMapViewerAspxFiles.PARAFFIN %WIX_INC_WEB%\incMapViewerAspxFiles.wxs
-
-echo [regen]: Web - mapviewerphp
-%PARAFFIN% %WIX_INC_WEB%\incMapViewerPhpFiles.wxs
-move /Y %WIX_INC_WEB%\incMapViewerPhpFiles.PARAFFIN %WIX_INC_WEB%\incMapViewerPhpFiles.wxs
-
-echo [regen]: Web - mapviewerjava
-%PARAFFIN% %WIX_INC_WEB%\incMapViewerJspFiles.wxs
-move /Y %WIX_INC_WEB%\incMapViewerJspFiles.PARAFFIN %WIX_INC_WEB%\incMapViewerJspFiles.wxs
-
-echo [regen]: Web - fusion
-%PARAFFIN% %WIX_INC_WEB%\incFusionFiles.wxs
-move /Y %WIX_INC_WEB%\incFusionFiles.PARAFFIN %WIX_INC_WEB%\incFusionFiles.wxs
-
-echo [regen]: Web - misc web root
-%PARAFFIN% %WIX_INC_WEB%\incWebRootFiles.wxs
-move /Y %WIX_INC_WEB%\incWebRootFiles.PARAFFIN %WIX_INC_WEB%\incWebRootFiles.wxs
-%PARAFFIN% %WIX_INC_WEB%\incMapViewerFiles.wxs
-move /Y %WIX_INC_WEB%\incMapViewerFiles.PARAFFIN %WIX_INC_WEB%\incMapViewerFiles.wxs
-%PARAFFIN% %WIX_INC_WEB%\incMapViewerStdiconFiles.wxs
-move /Y %WIX_INC_WEB%\incMapViewerStdiconFiles.PARAFFIN %WIX_INC_WEB%\incMapViewerStdiconFiles.wxs
-%PARAFFIN% %WIX_INC_WEB%\incMapViewerSchemareportFiles.wxs
-move /Y %WIX_INC_WEB%\incMapViewerSchemareportFiles.PARAFFIN %WIX_INC_WEB%\incMapViewerSchemareportFiles.wxs
-%PARAFFIN% %WIX_INC_WEB%\incMapViewerMapAdminFiles.wxs
-move /Y %WIX_INC_WEB%\incMapViewerMapAdminFiles.PARAFFIN %WIX_INC_WEB%\incMapViewerMapAdminFiles.wxs
-%PARAFFIN% %WIX_INC_WEB%\incMapViewerLocalizedFiles.wxs
-move /Y %WIX_INC_WEB%\incMapViewerLocalizedFiles.PARAFFIN %WIX_INC_WEB%\incMapViewerLocalizedFiles.wxs
-%PARAFFIN% %WIX_INC_WEB%\incWebInfFiles.wxs
-move /Y %WIX_INC_WEB%\incWebInfFiles.PARAFFIN %WIX_INC_WEB%\incWebInfFiles.wxs
-
-goto quit
-
-:generate
-echo [generate]: MapGuide Installer
-
-SET PARAFFIN=paraffin.exe -Win64 -guids
-
-SET WIX_INC_SERVER="%INSTALLER_DEV%\Libraries\MapGuide Server\FileIncludes"
-SET WIX_INC_WEB="%INSTALLER_DEV%\Libraries\MapGuide Web Extensions\FileIncludes"
-SET WIX_INC_CSMAP="%INSTALLER_DEV%\Libraries\CS Map\FileIncludes"
-
-echo [generate]: Server - binaries
-%PARAFFIN% -dir %MG_SOURCE%\Server\bin -alias $(var.MgSource)\Server\bin -custom SRVBINFILES -dirref SERVERROOTLOCATION -norecurse %WIX_INC_SERVER%\incBinFiles.wxs
-
-echo [generate]: Server - RepositoryAdmin
-%PARAFFIN% -dir %MG_SOURCE%\Server\RepositoryAdmin -alias $(var.MgSource)\Server\RepositoryAdmin -custom SRVREPADMINFILES -dirref SERVERROOTLOCATION %WIX_INC_SERVER%\incRepositoryAdminFiles.wxs
-
-echo [generate]: Server - resources
-%PARAFFIN% -dir %MG_SOURCE%\Server\Resources -alias $(var.MgSource)\Server\Resources -custom SRVRESOURCESFILES -dirref SERVERROOTLOCATION %WIX_INC_SERVER%\incResourcesFiles.wxs
-
-echo [generate]: Server - schema
-%PARAFFIN% -dir %MG_SOURCE%\Server\Schema -alias $(var.MgSource)\Server\Schema -custom SRVSCHEMAFILES -dirref SERVERROOTLOCATION %WIX_INC_SERVER%\incSchemaFiles.wxs
-
-echo [generate]: Server - WMS
-%PARAFFIN% -dir %MG_SOURCE%\Server\wms -alias $(var.MgSource)\Server\wms -custom SRVWMSFILES -dirref SERVERROOTLOCATION -norecurse %WIX_INC_SERVER%\incWmsFiles.wxs
-
-echo [generate]: Server - WFS
-%PARAFFIN% -dir %MG_SOURCE%\Server\wfs -alias $(var.MgSource)\Server\wfs -custom SRVWFSFILES -dirref SERVERROOTLOCATION -norecurse %WIX_INC_SERVER%\incWfsFiles.wxs
-
-echo [generate]: CS-Map - dictionaries
-%PARAFFIN% -dir %MG_SOURCE%\CS-Map\Dictionaries -alias $(var.MgSource)\CS-Map\Dictionaries -custom CSMAPDICTFILES -dirref CSMAPLOCATION -ext ASC -ext C -ext CNT -ext GID -ext HLP -ext MAK -ext NMK -ext VCPROJ -ext USER %WIX_INC_CSMAP%\incCSMapDictionaryFiles.wxs
-
-echo [generate]: Web - Apache
-%PARAFFIN% -dir %MG_SOURCE%\Web\Apache2 -alias $(var.MgSource)\Web\Apache2 -custom APACHEFILES -dirref WEBEXTENSIONSLOCATION %WIX_INC_WEB%\incApacheFiles.wxs
-
-echo [generate]: Web - Php
-%PARAFFIN% -dir %MG_SOURCE%\Web\Php -alias $(var.MgSource)\Web\Php -custom PHPFILES -dirref WEBEXTENSIONSLOCATION %WIX_INC_WEB%\incPhpFiles.wxs
-
-echo [generate]: Web - Tomcat
-%PARAFFIN% -dir %MG_SOURCE%\Web\Tomcat -alias $(var.MgSource)\Web\Tomcat -custom TOMCATFILES -dirref WEBEXTENSIONSLOCATION %WIX_INC_WEB%\incTomcatFiles.wxs
-
-echo [generate]: Web - Help
-%PARAFFIN% -dir %MG_SOURCE%\Web\www\help -alias $(var.MgSource)\Web\www\help -custom HELPFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incHelpFiles.wxs
-
-echo [generate]: Web - Developer's Guide Samples (PHP)
-%PARAFFIN% -dir %MG_SOURCE%\Web\www\phpsamples -alias $(var.MgSource)\Web\www\phpsamples -custom PHPDEVGUIDEFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incPhpDevGuideFiles.wxs
-
-echo [generate]: Web - Developer's Guide Samples (Java)
-%PARAFFIN% -dir %MG_SOURCE%\Web\www\javasamples -alias $(var.MgSource)\Web\www\javasamples -custom JAVADEVGUIDEFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incJavaDevGuideFiles.wxs
-
-echo [generate]: Web - Developer's Guide Samples (DotNet)
-%PARAFFIN% -dir %MG_SOURCE%\Web\www\dotnetsamples -alias $(var.MgSource)\Web\www\dotnetsamples -custom DOTNETDEVGUIDEFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incDotNetDevGuideFiles.wxs
-
-echo [generate]: Web - Developer's Guide Samples (PHP)
-%PARAFFIN% -dir %MG_SOURCE%\Web\www\phpviewersample -alias $(var.MgSource)\Web\www\phpviewersample -custom PHPVIEWERSAMPLEFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incPhpViewerSampleFiles.wxs
-
-echo [generate]: Web - Developer's Guide Samples (Java)
-%PARAFFIN% -dir %MG_SOURCE%\Web\www\javaviewersample -alias $(var.MgSource)\Web\www\javaviewersample -custom JAVAVIEWERSAMPLEFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incJavaViewerSampleFiles.wxs
-
-echo [generate]: Web - Developer's Guide Samples (DotNet)
-%PARAFFIN% -dir %MG_SOURCE%\Web\www\dotnetviewersample -alias $(var.MgSource)\Web\www\dotnetviewersample -custom DOTNETVIEWERSAMPLEFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incDotNetViewerSampleFiles.wxs
-
-echo [generate]: Web - mapagent
-%PARAFFIN% -dir %MG_SOURCE%\Web\www\mapagent -alias $(var.MgSource)\Web\www\mapagent -custom MAPAGENTFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incMapAgentFiles.wxs
-
-echo [generate]: Web - mapviewernet
-%PARAFFIN% -dir %MG_SOURCE%\Web\www\mapviewernet -alias $(var.MgSource)\Web\www\mapviewernet -custom MAPVIEWERASPXFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incMapViewerAspxFiles.wxs
-
-echo [generate]: Web - mapviewerphp
-%PARAFFIN% -dir %MG_SOURCE%\Web\www\mapviewerphp -alias $(var.MgSource)\Web\www\mapviewerphp -custom MAPVIEWERPHPFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incMapViewerPhpFiles.wxs
-
-echo [generate]: Web - mapviewerjava
-%PARAFFIN% -dir %MG_SOURCE%\Web\www\mapviewerjava -alias $(var.MgSource)\Web\www\mapviewerjava -custom MAPVIEWERJSPFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incMapViewerJspFiles.wxs
-
-echo [generate]: Web - fusion
-%PARAFFIN% -dir %MG_SOURCE%\Web\www\fusion -alias $(var.MgSource)\Web\www\fusion -custom FUSIONFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incFusionFiles.wxs
-
-echo [generate]: Web - misc web root
-%PARAFFIN% -dir %MG_SOURCE%\Web\www -alias $(var.MgSource)\Web\www -custom WEBROOTFILES -dirref WEBEXTENSIONSLOCATION -norecurse %WIX_INC_WEB%\incWebRootFiles.wxs
-%PARAFFIN% -dir %MG_SOURCE%\Web\www\viewerfiles -alias $(var.MgSource)\Web\www\viewerfiles -custom MAPVIEWERFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incMapViewerFiles.wxs
-%PARAFFIN% -dir %MG_SOURCE%\Web\www\stdicons -alias $(var.MgSource)\Web\www\stdicons -custom MAPVIEWERSTDICONFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incMapViewerStdiconFiles.wxs
-%PARAFFIN% -dir %MG_SOURCE%\Web\www\schemareport -alias $(var.MgSource)\Web\www\schemareport -custom MAPVIEWERSCHEMAREPORTFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incMapViewerSchemareportFiles.wxs
-%PARAFFIN% -dir %MG_SOURCE%\Web\www\mapadmin -alias $(var.MgSource)\Web\www\mapadmin -custom MAPVIEWERMAPADMINFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incMapViewerMapAdminFiles.wxs
-%PARAFFIN% -dir %MG_SOURCE%\Web\www\localized -alias $(var.MgSource)\Web\www\localized -custom MAPVIEWERLOCALIZEDFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incMapViewerLocalizedFiles.wxs
-%PARAFFIN% -dir %MG_SOURCE%\Web\www\WEB-INF -alias $(var.MgSource)\Web\www\WEB-INF -custom WEBINFFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incWebInfFiles.wxs
-
-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%;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
-if "%errorlevel%"=="1" goto error
-pushd "%INSTALLER_DEV_BOOTSTRAP%"
-echo [bootstrap]: Copying vcredist
-copy /Y vcredist_2008_x64.exe "%INSTALLER_OUTPUT%\vcredist_2008_x64.exe"
-copy /Y vcredist_2010_x64.exe "%INSTALLER_OUTPUT%\vcredist_2010_x64.exe"
-popd
-if "%errorlevel%"=="1" goto error
-if "%MAX_COMPRESSION%"=="YES" goto build_max_compress
-goto build_min_compress
-
-:build_min_compress
-pushd "%INSTALLER_DEV_BOOTSTRAP%"
-echo [bootstrap]: Create self-extracting package
-makensis /DCPU=x64 /DINSTALLER_ROOT=%INSTALLER_DEV% /DNSISDIR=%NSIS% /DOUTNAME=%INSTALLER_NAME% /DCULTURE=%CULTURE% /DMG_VERSION=%INSTALLER_VERSION% Setup.nsi
-popd
-if "%errorlevel%"=="1" goto error
-echo [build]: Installer created at %INSTALLER_OUTPUT%\%INSTALLER_NAME%.exe
-goto quit
-
-:build_max_compress
-pushd "%INSTALLER_DEV_BOOTSTRAP%"
-echo [bootstrap]: Create self-extracting package (MAX compression)
-makensis /DCPU=x64 /DINSTALLER_ROOT=%INSTALLER_DEV% /DNSISDIR=%NSIS% /DOUTNAME=%INSTALLER_NAME% /DCULTURE=%CULTURE% /DMAXCOMPRESSION /DMG_VERSION=%INSTALLER_VERSION% Setup.nsi
-popd
-if "%errorlevel%"=="1" goto error
-echo [build]: Installer created at %INSTALLER_OUTPUT%\%INSTALLER_NAME%.exe
-goto quit
-
-:error_mg_server_not_found
-echo [ERROR]: Could not find MapGuide Server directory at %MG_SOURCE%\Server
-exit /B 1
-
-:error_mg_web_not_found
-echo [ERROR]: Could not find MapGuide Web Extensions directory at %MG_SOURCE%\Web
-exit /B 1
-
-:error_mg_csmap_not_found
-echo [ERROR]: Could not find CS-Map directory at %MG_SOURCE%\CS-Map
-exit /B 1
-
-:error
-echo [ERROR]: There was an error building the component
-exit /B 1
-
-:custom_error_no_help
-echo [ERROR]: %ERRORMSG%
-SET ERRORMSG=
-exit /B 1
-
-:custom_error
-echo [ERROR]: %ERRORMSG%
-SET ERRORMSG=
-echo Please use the format:
-:help_show
-echo ************************************************************************
-echo build.bat [-h]
-echo [-v]
-echo [-c=BuildType]
-echo [-a=Action]
-echo [-lang=Culture]
-echo [-source=SourceDirectory]
-echo [-version=MapGuideVersion]
-echo [-name=MapGuideInstallerFilename]
-echo [-title=MapGuideInstallerTitle]
-echo
-echo Help: -h
-echo Verbose: -v
-echo BuildType: Release(default), Debug
-echo Action: build(default), clean, regen, prepare, generate (only use generate for creating new GIDs, or if not installing from ..\MgDev\Release)
-echo SourceDirectory: The directory that the MapGuide build process installed the source files into
-echo MapGuideVersion: The version associated with the installer in the format 2.1.0.0
-echo MapGuideInstallerFilename: File name of output .exe in the format MapGuideOpenSource-2.1.0-Something (such as Beta, RC1, Final, etc)
-echo MapGuideInstallerTitle: Title to appear in the installer. Typically this will be set in the language file, but unofficial releases should override this
-echo ************************************************************************
-:quit
-SET TYPEACTION=
-SET TYPEBUILD=
-SET INSTALLER_OUTPUT=
-SET INSTALLER_DEV=
-SET MSBUILD_LOG=
-SET MSBUILD_VERBOSITY=
-SET XCOPY=
-SET MSBUILD=
-SET PATH=%OLDPATH%
Deleted: trunk/Installer/build64_vce.bat
===================================================================
--- trunk/Installer/build64_vce.bat 2013-08-01 14:55:20 UTC (rev 7710)
+++ trunk/Installer/build64_vce.bat 2013-08-01 16:21:30 UTC (rev 7711)
@@ -1,3 +0,0 @@
-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
More information about the mapguide-commits
mailing list