[GRASS-SVN] r60883 - in grass/branches/releasebranch_7_0: . mswindows

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-06-20 04:22:49 -0700 (Fri, 20 Jun 2014)
New Revision: 60883

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/mswindows/GRASS-Installer.nsi.tmpl
Log:
wingrass: fix msvcrt path (32bit) (merge r60867 from trunk)


Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Deleted: svn:mergeinfo
   - /grass/trunk:60732-60733

Modified: grass/branches/releasebranch_7_0/mswindows/GRASS-Installer.nsi.tmpl
===================================================================
--- grass/branches/releasebranch_7_0/mswindows/GRASS-Installer.nsi.tmpl	2014-06-20 11:22:01 UTC (rev 60882)
+++ grass/branches/releasebranch_7_0/mswindows/GRASS-Installer.nsi.tmpl	2014-06-20 11:22:49 UTC (rev 60883)
@@ -44,6 +44,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
@@ -965,8 +970,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-10.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"