[GRASS-SVN] r57342 - grass/branches/releasebranch_6_4/mswindows
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Aug 1 08:47:41 PDT 2013
Author: martinl
Date: 2013-08-01 08:47:41 -0700 (Thu, 01 Aug 2013)
New Revision: 57342
Modified:
grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi.tmpl
grass/branches/releasebranch_6_4/mswindows/GRASS-Packager.bat.tmpl
grass/branches/releasebranch_6_4/mswindows/env.bat
Log:
wingrass: major clean up of standalone installer
Modified: grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi.tmpl
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi.tmpl 2013-08-01 15:24:09 UTC (rev 57341)
+++ grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi.tmpl 2013-08-01 15:47:41 UTC (rev 57342)
@@ -783,7 +783,6 @@
FileWrite $0 '$\r$\n'
FileWrite $0 '# Set the PATH variable$\r$\n'
FileWrite $0 'PATH="$$GISBASE/extrabin:$$GISBASE/extralib:$$PATH"$\r$\n'
- FileWrite $0 'PATH="$$GISBASE/tcl-tk/bin:$$GISBASE/sqlite/bin:$$PATH"$\r$\n'
FileWrite $0 'export PATH$\r$\n'
FileWrite $0 '$\r$\n'
FileWrite $0 'GRASS_PAGER=more$\r$\n'
@@ -804,17 +803,13 @@
FileWrite $0 'export GRASS_HTML_BROWSER$\r$\n'
FileWrite $0 '$\r$\n'
FileWrite $0 '# Set the GRASS_PROJSHARE variable$\r$\n'
- FileWrite $0 'GRASS_PROJSHARE="$INSTALL_DIR\proj"$\r$\n'
+ FileWrite $0 'GRASS_PROJSHARE="$INSTALL_DIR\share\proj"$\r$\n'
FileWrite $0 'export GRASS_PROJSHARE$\r$\n'
FileWrite $0 '$\r$\n'
FileWrite $0 '# Set the GDAL_DATA variable$\r$\n'
FileWrite $0 'GDAL_DATA="$INSTALL_DIR\share\gdal"$\r$\n'
FileWrite $0 'export GDAL_DATA$\r$\n'
FileWrite $0 '$\r$\n'
- FileWrite $0 '# Set the PROJ_LIB variable$\r$\n'
- FileWrite $0 'PROJ_LIB="$INSTALL_DIR\proj"$\r$\n'
- FileWrite $0 'export PROJ_LIB $\r$\n'
- FileWrite $0 '$\r$\n'
FileWrite $0 '# Set the GEOTIFF_CSV variable$\r$\n'
FileWrite $0 'GEOTIFF_CSV="$INSTALL_DIR\share\epsg_csv"$\r$\n'
FileWrite $0 'export GEOTIFF_CSV$\r$\n'
@@ -865,10 +860,10 @@
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 = "/c/OSGeo4W/share/proj" i n grass at GRASS_VERSION_MAJOR@@GRASS_VERSION_MINOR at .py with $INSTDIR\share/proj
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 = "$INSTDIR\proj"' ; string to replace whole line with
+ Push 'config_projshare = "$INSTDIR\share\proj"' ; string to replace whole line with
Call ReplaceLineStr
SectionEnd
Modified: grass/branches/releasebranch_6_4/mswindows/GRASS-Packager.bat.tmpl
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/GRASS-Packager.bat.tmpl 2013-08-01 15:24:09 UTC (rev 57341)
+++ grass/branches/releasebranch_6_4/mswindows/GRASS-Packager.bat.tmpl 2013-08-01 15:47:41 UTC (rev 57342)
@@ -14,16 +14,18 @@
set PACKAGE_DIR=.\GRASS- at GRASS_VERSION_MAJOR@@GRASS_VERSION_MINOR at -Package
-set OSGEO4W_DIR=c:\osgeo4w
+set OSGEO4W_BLD_DIR=C:\OSGeo4W
+if exist C:\OSGeo4W_grass at GRASS_VERSION_MAJOR@ (
+set OSGEO4W_PKG_DIR=C:\OSGeo4W_grass at GRASS_VERSION_MAJOR@
+) else (
+set OSGEO4W_PKG_DIR=C:\OSGeo4W
+)
-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
+set GRASS_PREFIX=%OSGEO4W_BLD_DIR%\apps\grass\grass- at GRASS_VERSION_MAJOR@. at GRASS_VERSION_MINOR@. at GRASS_VERSION_RELEASE@
-set SVN_PATH=c:\Subversion
-
@echo.
@echo -----------------------------------------------------------------------------------------------------------------------
- at echo Remove the previous Selected Package and create a new PACKAGE_DIR
+ at echo Remove the previous package and create a new PACKAGE_DIR
@echo -----------------------------------------------------------------------------------------------------------------------
@echo.
@@ -32,81 +34,46 @@
@echo.
@echo -----------------------------------------------------------------------------------------------------------------------
- at echo Copy %GRASS_PREFIX% & %GRASS_BIN_PREFIX% content to PACKAGE_DIR
+ at echo Copy %GRASS_PREFIX% content to PACKAGE_DIR
@echo -----------------------------------------------------------------------------------------------------------------------
@echo.
-rem xcopy %GRASS_BIN_PREFIX%\grass at GRASS_VERSION_MAJOR@@GRASS_VERSION_MINOR at .py %PACKAGE_DIR% /S/V/F
-xcopy %GRASS_PREFIX% %PACKAGE_DIR% /S/V/F
+xcopy %GRASS_PREFIX% %PACKAGE_DIR% /S/V/F/I
@echo.
@echo -----------------------------------------------------------------------------------------------------------------------
- at echo Copy Extralibs to PACKAGE_DIR\extralib
+ at echo Copy DLL libs to PACKAGE_DIR\extralib
@echo -----------------------------------------------------------------------------------------------------------------------
@echo.
mkdir %PACKAGE_DIR%\extralib
-copy %OSGEO4W_DIR%\bin\*.dll %PACKAGE_DIR%\extralib
-del %PACKAGE_DIR%\extralib\libgrass_*6.4*.dll
-del %PACKAGE_DIR%\extralib\libgrass_*6.5*.dll
-del %PACKAGE_DIR%\extralib\Qt*4.dll
+copy %OSGEO4W_PKG_DIR%\bin\*.dll %PACKAGE_DIR%\extralib
del %PACKAGE_DIR%\extralib\msvcp*
del %PACKAGE_DIR%\extralib\msvcr*
-rem copy %OSGEO4W_DIR%\pgsql\lib\libpq.dll %PACKAGE_DIR%\extralib
@echo.
@echo -----------------------------------------------------------------------------------------------------------------------
- at echo Move GRASS libs from extralib to lib
+ at echo Copy extrabins to PACKAGE_DIR\extrabin
@echo -----------------------------------------------------------------------------------------------------------------------
@echo.
-move %PACKAGE_DIR%\extralib\libgrass_*.dll %PACKAGE_DIR%\lib
-
- at echo.
- at echo -----------------------------------------------------------------------------------------------------------------------
- at echo Copy Extrabins to PACKAGE_DIR\extrabin
- at echo -----------------------------------------------------------------------------------------------------------------------
- at echo.
-
mkdir %PACKAGE_DIR%\extrabin
mkdir %PACKAGE_DIR%\extrabin\gdalplugins
-copy %OSGEO4W_DIR%\bin\*.exe %PACKAGE_DIR%\extrabin
+copy %OSGEO4W_PKG_DIR%\bin\*.exe %PACKAGE_DIR%\extrabin
+xcopy %OSGEO4W_PKG_DIR%\bin\gdalplugins\* %PACKAGE_DIR%\extrabin\gdalplugins /S/V/F/I
+del %PACKAGE_DIR%\extrabin\apt*.exe
@echo.
@echo -----------------------------------------------------------------------------------------------------------------------
- at echo Copy SQLite content to PACKAGE_DIR\sqlite
- at echo -----------------------------------------------------------------------------------------------------------------------
- at echo.
-
-mkdir %PACKAGE_DIR%\sqlite
-mkdir %PACKAGE_DIR%\sqlite\bin
-mkdir %PACKAGE_DIR%\sqlite\include
-mkdir %PACKAGE_DIR%\sqlite\lib
-
-xcopy %OSGEO4W_DIR%\bin\sqlite3.dll %PACKAGE_DIR%\sqlite\bin /S/V/F/I
-copy %OSGEO4W_DIR%\include\btree.h %PACKAGE_DIR%\sqlite\include
-copy %OSGEO4W_DIR%\include\fts1*.h %PACKAGE_DIR%\sqlite\include
-copy %OSGEO4W_DIR%\include\hash.h %PACKAGE_DIR%\sqlite\include
-copy %OSGEO4W_DIR%\include\keywordhash.h %PACKAGE_DIR%\sqlite\include
-copy %OSGEO4W_DIR%\include\opcodes.h %PACKAGE_DIR%\sqlite\include
-copy %OSGEO4W_DIR%\include\os.h %PACKAGE_DIR%\sqlite\include
-copy %OSGEO4W_DIR%\include\os_common.h %PACKAGE_DIR%\sqlite\include
-copy %OSGEO4W_DIR%\include\pager.h %PACKAGE_DIR%\sqlite\include
-copy %OSGEO4W_DIR%\include\parse.h %PACKAGE_DIR%\sqlite\include
-copy %OSGEO4W_DIR%\include\sqlite*.h %PACKAGE_DIR%\sqlite\include
-copy %OSGEO4W_DIR%\include\vdbe.h %PACKAGE_DIR%\sqlite\include
-copy %OSGEO4W_DIR%\include\vdbeInt.h %PACKAGE_DIR%\sqlite\include
-copy %OSGEO4W_DIR%\lib\sqlite3_i.lib %PACKAGE_DIR%\sqlite\lib
-
- at echo.
- at echo -----------------------------------------------------------------------------------------------------------------------
@echo Copy shared PROJ.4 files to PACKAGE_DIR\proj
@echo -----------------------------------------------------------------------------------------------------------------------
@echo.
-xcopy %OSGEO4W_DIR%\share\proj %PACKAGE_DIR%\proj /S/V/F/I
+mkdir %PACKAGE_DIR%\share
+mkdir %PACKAGE_DIR%\share\proj
+xcopy %OSGEO4W_PKG_DIR%\share\proj %PACKAGE_DIR%\share\proj /S/V/F/I
@echo.
@echo -----------------------------------------------------------------------------------------------------------------------
@@ -114,9 +81,8 @@
@echo -----------------------------------------------------------------------------------------------------------------------
@echo.
-mkdir %PACKAGE_DIR%\share
mkdir %PACKAGE_DIR%\share\gdal
-xcopy %OSGEO4W_DIR%\share\gdal %PACKAGE_DIR%\share\gdal /S/V/F/I
+xcopy %OSGEO4W_PKG_DIR%\share\gdal %PACKAGE_DIR%\share\gdal /S/V/F/I
@echo.
@echo -----------------------------------------------------------------------------------------------------------------------
@@ -125,67 +91,25 @@
@echo.
mkdir %PACKAGE_DIR%\share\epsg_csv
-xcopy %OSGEO4W_DIR%\share\epsg_csv %PACKAGE_DIR%\share\epsg_csv /S/V/F/I
+xcopy %OSGEO4W_PKG_DIR%\share\epsg_csv %PACKAGE_DIR%\share\epsg_csv /S/V/F/I
@echo.
@echo -----------------------------------------------------------------------------------------------------------------------
- at echo Copy Tcl/Tk content to PACKAGE_DIR\tcl-tk
- at echo -----------------------------------------------------------------------------------------------------------------------
- at echo.
-
-mkdir %PACKAGE_DIR%\tcl-tk
-mkdir %PACKAGE_DIR%\tcl-tk\bin
-mkdir %PACKAGE_DIR%\tcl-tk\include
-mkdir %PACKAGE_DIR%\tcl-tk\lib
-mkdir %PACKAGE_DIR%\tcl-tk\lib\tcl8.5
-mkdir %PACKAGE_DIR%\tcl-tk\lib\tk8.5
-mkdir %PACKAGE_DIR%\tcl-tk\lib\tcl8\8.5
-
-xcopy %OSGEO4W_DIR%\bin\tclpip85.dll %PACKAGE_DIR%\tcl-tk\bin /S/V/F/I
-xcopy %OSGEO4W_DIR%\bin\tcl85.dll %PACKAGE_DIR%\tcl-tk\bin /S/V/F/I
-xcopy %OSGEO4W_DIR%\bin\tclsh.exe %PACKAGE_DIR%\tcl-tk\bin /S/V/F/I
-xcopy %OSGEO4W_DIR%\bin\tclsh85.exe %PACKAGE_DIR%\tcl-tk\bin /S/V/F/I
-xcopy %OSGEO4W_DIR%\bin\tk85.dll %PACKAGE_DIR%\tcl-tk\bin /S/V/F/I
-xcopy %OSGEO4W_DIR%\bin\wish.exe %PACKAGE_DIR%\tcl-tk\bin /S/V/F/I
-xcopy %OSGEO4W_DIR%\bin\wish85.exe %PACKAGE_DIR%\tcl-tk\bin /S/V/F/I
-
-copy %OSGEO4W_DIR%\include\tcl*.h %PACKAGE_DIR%\tcl-tk\include
-copy %OSGEO4W_DIR%\include\tk*.h %PACKAGE_DIR%\tcl-tk\include
-copy %OSGEO4W_DIR%\include\tommath_class.h %PACKAGE_DIR%\tcl-tk\include
-copy %OSGEO4W_DIR%\include\tommath_superclass.h %PACKAGE_DIR%\tcl-tk\include
-copy %OSGEO4W_DIR%\include\ttkDecls.h %PACKAGE_DIR%\tcl-tk\include
-
-copy %OSGEO4W_DIR%\lib\tcl8.5\*.tcl %PACKAGE_DIR%\tcl-tk\lib\tcl8.5
-copy %OSGEO4W_DIR%\lib\tcl8.5\tclIndex %PACKAGE_DIR%\tcl-tk\lib\tcl8.5
-
-copy %OSGEO4W_DIR%\lib\tk8.5\*.tcl %PACKAGE_DIR%\tcl-tk\lib\tk8.5
-copy %OSGEO4W_DIR%\lib\tk8.5\tclIndex %PACKAGE_DIR%\tcl-tk\lib\tk8.5
-
-xcopy %OSGEO4W_DIR%\lib\tk8.5\ttk %PACKAGE_DIR%\tcl-tk\lib\tk8.5\ttk /S/V/F/I
-
-xcopy %OSGEO4W_DIR%\lib\tcl8\8.5 %PACKAGE_DIR%\tcl-tk\lib\tcl8\8.5 /S/V/F/I
-
- at echo.
- at echo -----------------------------------------------------------------------------------------------------------------------
@echo Copy MSYS files to PACKAGE_DIR\msys
@echo -----------------------------------------------------------------------------------------------------------------------
@echo.
mkdir %PACKAGE_DIR%\msys
-copy %OSGEO4W_DIR%\apps\msys\* %PACKAGE_DIR%\msys
+xcopy %OSGEO4W_PKG_DIR%\apps\msys\* %PACKAGE_DIR%\msys /S/V/F/I
-xcopy %OSGEO4W_DIR%\apps\msys\bin %PACKAGE_DIR%\msys\bin /S/V/F/I
-xcopy %OSGEO4W_DIR%\apps\msys\doc %PACKAGE_DIR%\msys\doc /S/V/F/I
-xcopy %OSGEO4W_DIR%\apps\msys\etc %PACKAGE_DIR%\msys\etc /S/V/F/I
-xcopy %OSGEO4W_DIR%\apps\msys\info %PACKAGE_DIR%\msys\info /S/V/F/I
-xcopy %OSGEO4W_DIR%\apps\msys\lib %PACKAGE_DIR%\msys\lib /S/V/F/I
-xcopy %OSGEO4W_DIR%\apps\msys\man %PACKAGE_DIR%\msys\man /S/V/F/I
-del %PACKAGE_DIR%\msys\etc\fstab
-rem delete msys.bat from osgeo4w because there is an adaption (for spaces in installation path) written by GRASS-Installer.nsi
+rem delete msys.bat and fstab from osgeo4w because there is an
+rem adaption (for spaces in installation path) written by
+rem GRASS-Installer.nsi
+
del %PACKAGE_DIR%\msys\msys.bat
+del %PACKAGE_DIR%\msys\etc\fstab
-
@echo.
@echo -----------------------------------------------------------------------------------------------------------------------
@echo Copy Python content to PACKAGE_DIR\Python27
@@ -194,24 +118,25 @@
mkdir %PACKAGE_DIR%\Python27
-copy %OSGEO4W_DIR%\apps\Python27\* %PACKAGE_DIR%\Python27
+xcopy %OSGEO4W_PKG_DIR%\apps\Python27\* %PACKAGE_DIR%\Python27 /S/V/F/I
-xcopy %OSGEO4W_DIR%\apps\Python27\DLLs %PACKAGE_DIR%\Python27\DLLs /S/V/F/I
-xcopy %OSGEO4W_DIR%\apps\Python27\include %PACKAGE_DIR%\Python27\include /S/V/F/I
-xcopy %OSGEO4W_DIR%\apps\Python27\Lib %PACKAGE_DIR%\Python27\Lib /S/V/F/I
-xcopy %OSGEO4W_DIR%\apps\Python27\libs %PACKAGE_DIR%\Python27\libs /S/V/F/I
-xcopy %OSGEO4W_DIR%\apps\Python27\Scripts %PACKAGE_DIR%\Python27\Scripts /S/V/F/I
-
@echo.
@echo -----------------------------------------------------------------------------------------------------------------------
- at echo Copy Subversion content to PACKAGE_DIR\extrabin & PACKAGE_DIR\extralib
+ at echo Copy Tcl/Tk content to PACKAGE_DIR\lib
@echo -----------------------------------------------------------------------------------------------------------------------
@echo.
-copy %SVN_PATH%\svn.exe %PACKAGE_DIR%\extrabin
-copy %SVN_PATH%\*.dll %PACKAGE_DIR%\extralib
+mkdir %PACKAGE_DIR%\lib\tcl8.5
+mkdir %PACKAGE_DIR%\lib\tk8.5
+copy %OSGEO4W_PKG_DIR%\lib\tcl8.5\*.tcl %PACKAGE_DIR%\lib\tcl8.5
+copy %OSGEO4W_PKG_DIR%\lib\tcl8.5\tclIndex %PACKAGE_DIR%\lib\tcl8.5
+copy %OSGEO4W_PKG_DIR%\lib\tk8.5\*.tcl %PACKAGE_DIR%\lib\tk8.5
+copy %OSGEO4W_PKG_DIR%\lib\tk8.5\tclIndex %PACKAGE_DIR%\lib\tk8.5
+
+xcopy %OSGEO4W_PKG_DIR%\lib\tk8.5\ttk %PACKAGE_DIR%\lib\tk8.5\ttk /S/V/F/I
+
@echo.
@echo -----------------------------------------------------------------------------------------------------------------------
@echo Copy env.bat
Modified: grass/branches/releasebranch_6_4/mswindows/env.bat
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/env.bat 2013-08-01 15:24:09 UTC (rev 57341)
+++ grass/branches/releasebranch_6_4/mswindows/env.bat 2013-08-01 15:47:41 UTC (rev 57342)
@@ -1,18 +1,18 @@
rem Environmental variables for GRASS stand-alone installer
set GRASS_WISH=%GISBASE%\extrabin\wish.exe
-set GRASS_PYTHON=%GISBASE%\extrabin\python.exe
-set GRASS_PROJSHARE=%GISBASE%\proj
-set GRASS_HTML_BROWSER=explorer
set GRASS_SH=%GISBASE%\msys\bin\sh.exe
set GRASS_PAGER=more
+set GRASS_HTML_BROWSER=explorer
+
+set GRASS_PYTHON=%GISBASE%\extrabin\python.exe
set PYTHONHOME=%GISBASE%\Python27
+
+set GRASS_PROJSHARE=%GISBASE%\share\proj
set GDAL_DATA=%GISBASE%\share\gdal
-set PROJ_LIB=%GISBASE%\proj
set GEOTIFF_CSV=%GISBASE%\share\epsg_csv
set PATH=%GISBASE%\msys\bin;%PATH%
set PATH=%GISBASE%\extrabin;%GISBASE%\extralib;%PATH%
-set PATH=%GISBASE%\tcl-tk\bin;%GISBASE%\sqlite\bin;%PATH%
set PATH=%GISBASE%\bin;%PATH%
More information about the grass-commit
mailing list