[GRASS-SVN] r40505 - grass/branches/develbranch_6/mswindows
svn_grass at osgeo.org
svn_grass at osgeo.org
Sun Jan 17 09:12:30 EST 2010
Author: martinl
Date: 2010-01-17 09:12:29 -0500 (Sun, 17 Jan 2010)
New Revision: 40505
Modified:
grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi
grass/branches/develbranch_6/mswindows/GRASS-Packager.bat
Log:
WinGrass-Installer - definition of the destination folder (patch
applied, trac #875) - only dev65 included
Modified: grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi
===================================================================
--- grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi 2010-01-17 13:50:27 UTC (rev 40504)
+++ grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi 2010-01-17 14:12:29 UTC (rev 40505)
@@ -2,8 +2,8 @@
;GRASS Installer for Windows
;Written by Marco Pasetti
-;Updated for OSGeo4W by Colin Nielsen
-;Last Update: 30 March 2009
+;Updated for OSGeo4W by Colin Nielsen, Helmut Kudrnovsky, and Martin Landa
+;Last Update: 17 Jan 2010
;Mail to: grass-dev at lists.osgeo.org
;----------------------------------------------------------------------------------------------------------------------------
@@ -21,24 +21,12 @@
;Version variables
-!define RELEASE_VERSION_NUMBER "6.4.0RC5"
-!define RELEASE_SVN_REVISION "36599"
-!define RELEASE_BINARY_REVISION "1"
-!define RELEASE_GRASS_COMMAND "grass64"
-!define RELEASE_GRASS_BASE "GRASS"
+!define DEV65_VERSION_NUMBER "6.5.SVN"
+!define DEV65_SVN_REVISION "36599"
+!define DEV65_BINARY_REVISION "1"
+!define DEV65_GRASS_COMMAND "grass65svn"
+!define DEV65_GRASS_BASE "GRASS-65-SVN"
-!define DEV6_VERSION_NUMBER "6.5.SVN"
-!define DEV6_SVN_REVISION "36599"
-!define DEV6_BINARY_REVISION "1"
-!define DEV6_GRASS_COMMAND "grass65"
-!define DEV6_GRASS_BASE "GRASS-6-SVN"
-
-!define DEV7_VERSION_NUMBER "7.0.SVN"
-!define DEV7_SVN_REVISION ""
-!define DEV7_BINARY_REVISION "1"
-!define DEV7_GRASS_COMMAND "grass7"
-!define DEV7_GRASS_BASE"GRASS-7-SVN"
-
;----------------------------------------------------------------------------------------------------------------------------
;Don't modify the following lines
@@ -54,36 +42,16 @@
;Set the installer variables, depending on the selected version to build
-!if ${INSTALLER_TYPE} == "Release"
- !define VERSION_NUMBER "${RELEASE_VERSION_NUMBER}"
- !define SVN_REVISION "${RELEASE_SVN_REVISION}"
- !define BINARY_REVISION "${RELEASE_BINARY_REVISION}"
- !define GRASS_COMMAND "${RELEASE_GRASS_COMMAND}"
- !define GRASS_BASE "${RELEASE_GRASS_BASE}"
- !define INSTALLER_NAME "WinGRASS-${VERSION_NUMBER}-${BINARY_REVISION}-Setup.exe"
- !define DISPLAYED_NAME "GRASS ${VERSION_NUMBER}-${BINARY_REVISION}"
- !define CHECK_INSTALL_NAME "GRASS"
- !define PACKAGE_FOLDER ".\GRASS-Release-Package"
-!else if ${INSTALLER_TYPE} == "Dev6"
- !define VERSION_NUMBER "${DEV6_VERSION_NUMBER}"
- !define SVN_REVISION "${DEV6_SVN_REVISION}"
- !define BINARY_REVISION "${DEV6_BINARY_REVISION}"
- !define GRASS_COMMAND "${DEV6_GRASS_COMMAND}"
- !define GRASS_BASE "${DEV6_GRASS_BASE}"
+!if ${INSTALLER_TYPE} == "Dev65"
+ !define VERSION_NUMBER "${DEV65_VERSION_NUMBER}"
+ !define SVN_REVISION "${DEV65_SVN_REVISION}"
+ !define BINARY_REVISION "${DEV65_BINARY_REVISION}"
+ !define GRASS_COMMAND "${DEV65_GRASS_COMMAND}"
+ !define GRASS_BASE "${DEV65_GRASS_BASE}"
!define INSTALLER_NAME "WinGRASS-${VERSION_NUMBER}-r${SVN_REVISION}-${BINARY_REVISION}-Setup.exe"
!define DISPLAYED_NAME "GRASS ${VERSION_NUMBER}-r${SVN_REVISION}-${BINARY_REVISION}"
- !define CHECK_INSTALL_NAME "GRASS 6 SVN"
- !define PACKAGE_FOLDER ".\GRASS-6-Dev-Package"
-!else if ${INSTALLER_TYPE} == "Dev7"
- !define VERSION_NUMBER "${DV7_VERSION_NUMBER}"
- !define SVN_REVISION "${DV7_SVN_REVISION}"
- !define BINARY_REVISION "${DV7_BINARY_REVISION}"
- !define GRASS_COMMAND "${DEV7_GRASS_COMMAND}"
- !define GRASS_BASE "${DEV7_GRASS_BASE}"
- !define INSTALLER_NAME "WinGRASS-${VERSION_NUMBER}-r${SVN_REVISION}-${BINARY_REVISION}-Setup.exe"
- !define DISPLAYED_NAME "GRASS ${VERSION_NUMBER}-r${SVN_REVISION}-${BINARY_REVISION}"
- !define CHECK_INSTALL_NAME "GRASS 7 SVN"
- !define PACKAGE_FOLDER ".\GRASS-7-Dev-Package"
+ !define CHECK_INSTALL_NAME "GRASS 65 SVN"
+ !define PACKAGE_FOLDER ".\GRASS-65-Dev-Package"
!endif
;----------------------------------------------------------------------------------------------------------------------------
@@ -105,7 +73,7 @@
OutFile "${INSTALLER_NAME}"
;Define installation folder
-InstallDir "C:\${GRASS_BASE}"
+InstallDir "$PROGRAMFILES\${GRASS_BASE}"
;Request application privileges for Windows Vista
RequestExecutionLevel user
@@ -321,34 +289,34 @@
;----------------------------------------------------------------------------------------------------------------------------
;CheckInstDir Function
+;this is commented out, because the installation path should be in $PROGRAMFILES
;Check if GRASS is going to be installed in a directory containing spaces
;if yes, show a warning message
-Function CheckInstDir
+;Function CheckInstDir
+; Var /GLOBAL INSTDIR_TEST
+; Var /GLOBAL INSTDIR_LENGHT
+; Var /GLOBAL INSTDIR_TEST_LENGHT
+; Var /GLOBAL MESSAGE_CHKINST_
+;
+; StrCpy $MESSAGE_CHKINST_ "WARNING: you are about to install GRASS into a directory that has spaces$\r$\n"
+; StrCpy $MESSAGE_CHKINST_ "$MESSAGE_CHKINST_in either its name or the path of directories leading up to it.$\r$\n"
+; StrCpy $MESSAGE_CHKINST_ "$MESSAGE_CHKINST_Some functionalities of GRASS might be hampered by this. We would highly$\r$\n"
+; StrCpy $MESSAGE_CHKINST_ "$MESSAGE_CHKINST_appreciate if you tried and reported any problems, so that we can fix them.$\r$\n"
+; StrCpy $MESSAGE_CHKINST_ "$MESSAGE_CHKINST_However, if you want to avoid any such issues, we recommend that you$\r$\n"
+; StrCpy $MESSAGE_CHKINST_ "$MESSAGE_CHKINST_choose a simple installation path without spaces, such as: C:\${GRASS_BASE}.$\r$\n"
+;
+; ${StrReplace} "$INSTDIR_TEST" " " "" "$INSTDIR"
+;
+; StrLen $INSTDIR_LENGHT "$INSTDIR"
+; StrLen $INSTDIR_TEST_LENGHT "$INSTDIR_TEST"
+;
+; ${If} $INSTDIR_TEST_LENGHT < $INSTDIR_LENGHT
+; MessageBox MB_OK|MB_ICONEXCLAMATION "$MESSAGE_CHKINST_"
+; ${EndIf}
+;
+;FunctionEnd
- Var /GLOBAL INSTDIR_TEST
- Var /GLOBAL INSTDIR_LENGHT
- Var /GLOBAL INSTDIR_TEST_LENGHT
- Var /GLOBAL MESSAGE_CHKINST_
-
- StrCpy $MESSAGE_CHKINST_ "WARNING: you are about to install GRASS into a directory that has spaces$\r$\n"
- StrCpy $MESSAGE_CHKINST_ "$MESSAGE_CHKINST_in either its name or the path of directories leading up to it.$\r$\n"
- StrCpy $MESSAGE_CHKINST_ "$MESSAGE_CHKINST_Some functionalities of GRASS might be hampered by this. We would highly$\r$\n"
- StrCpy $MESSAGE_CHKINST_ "$MESSAGE_CHKINST_appreciate if you tried and reported any problems, so that we can fix them.$\r$\n"
- StrCpy $MESSAGE_CHKINST_ "$MESSAGE_CHKINST_However, if you want to avoid any such issues, we recommend that you$\r$\n"
- StrCpy $MESSAGE_CHKINST_ "$MESSAGE_CHKINST_choose a simple installation path without spaces, such as: C:\${GRASS_BASE}.$\r$\n"
-
- ${StrReplace} "$INSTDIR_TEST" " " "" "$INSTDIR"
-
- StrLen $INSTDIR_LENGHT "$INSTDIR"
- StrLen $INSTDIR_TEST_LENGHT "$INSTDIR_TEST"
-
- ${If} $INSTDIR_TEST_LENGHT < $INSTDIR_LENGHT
- MessageBox MB_OK|MB_ICONEXCLAMATION "$MESSAGE_CHKINST_"
- ${EndIf}
-
-FunctionEnd
-
;----------------------------------------------------------------------------------------------------------------------------
;Interface Settings
Modified: grass/branches/develbranch_6/mswindows/GRASS-Packager.bat
===================================================================
--- grass/branches/develbranch_6/mswindows/GRASS-Packager.bat 2010-01-17 13:50:27 UTC (rev 40504)
+++ grass/branches/develbranch_6/mswindows/GRASS-Packager.bat 2010-01-17 14:12:29 UTC (rev 40505)
@@ -4,49 +4,31 @@
rem Set the script variables
rem --------------------------------------------------------------------------------------------------------------------------
-set GRASS_RELEASE_PACKAGE_DIR=.\GRASS-Release-Package
-set GRASS_6_DEV_PACKAGE_DIR=.\GRASS-6-Dev-Package
-set GRASS_7_DEV_PACKAGE_DIR=.\GRASS-7-Dev-Package
+set GRASS_65_DEV_PACKAGE_DIR=.\GRASS-65-Dev-Package
set OSGEO4W_DIR=c:\osgeo4w
-set GRASS_RELEASE_INSTALL_FOLDER=%OSGEO4W_DIR%\apps\grass\grass-6.4.0RC5
-set GRASS_6_DEV_INSTALL_FOLDER=%OSGEO4W_DIR%\apps\grass\grass-6.5.svn
-set GRASS_7_DEV_INSTALL_FOLDER=%OSGEO4W_DIR%\apps\grass\grass-7.0.svn
+set GRASS_65_DEV_INSTALL_FOLDER=%OSGEO4W_DIR%\apps\grass\grass-6.5.svn
@echo -----------------------------------------------------------------------------------------------------------------------
@echo Self Contained GRASS Automated Packager
@echo -----------------------------------------------------------------------------------------------------------------------
@echo Edited by: Marco Pasetti
- at echo Revised for OSGeo4W by: Colin Nielsen
- at echo Last Update: 10 June 2009
+ at echo Revised for OSGeo4W by: Colin Nielsen, Helmut Kudrnovsky, and Martin Landa
+ at echo Last Update: 17 Jan 2010
@echo -----------------------------------------------------------------------------------------------------------------------
@echo Select the GRASS version to pack:
@echo.
- at echo 1. Current GRASS Release Version
+ at echo 1. Current GRASS-65 Development Version
@echo.
- at echo 2. Current GRASS-6 Development Version
- at echo.
- at echo 3. Current GRASS-7 Development Version
- at echo.
-set /p SELECTION=Enter your selection (1/2/3):
+set /p SELECTION=Enter your selection (1):
if %SELECTION%==1 (
-set PACKAGE_DIR=%GRASS_RELEASE_PACKAGE_DIR%
-set GRASS_PREFIX=%GRASS_RELEASE_INSTALL_FOLDER%
+set PACKAGE_DIR=%GRASS_65_DEV_PACKAGE_DIR%
+set GRASS_PREFIX=%GRASS_65_DEV_INSTALL_FOLDER%
)
-if %SELECTION%==2 (
-set PACKAGE_DIR=%GRASS_6_DEV_PACKAGE_DIR%
-set GRASS_PREFIX=%GRASS_6_DEV_INSTALL_FOLDER%
-)
-
-if %SELECTION%==3 (
-set PACKAGE_DIR=%GRASS_7_DEV_PACKAGE_DIR%
-set GRASS_PREFIX=%GRASS_7_DEV_INSTALL_FOLDER%
-)
-
@echo.
@echo -----------------------------------------------------------------------------------------------------------------------
@echo Remove the previous Selected Package and create a new PACKAGE_DIR
More information about the grass-commit
mailing list