[mapguide-commits] r4989 - in trunk/Installer: . Bootstrapper
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Jul 2 07:21:46 EDT 2010
Author: jng
Date: 2010-07-02 11:21:46 +0000 (Fri, 02 Jul 2010)
New Revision: 4989
Added:
trunk/Installer/Bootstrapper/Bootstrap-x64.proj
trunk/Installer/Bootstrapper/Bootstrap-x86.proj
Removed:
trunk/Installer/Bootstrapper/Bootstrap.proj
Modified:
trunk/Installer/Bootstrapper/Setup.nsi
trunk/Installer/build.bat
trunk/Installer/build64.bat
Log:
Fix #1390:
- Split the bootstrapper step into x86 and x64 flavours. This will prepare the working directory with the correct vc_redist installer.
- Add an additional CPU parameter to the makensis call. The nsis installer will then include the correct vc_redist directory from the working directory
Added: trunk/Installer/Bootstrapper/Bootstrap-x64.proj
===================================================================
--- trunk/Installer/Bootstrapper/Bootstrap-x64.proj (rev 0)
+++ trunk/Installer/Bootstrapper/Bootstrap-x64.proj 2010-07-02 11:21:46 UTC (rev 4989)
@@ -0,0 +1,15 @@
+<Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <BootstrapperFile Include="Microsoft.Visual.C++.9.0.x64" />
+ </ItemGroup>
+ <Target Name="BuildBootstrapper">
+ <GenerateBootstrapper
+ ApplicationFile="$(TargetFile)"
+ ApplicationName="MapGuide Open Source"
+ BootstrapperItems="@(BootstrapperFile)"
+ CopyComponents="true"
+ ComponentsLocation="Relative"
+ Culture="$(Culture)"
+ OutputPath="..\Output\$(Culture)" />
+ </Target>
+</Project>
Copied: trunk/Installer/Bootstrapper/Bootstrap-x86.proj (from rev 4986, trunk/Installer/Bootstrapper/Bootstrap.proj)
===================================================================
--- trunk/Installer/Bootstrapper/Bootstrap-x86.proj (rev 0)
+++ trunk/Installer/Bootstrapper/Bootstrap-x86.proj 2010-07-02 11:21:46 UTC (rev 4989)
@@ -0,0 +1,15 @@
+<Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <BootstrapperFile Include="Microsoft.Visual.C++.9.0.x86" />
+ </ItemGroup>
+ <Target Name="BuildBootstrapper">
+ <GenerateBootstrapper
+ ApplicationFile="$(TargetFile)"
+ ApplicationName="MapGuide Open Source"
+ BootstrapperItems="@(BootstrapperFile)"
+ CopyComponents="true"
+ ComponentsLocation="Relative"
+ Culture="$(Culture)"
+ OutputPath="..\Output\$(Culture)" />
+ </Target>
+</Project>
Deleted: trunk/Installer/Bootstrapper/Bootstrap.proj
===================================================================
--- trunk/Installer/Bootstrapper/Bootstrap.proj 2010-07-02 03:23:12 UTC (rev 4988)
+++ trunk/Installer/Bootstrapper/Bootstrap.proj 2010-07-02 11:21:46 UTC (rev 4989)
@@ -1,15 +0,0 @@
-<Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <BootstrapperFile Include="Microsoft.Visual.C++.9.0.x86" />
- </ItemGroup>
- <Target Name="BuildBootstrapper">
- <GenerateBootstrapper
- ApplicationFile="$(TargetFile)"
- ApplicationName="MapGuide Open Source 2.1"
- BootstrapperItems="@(BootstrapperFile)"
- CopyComponents="true"
- ComponentsLocation="Relative"
- Culture="$(Culture)"
- OutputPath="..\Output\$(Culture)" />
- </Target>
-</Project>
Modified: trunk/Installer/Bootstrapper/Setup.nsi
===================================================================
--- trunk/Installer/Bootstrapper/Setup.nsi 2010-07-02 03:23:12 UTC (rev 4988)
+++ trunk/Installer/Bootstrapper/Setup.nsi 2010-07-02 11:21:46 UTC (rev 4989)
@@ -42,8 +42,11 @@
SetOverwrite On
File "${INSTALLER_OUTPUT}\${OUTNAME}.msi"
File "${INSTALLER_OUTPUT}\setup.exe"
+!if ${CPU} = "x64"
+ File /r "${INSTALLER_OUTPUT}\vcredist_x64"
+!else
File /r "${INSTALLER_OUTPUT}\vcredist_x86"
-
+!endif
Banner::destroy
ExecWait '"$OUTDIR\setup.exe"'
SectionEnd
\ No newline at end of file
Modified: trunk/Installer/build.bat
===================================================================
--- trunk/Installer/build.bat 2010-07-02 03:23:12 UTC (rev 4988)
+++ trunk/Installer/build.bat 2010-07-02 11:21:46 UTC (rev 4989)
@@ -45,7 +45,7 @@
SET TYPEBUILD=Release
SET CULTURE=en-US
SET INSTALLER_VERSION_MAJOR_MINOR_REV=2.2.0
-SET INSTALLER_NAME=MapGuideOpenSource-%INSTALLER_VERSION_MAJOR_MINOR_REV%-Trunk-%CULTURE%-%TYPEBUILD%
+SET INSTALLER_NAME=MapGuideOpenSource-%INSTALLER_VERSION_MAJOR_MINOR_REV%-Trunk-%CULTURE%-%TYPEBUILD%-%CPUTYPE%
SET INSTALLER_VERSION=%INSTALLER_VERSION_MAJOR_MINOR_REV%.0
SET INSTALLER_TITLE="MapGuide Open Source 2.2 Trunk (%TYPEBUILD%)"
SET MG_REG_KEY=Software\OSGeo\MapGuide\%INSTALLER_VERSION_MAJOR_MINOR_REV%
@@ -174,6 +174,7 @@
:start_build
echo ===================================================
echo Configuration is [%TYPEBUILD%]
+echo CPU type is: [%CPUTYPE%]
echo Action is [%TYPEACTION%]
echo CPU cores: %CPU_CORES%
echo Installer Output Directory: %INSTALLER_OUTPUT%
@@ -405,7 +406,7 @@
if "%errorlevel%"=="1" goto error
pushd "%INSTALLER_DEV_BOOTSTRAP%"
echo [bootstrap]: Creating
-%MSBUILD% /p:TargetFile=%INSTALLER_NAME%.msi Bootstrap.proj
+%MSBUILD% /p:TargetFile=%INSTALLER_NAME%.msi Bootstrap-x86.proj
popd
if "%errorlevel%"=="1" goto error
if "%MAX_COMPRESSION%"=="YES" goto build_max_compress
@@ -414,7 +415,7 @@
:build_min_compress
pushd "%INSTALLER_DEV_BOOTSTRAP%"
echo [bootstrap]: Create self-extracting package
-makensis /DINSTALLER_ROOT=%INSTALLER_DEV% /DNSISDIR=%NSIS% /DOUTNAME=%INSTALLER_NAME% /DCULTURE=%CULTURE% /DMG_VERSION=%INSTALLER_VERSION% Setup.nsi
+makensis /DCPU=x86 /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
@@ -423,7 +424,7 @@
:build_max_compress
pushd "%INSTALLER_DEV_BOOTSTRAP%"
echo [bootstrap]: Create self-extracting package (MAX compression)
-makensis /DINSTALLER_ROOT=%INSTALLER_DEV% /DNSISDIR=%NSIS% /DOUTNAME=%INSTALLER_NAME% /DCULTURE=%CULTURE% /DMAXCOMPRESSION /DMG_VERSION=%INSTALLER_VERSION% Setup.nsi
+makensis /DCPU=x86 /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
Modified: trunk/Installer/build64.bat
===================================================================
--- trunk/Installer/build64.bat 2010-07-02 03:23:12 UTC (rev 4988)
+++ trunk/Installer/build64.bat 2010-07-02 11:21:46 UTC (rev 4989)
@@ -41,13 +41,12 @@
rem ==================================================
SET TYPEACTION=build
-SET CPUTYPE=x64
SET TYPEBUILD=Release64
SET CONFIGURATION=Release
SET PLATFORM=x64
SET CULTURE=en-US
SET INSTALLER_VERSION_MAJOR_MINOR_REV=2.2.0
-SET INSTALLER_NAME=MapGuideOpenSource-%INSTALLER_VERSION_MAJOR_MINOR_REV%-Trunk-%CULTURE%-%TYPEBUILD%
+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 2.2 Trunk (%TYPEBUILD%)"
SET MG_REG_KEY=Software\OSGeo\MapGuide\%INSTALLER_VERSION_MAJOR_MINOR_REV%
@@ -198,6 +197,7 @@
: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%
@@ -246,11 +246,11 @@
popd
rem copy support files into server and web directories
echo [prepare] Tomcat
-%XCOPY% "%INSTALLER_DEV%\Support\Web\%CPUTYPE%\Tomcat" "%MG_SOURCE%\Web\Tomcat" /EXCLUDE:svn_excludes.txt
+%XCOPY% "%INSTALLER_DEV%\Support\Web\%PLATFORM%\Tomcat" "%MG_SOURCE%\Web\Tomcat" /EXCLUDE:svn_excludes.txt
echo [prepare] Php
-%XCOPY% "%INSTALLER_DEV%\Support\Web\%CPUTYPE%\Php" "%MG_SOURCE%\Web\Php" /EXCLUDE:svn_excludes.txt
+%XCOPY% "%INSTALLER_DEV%\Support\Web\%PLATFORM%\Php" "%MG_SOURCE%\Web\Php" /EXCLUDE:svn_excludes.txt
echo [prepare] Apache2
-%XCOPY% "%INSTALLER_DEV%\Support\Web\%CPUTYPE%\Apache2" "%MG_SOURCE%\Web\Apache2" /EXCLUDE:svn_excludes.txt
+%XCOPY% "%INSTALLER_DEV%\Support\Web\%PLATFORM%\Apache2" "%MG_SOURCE%\Web\Apache2" /EXCLUDE:svn_excludes.txt
goto quit
@@ -422,14 +422,14 @@
:build
echo [build]: Installer
-SET RUN_BUILD=%MSBUILD% /p:OutputName=%INSTALLER_NAME%;MgCulture=%CULTURE%;MgTitle=%INSTALLER_TITLE%;MgVersion=%INSTALLER_VERSION%;MgRegKey=%MG_REG_KEY%;MgPlatform=%CPUTYPE%
+SET RUN_BUILD=%MSBUILD% /p:OutputName=%INSTALLER_NAME%;MgCulture=%CULTURE%;MgTitle=%INSTALLER_TITLE%;MgVersion=%INSTALLER_VERSION%;MgRegKey=%MG_REG_KEY%;MgPlatform=%PLATFORM%
if not ""=="%MG_SOURCE_INC%" set RUN_BUILD=%RUN_BUILD%;MgSource=%MG_SOURCE_INC%
set RUN_BUILD=%RUN_BUILD% Installer.sln
%RUN_BUILD%
if "%errorlevel%"=="1" goto error
pushd "%INSTALLER_DEV_BOOTSTRAP%"
echo [bootstrap]: Creating
-%MSBUILD% /p:TargetFile=%INSTALLER_NAME%.msi Bootstrap.proj
+%MSBUILD% /p:TargetFile=%INSTALLER_NAME%.msi Bootstrap-x64.proj
popd
if "%errorlevel%"=="1" goto error
if "%MAX_COMPRESSION%"=="YES" goto build_max_compress
@@ -438,7 +438,7 @@
:build_min_compress
pushd "%INSTALLER_DEV_BOOTSTRAP%"
echo [bootstrap]: Create self-extracting package
-makensis /DINSTALLER_ROOT=%INSTALLER_DEV% /DNSISDIR=%NSIS% /DOUTNAME=%INSTALLER_NAME% /DCULTURE=%CULTURE% /DMG_VERSION=%INSTALLER_VERSION% Setup.nsi
+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
@@ -447,7 +447,7 @@
:build_max_compress
pushd "%INSTALLER_DEV_BOOTSTRAP%"
echo [bootstrap]: Create self-extracting package (MAX compression)
-makensis /DINSTALLER_ROOT=%INSTALLER_DEV% /DNSISDIR=%NSIS% /DOUTNAME=%INSTALLER_NAME% /DCULTURE=%CULTURE% /DMAXCOMPRESSION /DMG_VERSION=%INSTALLER_VERSION% Setup.nsi
+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
More information about the mapguide-commits
mailing list