[mapguide-commits] r6483 - in trunk/Installer: . Bootstrapper
Custom/apache_actions Custom/iis_actions FdoRegUtil
Libraries/MapGuide Server Libraries/MapGuide Web Extensions
Support/Web/x64 Support/Web/x86
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Mon Feb 6 11:43:40 EST 2012
Author: jng
Date: 2012-02-06 08:43:40 -0800 (Mon, 06 Feb 2012)
New Revision: 6483
Added:
trunk/Installer/Bootstrapper/vcredist_2008_x64.exe
trunk/Installer/Bootstrapper/vcredist_2008_x86.exe
trunk/Installer/Bootstrapper/vcredist_2010_x64.exe
trunk/Installer/Bootstrapper/vcredist_2010_x86.exe
trunk/Installer/Custom/apache_actions/apache_actions.vcxproj
trunk/Installer/Custom/apache_actions/apache_actions.vcxproj.filters
trunk/Installer/Custom/iis_actions/iis_actions.vcxproj
trunk/Installer/Custom/iis_actions/iis_actions.vcxproj.filters
trunk/Installer/FdoRegUtil/FdoRegUtil.vcxproj
trunk/Installer/FdoRegUtil/FdoRegUtil.vcxproj.filters
trunk/Installer/InstallerPreReq_VS2010.sln
trunk/Installer/InstallerWix_VS2010.sln
trunk/Installer/Support/Web/x64/httpd-2.2.21-x64-vc10.zip
trunk/Installer/Support/Web/x64/php-5.3.8-x64-vc10.zip
trunk/Installer/Support/Web/x86/httpd-2.2.21-x86-vc10.zip
trunk/Installer/Support/Web/x86/php-5.3.8-x86-vc10.zip
Removed:
trunk/Installer/Bootstrapper/vcredist_x64.exe
trunk/Installer/Bootstrapper/vcredist_x86.exe
trunk/Installer/Support/Web/x64/httpd-2.2.21-win64.zip
trunk/Installer/Support/Web/x64/php-5.3.8-Win32-VC9-x64.zip
trunk/Installer/Support/Web/x64/php-5.3.8-nts-Win32-VC9-x64.zip
trunk/Installer/Support/Web/x86/httpd-2.2.21-win32-x86-ssl.zip
trunk/Installer/Support/Web/x86/php-5.3.8-Win32-VC9-x86.zip
trunk/Installer/Support/Web/x86/php-5.3.8-nts-Win32-VC9-x86.zip
Modified:
trunk/Installer/Bootstrapper/Setup.nsi
trunk/Installer/Libraries/MapGuide Server/FDO.wxs
trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs
trunk/Installer/build.bat
trunk/Installer/build64.bat
Log:
#1805: Migrate Installer solutions to VS2010. Remove the existing apache/php binaries. Replace them with a custom built apache/php binaries. Update file offsets to cover our custom apache/php builds.
Also update the NSIS bootstrapper to install the VC 2010 redistributable. We still install the VC 2008 one as a safety net.
More information about the custom apache/php below:
- Apache (x86/x64)
- Built from source with VS2010 SP1
- PHP
- x64: Binaries originated from (http://www.erazergermany.de/HOME/httPHPdSSL-Win64-2011-09-13.zip). The httpd binaries in this zip have been replaced with our own built binaries.
- x86: Binaries are from Oem\php\Release_TS with the following additional binaries:
- ICU 4.8.1.0 (official VC10 x86/x64 release binaries)
- icudt48.dll
- icuin48.dll
- icuio48.dll
- icule48.dll
- iculx48.dll
- icutu48.dll
- icuuc48.dll
- OpenSSL 1.0.0e (VC10 x86/x64. Built from source)
- libeay32.dll
- ssleay32.dll
- Dlls from official PHP 5.3.8 distribution (VC9, x86, thread-safe)
- libenchant.dll
- libenchant_ispell.dll
- libenchant_myspell.dll
- libpq.dll
- libsasl.dll
- glib-2.dll
- gmodule-2.dll
Modified: trunk/Installer/Bootstrapper/Setup.nsi
===================================================================
--- trunk/Installer/Bootstrapper/Setup.nsi 2012-02-03 06:46:04 UTC (rev 6482)
+++ trunk/Installer/Bootstrapper/Setup.nsi 2012-02-06 16:43:40 UTC (rev 6483)
@@ -41,35 +41,70 @@
Push $R0
ClearErrors
;
+; NOTE: We're keeping the VC2008 redist check here as some PHP extensions are built against MSVCR90
+;
+CheckVC2008Install:
+;
; http://social.msdn.microsoft.com/Forums/en-US/vcgeneral/thread/639e2cfd-bb61-425b-a087-a2442df23402
;
!if ${CPU} = "x64"
SetRegView 64
ReadRegDword $R0 HKLM "SOFTWARE\Microsoft\DevDiv\VC\Servicing\9.0\RED\1033" "SP"
- IfErrors InstallVSRedist BeginInstall
+ IfErrors InstallVC2008Redist CheckVC2010Install
!else
SetRegView 32
; Reg key for 32-bit OS
ReadRegDword $R0 HKLM "SOFTWARE\Microsoft\DevDiv\VC\Servicing\9.0\RED\1033" "SP"
- IfErrors CheckWow32Registry BeginInstall
+ IfErrors CheckVS2008Wow32Registry CheckVC2010Install
-CheckWow32Registry:
+CheckVS2008Wow32Registry:
SetRegView 64
; Reg key for 64-bit OS (WoW32)
ReadRegDword $R0 HKLM "SOFTWARE\Microsoft\DevDiv\VC\Servicing\9.0\RED\1033" "SP"
- IfErrors InstallVSRedist BeginInstall
+ IfErrors InstallVC2008Redist CheckVC2010Install
!endif
-InstallVSRedist:
- MessageBox MB_OK "Installing VS redist"
+InstallVC2008Redist:
+ MessageBox MB_OK "Installing Visual C++ 2008 redist"
!if ${CPU} = "x64"
- File /r "${INSTALLER_OUTPUT}\vcredist_x64.exe"
- ExecWait '"$OUTDIR\vcredist_x64.exe" /q:a"'
+ File /r "${INSTALLER_OUTPUT}\vcredist_2008_x64.exe"
+ ExecWait '"$OUTDIR\vcredist_2008_x64.exe" /q:a"'
!else
- File /r "${INSTALLER_OUTPUT}\vcredist_x86.exe"
- ExecWait '"$OUTDIR\vcredist_x86.exe" /q:a'
+ File /r "${INSTALLER_OUTPUT}\vcredist_2008_x86.exe"
+ ExecWait '"$OUTDIR\vcredist_2008_x86.exe" /q:a'
!endif
+CheckVC2010Install:
+;
+; http://blogs.msdn.com/b/astebner/archive/2010/05/05/10008146.aspx
+;
+!if ${CPU} = "x64"
+ SetRegView 64
+ ReadRegDword $R0 HKLM "SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x64" "Installed"
+ IfErrors InstallVC2010Redist BeginInstall
+!else
+ SetRegView 32
+ ; Reg key for 32-bit OS
+ ReadRegDword $R0 HKLM "SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86" "Installed"
+ IfErrors CheckVS2010Wow32Registry BeginInstall
+
+CheckVS2010Wow32Registry:
+ SetRegView 64
+ ; Reg key for 64-bit OS (WoW32)
+ ReadRegDword $R0 HKLM "SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86" "Installed"
+ IfErrors InstallVC2010Redist BeginInstall
+!endif
+
+InstallVC2010Redist:
+ MessageBox MB_OK "Installing Visual C++ 2010 redist"
+!if ${CPU} = "x64"
+ File /r "${INSTALLER_OUTPUT}\vcredist_2010_x64.exe"
+ ExecWait '"$OUTDIR\vcredist_2010_x64.exe" /passive /norestart'
+!else
+ File /r "${INSTALLER_OUTPUT}\vcredist_2010_x86.exe"
+ ExecWait '"$OUTDIR\vcredist_2010_x86.exe" /passive /norestart'
+!endif
+
BeginInstall:
Banner::show /NOUNLOAD "Extracting files. Please Wait"
Banner::getWindow /NOUNLOAD
@@ -80,9 +115,11 @@
; Delete the MGOS installer and any other extracted after completion
Delete "$OUTDIR\${OUTNAME}.msi"
!if ${CPU} = "x64"
- Delete "$OUTDIR\vcredist_x64.exe"
+ Delete "$OUTDIR\vcredist_2008_x64.exe"
+ Delete "$OUTDIR\vcredist_2010_x64.exe"
!else
- Delete "$OUTDIR\vcredist_x86.exe"
+ Delete "$OUTDIR\vcredist_2008_x86.exe"
+ Delete "$OUTDIR\vcredist_2010_x86.exe"
!endif
SectionEnd
\ No newline at end of file
Copied: trunk/Installer/Bootstrapper/vcredist_2008_x64.exe (from rev 6417, trunk/Installer/Bootstrapper/vcredist_x64.exe)
===================================================================
(Binary files differ)
Copied: trunk/Installer/Bootstrapper/vcredist_2008_x86.exe (from rev 6417, trunk/Installer/Bootstrapper/vcredist_x86.exe)
===================================================================
(Binary files differ)
Added: trunk/Installer/Bootstrapper/vcredist_2010_x64.exe
===================================================================
(Binary files differ)
Property changes on: trunk/Installer/Bootstrapper/vcredist_2010_x64.exe
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/Installer/Bootstrapper/vcredist_2010_x86.exe
===================================================================
(Binary files differ)
Property changes on: trunk/Installer/Bootstrapper/vcredist_2010_x86.exe
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/Installer/Bootstrapper/vcredist_x64.exe
===================================================================
(Binary files differ)
Deleted: trunk/Installer/Bootstrapper/vcredist_x86.exe
===================================================================
(Binary files differ)
Added: trunk/Installer/Custom/apache_actions/apache_actions.vcxproj
===================================================================
--- trunk/Installer/Custom/apache_actions/apache_actions.vcxproj (rev 0)
+++ trunk/Installer/Custom/apache_actions/apache_actions.vcxproj 2012-02-06 16:43:40 UTC (rev 6483)
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{03FD713E-15EB-453E-AFDF-21F8DB45C11E}</ProjectGuid>
+ <RootNamespace>apache_actions</RootNamespace>
+ <Keyword>MFCProj</Keyword>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|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|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>
+ <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>
+ <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)'=='Debug|Win32'">true</LinkIncremental>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <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/apache_actions.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
+ <ObjectFileName>.\Release/</ObjectFileName>
+ <ProgramDataBaseFileName>.\Release/</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>.\apache_actions.def</ModuleDefinitionFile>
+ <ProgramDatabaseFile>.\../bin/apache_actions.pdb</ProgramDatabaseFile>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <ImportLibrary>.\../bin/apache_actions.lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\../bin/apache_actions.bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\Debug/apache_actions.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;APACHE_ACTIONS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <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>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;msi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>.\Debug/apache_actions.dll</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>.\apache_actions.def</ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>.\Debug/apache_actions.pdb</ProgramDatabaseFile>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <ImportLibrary>.\Debug/apache_actions.lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </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)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="StdAfx.cpp">
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="apache_actions.def" />
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="resources.rc" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="apache_actions.h" />
+ <ClInclude Include="resource.h" />
+ <ClInclude Include="StdAfx.h" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
Added: trunk/Installer/Custom/apache_actions/apache_actions.vcxproj.filters
===================================================================
--- trunk/Installer/Custom/apache_actions/apache_actions.vcxproj.filters (rev 0)
+++ trunk/Installer/Custom/apache_actions/apache_actions.vcxproj.filters 2012-02-06 16:43:40 UTC (rev 6483)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{2e5cb2e8-249b-4d6a-9320-dc1fde9c37fb}</UniqueIdentifier>
+ <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{83185448-0c0d-4716-a297-86bf4e72f905}</UniqueIdentifier>
+ <Extensions>h;hpp;hxx;hm;inl</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{66ec12ce-67eb-483b-94df-f81615eca6c6}</UniqueIdentifier>
+ <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="apache_actions.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="StdAfx.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="apache_actions.def">
+ <Filter>Source Files</Filter>
+ </None>
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="resources.rc">
+ <Filter>Source Files</Filter>
+ </ResourceCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="apache_actions.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="resource.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="StdAfx.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+</Project>
\ No newline at end of file
Added: trunk/Installer/Custom/iis_actions/iis_actions.vcxproj
===================================================================
--- trunk/Installer/Custom/iis_actions/iis_actions.vcxproj (rev 0)
+++ trunk/Installer/Custom/iis_actions/iis_actions.vcxproj 2012-02-06 16:43:40 UTC (rev 6483)
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{13697B62-C1CD-47EF-9D9B-39F5B01693BB}</ProjectGuid>
+ <RootNamespace>iis_actions</RootNamespace>
+ <Keyword>Win32Proj</Keyword>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </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" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">bin\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">obj\$(Configuration)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">obj\$(Configuration)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>$(WIX)sdk\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CUSTOMACTIONTEST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>version.lib;msi.lib;dutil_2008.lib;wcautil_2008.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(WIX)sdk\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>CustomAction.def</ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <AdditionalIncludeDirectories>$(WIX)sdk\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CUSTOMACTIONTEST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>version.lib;msi.lib;dutil_2008.lib;wcautil_2008.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(WIX)sdk\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>CustomAction.def</ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="CustomAction.cpp" />
+ <ClCompile Include="stdafx.cpp">
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="CustomAction.def" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="resource.h" />
+ <ClInclude Include="stdafx.h" />
+ <ClInclude Include="targetver.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="resources.rc" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
Added: trunk/Installer/Custom/iis_actions/iis_actions.vcxproj.filters
===================================================================
--- trunk/Installer/Custom/iis_actions/iis_actions.vcxproj.filters (rev 0)
+++ trunk/Installer/Custom/iis_actions/iis_actions.vcxproj.filters 2012-02-06 16:43:40 UTC (rev 6483)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="CustomAction.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="stdafx.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="CustomAction.def">
+ <Filter>Source Files</Filter>
+ </None>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="resource.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="stdafx.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="targetver.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="resources.rc">
+ <Filter>Resource Files</Filter>
+ </ResourceCompile>
+ </ItemGroup>
+</Project>
\ No newline at end of file
Added: trunk/Installer/FdoRegUtil/FdoRegUtil.vcxproj
===================================================================
--- trunk/Installer/FdoRegUtil/FdoRegUtil.vcxproj (rev 0)
+++ trunk/Installer/FdoRegUtil/FdoRegUtil.vcxproj 2012-02-06 16:43:40 UTC (rev 6483)
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <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>{F671A5C4-A796-4CF4-A71F-97B0265B4FBE}</ProjectGuid>
+ <RootNamespace>FdoRegUtil</RootNamespace>
+ <Keyword>Win32Proj</Keyword>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </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" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </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" />
+ </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" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\Debug64\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\Debug64\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\Release64\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\Release64\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\MgDev\Oem\Fdo\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>FDO.lib;FDOCommon.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>..\..\MgDev\Oem\Fdo\Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\MgDev\Oem\Fdo\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>FDO.lib;FDOCommon.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>..\..\MgDev\Oem\Fdo\Lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <AdditionalIncludeDirectories>..\..\MgDev\Oem\Fdo\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>FDO.lib;FDOCommon.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>..\..\MgDev\Oem\Fdo\Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <AdditionalIncludeDirectories>..\..\MgDev\Oem\Fdo\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>FDO.lib;FDOCommon.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>..\..\MgDev\Oem\Fdo\Lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="FdoRegUtil.cpp" />
+ <ClCompile Include="stdafx.cpp">
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="stdafx.h" />
+ <ClInclude Include="targetver.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="ReadMe.txt" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
Added: trunk/Installer/FdoRegUtil/FdoRegUtil.vcxproj.filters
===================================================================
--- trunk/Installer/FdoRegUtil/FdoRegUtil.vcxproj.filters (rev 0)
+++ trunk/Installer/FdoRegUtil/FdoRegUtil.vcxproj.filters 2012-02-06 16:43:40 UTC (rev 6483)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="FdoRegUtil.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="stdafx.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="stdafx.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="targetver.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="ReadMe.txt" />
+ </ItemGroup>
+</Project>
\ No newline at end of file
Added: trunk/Installer/InstallerPreReq_VS2010.sln
===================================================================
--- trunk/Installer/InstallerPreReq_VS2010.sln (rev 0)
+++ trunk/Installer/InstallerPreReq_VS2010.sln 2012-02-06 16:43:40 UTC (rev 6483)
@@ -0,0 +1,45 @@
+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
Added: trunk/Installer/InstallerWix_VS2010.sln
===================================================================
--- trunk/Installer/InstallerWix_VS2010.sln (rev 0)
+++ trunk/Installer/InstallerWix_VS2010.sln 2012-02-06 16:43:40 UTC (rev 6483)
@@ -0,0 +1,37 @@
+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|x86 = Debug|x86
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {01313DB9-2AAF-4791-9B81-69BCE3194531}.Debug|x86.ActiveCfg = Debug|x86
+ {01313DB9-2AAF-4791-9B81-69BCE3194531}.Debug|x86.Build.0 = Debug|x86
+ {01313DB9-2AAF-4791-9B81-69BCE3194531}.Release|x86.ActiveCfg = Release|x86
+ {01313DB9-2AAF-4791-9B81-69BCE3194531}.Release|x86.Build.0 = Release|x86
+ {715E2D88-E822-4A9A-A5A2-DBB71CD9B320}.Debug|x86.ActiveCfg = Debug|x86
+ {715E2D88-E822-4A9A-A5A2-DBB71CD9B320}.Debug|x86.Build.0 = Debug|x86
+ {715E2D88-E822-4A9A-A5A2-DBB71CD9B320}.Release|x86.ActiveCfg = Release|x86
+ {715E2D88-E822-4A9A-A5A2-DBB71CD9B320}.Release|x86.Build.0 = Release|x86
+ {D41D53C4-433E-47B5-B663-E79B5569EE22}.Debug|x86.ActiveCfg = Debug|x86
+ {D41D53C4-433E-47B5-B663-E79B5569EE22}.Debug|x86.Build.0 = Debug|x86
+ {D41D53C4-433E-47B5-B663-E79B5569EE22}.Release|x86.ActiveCfg = Release|x86
+ {D41D53C4-433E-47B5-B663-E79B5569EE22}.Release|x86.Build.0 = Release|x86
+ {12C62F60-6F52-4112-84AB-0FA8ED44EE77}.Debug|x86.ActiveCfg = Debug|x86
+ {12C62F60-6F52-4112-84AB-0FA8ED44EE77}.Debug|x86.Build.0 = Debug|x86
+ {12C62F60-6F52-4112-84AB-0FA8ED44EE77}.Release|x86.ActiveCfg = Release|x86
+ {12C62F60-6F52-4112-84AB-0FA8ED44EE77}.Release|x86.Build.0 = Release|x86
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Modified: trunk/Installer/Libraries/MapGuide Server/FDO.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Server/FDO.wxs 2012-02-03 06:46:04 UTC (rev 6482)
+++ trunk/Installer/Libraries/MapGuide Server/FDO.wxs 2012-02-06 16:43:40 UTC (rev 6483)
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<?define Have_ArcSde = "no" ?>
+ <?define Fdo_VS2010 = "yes" ?>
+ <?if "$(var.Fdo_VS2010)" = "yes" ?>
+ <?define Have_ArcSde = "yes" ?>
+ <?endif ?>
<?if "$(var.MgPlatform)" = "x64" ?>
<?define Win64 = "yes" ?>
<?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
@@ -89,8 +93,17 @@
<!-- FDO Core -->
<Component Id="FdoCoreCompnent" Win64="$(var.Win64)" Guid="90F4CB26-524F-499B-AA22-BD17036B167D">
<File Id="FdoRegUtil" Checksum="yes" Source="$(var.MgSource)\Server\FDO\FdoRegUtil.exe" />
+ <?if "$(var.Fdo_VS2010)" = "no" ?>
<File Id="FdoBoostDateTime" Checksum="yes" Source="$(var.MgSource)\Server\FDO\boost_date_time-vc90-mt-1_42.dll" />
<File Id="FdoBoostThread" Checksum="yes" Source="$(var.MgSource)\Server\FDO\boost_thread-vc90-mt-1_42.dll" />
+ <?else?>
+ <File Id="FdoBoostDateTime" Checksum="yes" Source="$(var.MgSource)\Server\FDO\boost_date_time-vc100-mt-1_42.dll" />
+ <File Id="FdoBoostThread" Checksum="yes" Source="$(var.MgSource)\Server\FDO\boost_thread-vc100-mt-1_42.dll" />
+ <?endif ?>
+ <File Id="XalanLib" Checksum="yes" Source="$(var.MgSource)\Server\FDO\Xalan-C_1_11.dll" />
+ <File Id="XalanMessagesLib" Checksum="yes" Source="$(var.MgSource)\Server\FDO\XalanMessages_1_11.dll" />
+ <File Id="XercesLib" Checksum="yes" Source="$(var.MgSource)\Server\FDO\xerces-c_3_1.dll" />
+ <File Id="GdalLib" Checksum="yes" Source="$(var.MgSource)\Server\FDO\gdal17.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" />
@@ -98,11 +111,7 @@
<File Id="FdoMessage" Checksum="yes" Source="$(var.MgSource)\Server\FDO\FDOMessage.dll" />
<File Id="FdoSpatial" Checksum="yes" Source="$(var.MgSource)\Server\FDO\FDOSpatial.dll" />
<File Id="FdoOWS" Checksum="yes" Source="$(var.MgSource)\Server\FDO\OWS.dll" />
- <File Id="GdalLib" Checksum="yes" Source="$(var.MgSource)\Server\FDO\gdal17.dll" />
<File Id="ProvidersXml" Checksum="yes" Source="$(var.MgSource)\Server\FDO\providers.xml" />
- <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" />
<!-- Generic RDBMS -->
<File Id="RdbmsMsg" Checksum="yes" Source="$(var.MgSource)\Server\FDO\RdbmsMsg.dll" />
<File Id="RdbmsOverrides" Checksum="yes" Source="$(var.MgSource)\Server\FDO\RdbmsOverrides.dll" />
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs 2012-02-03 06:46:04 UTC (rev 6482)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs 2012-02-06 16:43:40 UTC (rev 6483)
@@ -13,7 +13,7 @@
<?define FCGI_MAP = "[!file_MAPAGENTFILES_100]" ?>
<!-- fcgiext.dll -->
<?define PHP_MAP = "[WindowsFolder]system32\inetsrv\fcgiext.dll" ?>
- <?define PHP_CGI_EXE = "[!file_PHPFILES_41]" ?>
+ <?define PHP_CGI_EXE = "[!file_PHPFILES_32]" ?>
<Fragment>
<Property Id="FRAMEWORKDIR">
<RegistrySearch
Deleted: trunk/Installer/Support/Web/x64/httpd-2.2.21-win64.zip
===================================================================
(Binary files differ)
Added: trunk/Installer/Support/Web/x64/httpd-2.2.21-x64-vc10.zip
===================================================================
(Binary files differ)
Property changes on: trunk/Installer/Support/Web/x64/httpd-2.2.21-x64-vc10.zip
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/Installer/Support/Web/x64/php-5.3.8-Win32-VC9-x64.zip
===================================================================
(Binary files differ)
Deleted: trunk/Installer/Support/Web/x64/php-5.3.8-nts-Win32-VC9-x64.zip
===================================================================
(Binary files differ)
Added: trunk/Installer/Support/Web/x64/php-5.3.8-x64-vc10.zip
===================================================================
(Binary files differ)
Property changes on: trunk/Installer/Support/Web/x64/php-5.3.8-x64-vc10.zip
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/Installer/Support/Web/x86/httpd-2.2.21-win32-x86-ssl.zip
===================================================================
(Binary files differ)
Added: trunk/Installer/Support/Web/x86/httpd-2.2.21-x86-vc10.zip
===================================================================
(Binary files differ)
Property changes on: trunk/Installer/Support/Web/x86/httpd-2.2.21-x86-vc10.zip
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/Installer/Support/Web/x86/php-5.3.8-Win32-VC9-x86.zip
===================================================================
(Binary files differ)
Deleted: trunk/Installer/Support/Web/x86/php-5.3.8-nts-Win32-VC9-x86.zip
===================================================================
(Binary files differ)
Added: trunk/Installer/Support/Web/x86/php-5.3.8-x86-vc10.zip
===================================================================
(Binary files differ)
Property changes on: trunk/Installer/Support/Web/x86/php-5.3.8-x86-vc10.zip
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/Installer/build.bat
===================================================================
--- trunk/Installer/build.bat 2012-02-03 06:46:04 UTC (rev 6482)
+++ trunk/Installer/build.bat 2012-02-06 16:43:40 UTC (rev 6483)
@@ -8,7 +8,7 @@
rem value of INSTALLER_OUTPUT defined in this file
rem
rem Requirements:
-rem 1. Wix 3.0 (http://wix.codeplex.com)
+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:
@@ -37,6 +37,15 @@
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 ==================================================
@@ -81,10 +90,9 @@
SET HTTPD_VERSION=2.2.21
SET PHP_VERSION=5.3.8
SET TOMCAT_VERSION=7.0.23
-SET HTTPD_PACKAGE=httpd-%HTTPD_VERSION%-win32-x86-ssl.zip
+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%-Win32-VC9-x86.zip
-SET PHP_NTS_PACKAGE=php-%PHP_VERSION%-nts-Win32-VC9-x86.zip
+SET PHP_TS_PACKAGE=php-%PHP_VERSION%-x86-vc10.zip
rem ==================================================
rem MSBuild Settings
@@ -95,7 +103,7 @@
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
+SET MSBUILD_VERBOSITY=/v:n
rem ==================================================
rem Command aliases
@@ -204,9 +212,9 @@
:clean
echo [clean]: Installer Pre-Reqs
-%MSBUILD_CLEAN% InstallerPreReq.sln
+%MSBUILD_CLEAN% InstallerPreReq%VS_SLN_SUFFIX%.sln
echo [clean]: Installer
-%MSBUILD_CLEAN% InstallerWix.sln
+%MSBUILD_CLEAN% InstallerWix%VS_SLN_SUFFIX%.sln
goto quit
:prepare
@@ -215,13 +223,12 @@
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.sln
+%MSBUILD% InstallerPreReq%VS_SLN_SUFFIX%.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%"
-REM we unpack to root because Apache2 is the root dir in the zip file
-7z x %HTTPD_PACKAGE% -y -o"%MG_SOURCE%\Web"
+7z x %HTTPD_PACKAGE% -y -o"%MG_SOURCE%\Web\Apache2"
popd
echo [prepare] Unpack Tomcat
pushd "%MG_SOURCE%\Web"
@@ -237,16 +244,12 @@
echo [prepare] Unpack PHP (Thread Safe)
pushd "%INSTALLER_DEV_SUPPORT%\Web\%CPUTYPE%"
7z x %PHP_TS_PACKAGE% -y -o"%MG_SOURCE%\Web\Php"
-rem echo [prepare] Unpack PHP (Non-Thread Safe)
-rem 7z x %PHP_NTS_PACKAGE% -o"%MG_SOURCE%\Web\PHP_NTS"
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
echo [prepare] Php config
%XCOPY% "%INSTALLER_DEV%\Support\Web\%CPUTYPE%\configs\Php" "%MG_SOURCE%\Web\Php" /EXCLUDE:svn_excludes.txt
-rem echo [prepare] Php config
-rem %XCOPY% "%INSTALLER_DEV%\Support\Web\%CPUTYPE%\configs\Php" "%MG_SOURCE%\Web\PHP_NTS" /EXCLUDE:svn_excludes.txt
echo [prepare] Apache2 config
%XCOPY% "%INSTALLER_DEV%\Support\Web\%CPUTYPE%\configs\Apache2" "%MG_SOURCE%\Web\Apache2" /EXCLUDE:svn_excludes.txt
echo [prepare] Apache2 mapagent so
@@ -301,10 +304,6 @@
%PARAFFIN% %WIX_INC_WEB%\incPhpFiles.wxs
move /Y %WIX_INC_WEB%\incPhpFiles.PARAFFIN %WIX_INC_WEB%\incPhpFiles.wxs
-rem echo [regen]: Web - Php NTS
-rem %PARAFFIN% %WIX_INC_WEB%\incPhpNtsFiles.wxs
-rem move /Y %WIX_INC_WEB%\incPhpNtsFiles.PARAFFIN %WIX_INC_WEB%\incPhpNtsFiles.wxs
-
echo [regen]: Web - Tomcat
%PARAFFIN% %WIX_INC_WEB%\incTomcatFiles.wxs
move /Y %WIX_INC_WEB%\incTomcatFiles.PARAFFIN %WIX_INC_WEB%\incTomcatFiles.wxs
@@ -411,9 +410,6 @@
echo [generate]: Web - Php TS
%PARAFFIN% -dir %MG_SOURCE%\Web\Php -alias $(var.MgSource)\Web\Php -custom PHPFILES -dirref WEBEXTENSIONSLOCATION %WIX_INC_WEB%\incPhpFiles.wxs
-rem echo [generate]: Web - Php NTS
-rem %PARAFFIN% -dir %MG_SOURCE%\Web\PHP_NTS -alias $(var.MgSource)\Web\PHP_NTS -custom PHPNTSFILES -dirref WEBEXTENSIONSLOCATION %WIX_INC_WEB%\incPhpNtsFiles.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
@@ -468,11 +464,12 @@
SET RUN_BUILD=%MSBUILD% /p:OutputName=%INSTALLER_NAME%;MgCulture=%CULTURE%;MgTitle=%INSTALLER_TITLE%;MgVersion=%INSTALLER_VERSION%;MgRegKey=%MG_REG_KEY%;MgPlatform=%CPUTYPE%
if not ""=="%MG_SOURCE_INC%" set RUN_BUILD=%RUN_BUILD%;MgSource=%MG_SOURCE_INC%
echo [build]: Installer
-%RUN_BUILD% InstallerWix.sln
+%RUN_BUILD% InstallerWix%VS_SLN_SUFFIX%.sln
if "%errorlevel%"=="1" goto error
pushd "%INSTALLER_DEV_BOOTSTRAP%"
echo [bootstrap]: Copying vcredist
-copy /Y vcredist_x86.exe "%INSTALLER_OUTPUT%\vcredist_x86.exe"
+copy /Y vcredist_2008_x86.exe "%INSTALLER_OUTPUT%\vcredist_2008_x86.exe"
+copy /Y vcredist_2010_x86.exe "%INSTALLER_OUTPUT%\vcredist_2010_x86.exe"
popd
if "%errorlevel%"=="1" goto error
if "%MAX_COMPRESSION%"=="YES" goto build_max_compress
Modified: trunk/Installer/build64.bat
===================================================================
--- trunk/Installer/build64.bat 2012-02-03 06:46:04 UTC (rev 6482)
+++ trunk/Installer/build64.bat 2012-02-06 16:43:40 UTC (rev 6483)
@@ -37,6 +37,15 @@
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 ==================================================
@@ -76,6 +85,16 @@
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 ==================================================
@@ -214,25 +233,10 @@
if "%TYPEACTION%"=="regen" goto regen
:clean
-echo [clean]: FdoRegUtil
-pushd %INSTALLER_FDO_REG_UTIL%
-%MSBUILD_CLEAN% FdoRegUtil.vcproj
-popd
-echo [clean]: CS-Map
-pushd "%INSTALLER_DEV_CSMAP%"
-%MSBUILD_CLEAN% "CS Map.wixproj"
-popd
-echo [clean]: MapGuide Server
-pushd "%INSTALLER_DEV_MGSERVER%"
-%MSBUILD_CLEAN% "MapGuide Server.wixproj"
-popd
-echo [clean]: MapGuide Web
-pushd "%INSTALLER_DEV_MGWEB%"
-%MSBUILD_CLEAN% "MapGuide Web Extensions.wixproj"
-popd
+echo [clean]: Installer Pre-Reqs
+%MSBUILD_CLEAN% InstallerPreReq%VS_SLN_SUFFIX%.sln
echo [clean]: Installer
-%MSBUILD_CLEAN% Installer.sln
-popd
+%MSBUILD_CLEAN% InstallerWix%VS_SLN_SUFFIX%.sln
goto quit
:prepare
@@ -241,16 +245,28 @@
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.sln
+%MSBUILD% InstallerPreReq%VS_SLN_SUFFIX%.sln
copy %INSTALLER_FDO_REG_UTIL%\%TYPEBUILD%\FdoRegUtil.exe %MG_SOURCE%\Server\FDO
popd
-rem copy support files into server and web directories
-echo [prepare] Tomcat
-%XCOPY% "%INSTALLER_DEV%\Support\Web\%PLATFORM%\Tomcat" "%MG_SOURCE%\Web\Tomcat" /EXCLUDE:svn_excludes.txt
-echo [prepare] Php
-%XCOPY% "%INSTALLER_DEV%\Support\Web\%PLATFORM%\Php" "%MG_SOURCE%\Web\Php" /EXCLUDE:svn_excludes.txt
-echo [prepare] Apache2
-%XCOPY% "%INSTALLER_DEV%\Support\Web\%PLATFORM%\Apache2" "%MG_SOURCE%\Web\Apache2" /EXCLUDE:svn_excludes.txt
+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 "%MG_SOURCE%\Web"
+rd /S /Q Tomcat
+popd
+pushd "%INSTALLER_DEV_SUPPORT%\Web\%CPUTYPE%"
+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"
+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
@@ -468,11 +484,12 @@
SET RUN_BUILD=%MSBUILD% /p:OutputName=%INSTALLER_NAME%;MgCulture=%CULTURE%;MgTitle=%INSTALLER_TITLE%;MgVersion=%INSTALLER_VERSION%;MgRegKey=%MG_REG_KEY%;MgPlatform=%PLATFORM%
if not ""=="%MG_SOURCE_INC%" set RUN_BUILD=%RUN_BUILD%;MgSource=%MG_SOURCE_INC%
echo [build]: Installer
-%RUN_BUILD% InstallerWix.sln
+%RUN_BUILD% InstallerWix%VS_SLN_SUFFIX%.sln
if "%errorlevel%"=="1" goto error
pushd "%INSTALLER_DEV_BOOTSTRAP%"
echo [bootstrap]: Copying vcredist
-copy /Y vcredist_x64.exe "%INSTALLER_OUTPUT%\vcredist_x64.exe"
+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
More information about the mapguide-commits
mailing list