[GRASS-SVN] r60884 - grass/branches/develbranch_6/mswindows
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Jun 20 04:24:25 PDT 2014
Author: martinl
Date: 2014-06-20 04:24:25 -0700 (Fri, 20 Jun 2014)
New Revision: 60884
Modified:
grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi.tmpl
Log:
wingrass: fix msvcrt path (32bit) (merge r60867 from relbr64)
Modified: grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi.tmpl
===================================================================
--- grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi.tmpl 2014-06-20 11:22:49 UTC (rev 60883)
+++ grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi.tmpl 2014-06-20 11:24:25 UTC (rev 60884)
@@ -40,6 +40,11 @@
!define GRASS_COMMAND "grass at GRASS_VERSION_MAJOR@@GRASS_VERSION_MINOR at svn"
!endif
+; Platform
+; TODO: Support 64bit (x86_64)
+; Related problem: hardcoded C:\OSGeo4W (X C:\OSGeo4W64)
+!define PLATFORM "x86"
+
;----------------------------------------------------------------------------------------------------------------------------
;Don't modify the following lines
@@ -948,8 +953,8 @@
;Set the size (in KB) of the unpacked archive file
AddSize 13500
- StrCpy $HTTP_PATH "http://download.osgeo.org/osgeo4w/release/msvcrt/"
- StrCpy $ARCHIVE_NAME "msvcrt-1.0.1-8.tar.bz2"
+ StrCpy $HTTP_PATH "http://download.osgeo.org/osgeo4w/${PLATFORM}/release/msvcrt/"
+ StrCpy $ARCHIVE_NAME "msvcrt-1.0.1-11.tar.bz2"
StrCpy $EXTENDED_ARCHIVE_NAME "Microsoft Visual C++ Redistributable Packages"
StrCpy $ORIGINAL_UNTAR_FOLDER "install_msruntime"
More information about the grass-commit
mailing list