[GRASS-SVN] r53615 - grass/trunk/mswindows

[svn_grass at osgeo.org]

Author: martinl
Date: 2012-10-30 04:18:46 -0700 (Tue, 30 Oct 2012)
New Revision: 53615

Modified:
   grass/trunk/mswindows/GRASS-Installer.nsi.tmpl
   grass/trunk/mswindows/GRASS-Packager.bat.tmpl
   grass/trunk/mswindows/Makefile
Log:
wingrass: define osgeo4w dir postfix

Modified: grass/trunk/mswindows/GRASS-Installer.nsi.tmpl
===================================================================
--- grass/trunk/mswindows/GRASS-Installer.nsi.tmpl	2012-10-30 10:28:40 UTC (rev 53614)
+++ grass/trunk/mswindows/GRASS-Installer.nsi.tmpl	2012-10-30 11:18:46 UTC (rev 53615)
@@ -10,11 +10,11 @@
 
 ;Define the source path of the demolocation files
 
-!define DEMOLOCATION_PATH "c:\osgeo4w\usr\src\grass_trunk\demolocation"
+!define DEMOLOCATION_PATH "c:\OSGeo4W at OSGEO4W_DIR_POSTFIX@\usr\src\grass_trunk\demolocation"
 
 ;Define the source of the patched msys.bat
 
-!define MSYS_BATCH "C:\OSGeo4W\usr\src\grass_trunk\mswindows\osgeo4w\msys.bat"
+!define MSYS_BATCH "C:\OSGeo4W at OSGEO4W_DIR_POSTFIX@\usr\src\grass_trunk\mswindows\osgeo4w\msys.bat"
 
 ;Select if you are building a "Development Version" (Devel) or a "Release Version" (Release) of the GRASS Installer
 
@@ -874,15 +874,15 @@
 	      done_create_grass_rc:
 	${EndIf}
 
-	;replace gisbase = "/c/OSGeo4W/apps/grass/grass- at GRASS_VERSION_MAJOR@. at GRASS_VERSION_MINOR@. at GRASS_VERSION_RELEASE@" in grass at GRASS_VERSION_MAJOR@@GRASS_VERSION_MINOR at .py with $INSTDIR
+	;replace gisbase
 	Push "$INSTDIR\etc\grass at GRASS_VERSION_MAJOR@@GRASS_VERSION_MINOR at .py" ; file to modify
-	Push 'gisbase = "/c/OSGeo4W/apps/grass/grass- at GRASS_VERSION_MAJOR@. at GRASS_VERSION_MINOR@. at GRASS_VERSION_RELEASE@"' ; string that a line must begin with *WS Sensitive*
+	Push 'gisbase = "/c/OSGeo4W at OSGEO4W_DIR_POSTFIX@/apps/grass/grass- at GRASS_VERSION_MAJOR@. at GRASS_VERSION_MINOR@. at GRASS_VERSION_RELEASE@"' ; string that a line must begin with *WS Sensitive*
 	Push 'gisbase = "$INSTDIR"' ; string to replace whole line with
 	Call ReplaceLineStr
 	
-	;replace config_projshare = "/c/OSGeo4W/share/proj" i n grass at GRASS_VERSION_MAJOR@@GRASS_VERSION_MINOR at .py with $INSTDIR\proj
+	;replace config_projshare
 	Push "$INSTDIR\etc\grass at GRASS_VERSION_MAJOR@@GRASS_VERSION_MINOR at .py" ; file to modify
-	Push 'config_projshare = "/c/OSGeo4W/share/proj"' ; string that a line must begin with *WS Sensitive*
+	Push 'config_projshare = "/c/OSGeo4W at OSGEO4W_DIR_POSTFIX@/share/proj"' ; string that a line must begin with *WS Sensitive*
 	Push 'config_projshare = "$INSTDIR\proj"' ; string to replace whole line with
 	Call ReplaceLineStr
                  

Modified: grass/trunk/mswindows/GRASS-Packager.bat.tmpl
===================================================================
--- grass/trunk/mswindows/GRASS-Packager.bat.tmpl	2012-10-30 10:28:40 UTC (rev 53614)
+++ grass/trunk/mswindows/GRASS-Packager.bat.tmpl	2012-10-30 11:18:46 UTC (rev 53615)
@@ -14,7 +14,7 @@
 
 set PACKAGE_DIR=.\GRASS- at GRASS_VERSION_MAJOR@@GRASS_VERSION_MINOR at -Package
 
-set OSGEO4W_DIR=c:\osgeo4w
+set OSGEO4W_DIR=c:\OSGeo4W at OSGEO4W_DIR_POSTFIX@
 
 set GRASS_PREFIX=%OSGEO4W_DIR%\apps\grass\grass- at GRASS_VERSION_MAJOR@. at GRASS_VERSION_MINOR@. at GRASS_VERSION_RELEASE@
 set GRASS_BIN_PREFIX=%OSGEO4W_DIR%\bin

Modified: grass/trunk/mswindows/Makefile
===================================================================
--- grass/trunk/mswindows/Makefile	2012-10-30 10:28:40 UTC (rev 53614)
+++ grass/trunk/mswindows/Makefile	2012-10-30 11:18:46 UTC (rev 53615)
@@ -4,6 +4,10 @@
 
 EXTRA_CLEAN_FILES = GRASS-Packager.bat GRASS-Installer.nsi
 
+# OSGeo4W directory postfix, separate OSGeo4W installations are used
+# for building GRASS 6.x and 7.x
+OSGEO4W_DIR_POSTFIX = '_g7'
+
 ifneq ($(MINGW),)
 default: GRASS-Packager.bat GRASS-Installer.nsi
 endif	
@@ -13,6 +17,7 @@
 	-e 's#@GRASS_VERSION_MAJOR@#$(GRASS_VERSION_MAJOR)#' \
 	-e 's#@GRASS_VERSION_MINOR@#$(GRASS_VERSION_MINOR)#' \
 	-e 's#@GRASS_VERSION_RELEASE@#$(GRASS_VERSION_RELEASE)#' \
+	-e 's#@OSGEO4W_DIR_POSTFIX@#$(OSGEO4W_DIR_POSTFIX)#' \
 	$< > $@
 
 GRASS-Installer.nsi: GRASS-Installer.nsi.tmpl
@@ -21,4 +26,5 @@
 	-e 's#@GRASS_VERSION_MAJOR@#$(GRASS_VERSION_MAJOR)#' \
 	-e 's#@GRASS_VERSION_MINOR@#$(GRASS_VERSION_MINOR)#' \
 	-e 's#@GRASS_VERSION_RELEASE@#$(GRASS_VERSION_RELEASE)#' \
+	-e 's#@OSGEO4W_DIR_POSTFIX@#$(OSGEO4W_DIR_POSTFIX)#' \
 	$< > $@