[GRASS-SVN] r57694 - grass/branches/releasebranch_6_4/mswindows

[svn_grass at osgeo.org]

Author: martinl
Date: 2013-09-15 05:04:29 -0700 (Sun, 15 Sep 2013)
New Revision: 57694

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: copy DLL files to extrabin, remove extralib from standalone installer
          (merge r57688 from devbr6)


Modified: grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi.tmpl
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi.tmpl	2013-09-15 11:55:40 UTC (rev 57693)
+++ grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi.tmpl	2013-09-15 12:04:29 UTC (rev 57694)
@@ -542,7 +542,7 @@
 	FileWrite $0 'set GISBASE=$INSTALL_DIR$\r$\n'
 	FileWrite $0 '$\r$\n'
 	FileWrite $0 'rem set path to freetype dll$\r$\n'
-	FileWrite $0 'set FREETYPEBASE=$INSTALL_DIR\extralib;$INSTALL_DIR\msys\bin;$INSTALL_DIR\lib$\r$\n'
+	FileWrite $0 'set FREETYPEBASE=$INSTALL_DIR\extrabin;$INSTALL_DIR\msys\bin;$INSTALL_DIR\lib$\r$\n'
 	FileWrite $0 '$\r$\n'
 	FileWrite $0 'rem set dependecies path$\r$\n'
 	FileWrite $0 'set PATH=%FREETYPEBASE%;%PATH%$\r$\n'
@@ -782,7 +782,7 @@
 	FileWrite $0 'export GISBASE$\r$\n'
 	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/extrabin:$$PATH"$\r$\n'
 	FileWrite $0 'export PATH$\r$\n'
 	FileWrite $0 '$\r$\n'
 	FileWrite $0 'GRASS_PAGER=more$\r$\n'
@@ -917,7 +917,7 @@
 	ExecWait "$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\vcredist_2005_x86.exe /q"
 	ExecWait "$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\vcredist_2008_x86.exe /q"	
 	ExecWait "$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\vcredist_2010_x86.exe /q"
-	CopyFiles "$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\*.dll" "$INSTDIR\extralib"
+	CopyFiles "$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\*.dll" "$INSTDIR\extrabin"
 	Delete "$TEMP\$ARCHIVE_NAME"
 	RMDir /r "$TEMP\$ORIGINAL_UNTAR_FOLDER"
 	;the following doesn't work. Maybe because the installer is still running?

Modified: grass/branches/releasebranch_6_4/mswindows/GRASS-Packager.bat.tmpl
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/GRASS-Packager.bat.tmpl	2013-09-15 11:55:40 UTC (rev 57693)
+++ grass/branches/releasebranch_6_4/mswindows/GRASS-Packager.bat.tmpl	2013-09-15 12:04:29 UTC (rev 57694)
@@ -42,18 +42,6 @@
 
 @echo.
 @echo -----------------------------------------------------------------------------------------------------------------------
- at echo Copy DLL libs to PACKAGE_DIR\extralib
- at echo -----------------------------------------------------------------------------------------------------------------------
- at echo.
-
-mkdir %PACKAGE_DIR%\extralib
-
-copy %OSGEO4W_PKG_DIR%\bin\*.dll %PACKAGE_DIR%\extralib
-del %PACKAGE_DIR%\extralib\msvcp*
-del %PACKAGE_DIR%\extralib\msvcr*
-
- at echo.
- at echo -----------------------------------------------------------------------------------------------------------------------
 @echo Copy extrabins to PACKAGE_DIR\extrabin
 @echo -----------------------------------------------------------------------------------------------------------------------
 @echo.
@@ -61,9 +49,11 @@
 mkdir %PACKAGE_DIR%\extrabin
 mkdir %PACKAGE_DIR%\extrabin\gdalplugins
 
-copy %OSGEO4W_PKG_DIR%\bin\*.exe %PACKAGE_DIR%\extrabin
+copy %OSGEO4W_PKG_DIR%\bin\* %PACKAGE_DIR%\extrabin
 xcopy %OSGEO4W_PKG_DIR%\bin\gdalplugins\* %PACKAGE_DIR%\extrabin\gdalplugins /S/V/F/I
-del %PACKAGE_DIR%\extrabin\apt*.exe
+del %PACKAGE_DIR%\extrabin\apt*
+del %PACKAGE_DIR%\extrabin\msvcp*
+del %PACKAGE_DIR%\extrabin\msvcr*
 
 @echo.
 @echo -----------------------------------------------------------------------------------------------------------------------

Modified: grass/branches/releasebranch_6_4/mswindows/env.bat
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/env.bat	2013-09-15 11:55:40 UTC (rev 57693)
+++ grass/branches/releasebranch_6_4/mswindows/env.bat	2013-09-15 12:04:29 UTC (rev 57694)
@@ -18,5 +18,5 @@
 set GEOTIFF_CSV=%GISBASE%\share\epsg_csv
 
 set PATH=%GISBASE%\msys\bin;%PATH%
-set PATH=%GISBASE%\extrabin;%GISBASE%\extralib;%PATH%
+set PATH=%GISBASE%\extrabin;%PATH%
 set PATH=%GISBASE%\bin;%PATH%