[mapguide-commits] r4610 - in trunk/Installer: . Bootstrapper

[svn_mapguide at osgeo.org]

Author: jng
Date: 2010-02-24 17:39:22 -0500 (Wed, 24 Feb 2010)
New Revision: 4610

Modified:
   trunk/Installer/Bootstrapper/Setup.nsi
   trunk/Installer/build.bat
Log:
Post #361 changes:

- Added a MAX_COMPRESSION option to build.bat that can be switched off to speed up build times (defaults to YES)
- Also, remove the hardcoded version number and update the copyright year in Setup.nsi

Modified: trunk/Installer/Bootstrapper/Setup.nsi
===================================================================
--- trunk/Installer/Bootstrapper/Setup.nsi	2010-02-24 15:02:55 UTC (rev 4609)
+++ trunk/Installer/Bootstrapper/Setup.nsi	2010-02-24 22:39:22 UTC (rev 4610)
@@ -7,13 +7,11 @@
 
 !endif
 
-!define MG_VERSION "2.1.0"
-
-VIProductVersion "${MG_VERSION}.0"
+VIProductVersion "${MG_VERSION}"
 VIAddVersionKey "FileVersion" "1.0.0.0"
 VIAddVersionKey "CompanyName" "Open Source Geospatial Foundation"
 VIAddVersionKey "FileDescription" "Installer Bootstrapper package for MapGuide Open Source"
-VIAddVersionKey "LegalCopyright" "2009 Open Source Geospatial Foundation"
+VIAddVersionKey "LegalCopyright" "2010 Open Source Geospatial Foundation"
 
 !ifndef CULTURE
 !define CULTURE "en-us"

Modified: trunk/Installer/build.bat
===================================================================
--- trunk/Installer/build.bat	2010-02-24 15:02:55 UTC (rev 4609)
+++ trunk/Installer/build.bat	2010-02-24 22:39:22 UTC (rev 4610)
@@ -43,11 +43,13 @@
 SET TYPEACTION=build
 SET TYPEBUILD=Release
 SET CULTURE=en-US
-SET INSTALLER_NAME=MapGuideOpenSource-2.1.0-Unofficial-%CULTURE%-%TYPEBUILD%
-SET INSTALLER_VERSION=2.1.0.0
-SET INSTALLER_TITLE="MapGuide OS 2.1 Unofficial (%TYPEBUILD%)"
+SET INSTALLER_NAME=MapGuideOpenSource-2.2.0-Trunk-%CULTURE%-%TYPEBUILD%
+SET INSTALLER_VERSION=2.2.0.0
+SET INSTALLER_TITLE="MapGuide Open Source 2.2 Trunk (%TYPEBUILD%)"
 SET MG_SOURCE=%CD%\..\MgDev\%TYPEBUILD%
 SET MG_SOURCE_INC=
+rem Set to NO to build installers quicker (at the expense of file size)
+SET MAX_COMPRESSION=YES
 
 rem ==================================================
 rem MapGuide Installer vars
@@ -400,15 +402,27 @@
 pushd "%INSTALLER_DEV_BOOTSTRAP%"
 echo [bootstrap]: Creating
 %MSBUILD% /p:TargetFile=%INSTALLER_NAME%.msi Bootstrap.proj
+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 /DINSTALLER_ROOT=%INSTALLER_DEV% /DNSISDIR=%NSIS% /DOUTNAME=%INSTALLER_NAME% /DCULTURE=%CULTURE% /DMAXCOMPRESSION Setup.nsi
-rem Use this line instead if you value build speed over compression
-rem makensis /DINSTALLER_ROOT=%INSTALLER_DEV% /DNSISDIR=%NSIS% /DOUTNAME=%INSTALLER_NAME% /DCULTURE=%CULTURE% Setup.nsi
+makensis /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 /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