[GRASS-SVN] r67141 - grass/branches/releasebranch_7_0/mswindows

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-12-15 02:32:02 -0800 (Tue, 15 Dec 2015)
New Revision: 67141

Modified:
   grass/branches/releasebranch_7_0/mswindows/GRASS-Installer.nsi.tmpl
Log:
winGRASS installer: fix instalation dir (32bit vs 64bit)
                    fix msvcrt path (32bit vs 64bit)
                    (merge r67139:40 from trunk)


Modified: grass/branches/releasebranch_7_0/mswindows/GRASS-Installer.nsi.tmpl
===================================================================
--- grass/branches/releasebranch_7_0/mswindows/GRASS-Installer.nsi.tmpl	2015-12-15 10:23:48 UTC (rev 67140)
+++ grass/branches/releasebranch_7_0/mswindows/GRASS-Installer.nsi.tmpl	2015-12-15 10:32:02 UTC (rev 67141)
@@ -38,12 +38,16 @@
 
 ;----------------------------------------------------------------------------------------------------------------------------
 
-;Platform
+;Define Platform and installation folder
 
+;----------------------------------------------------------------------------------------------------------------------------
+
 !if "@ARCH@" == "x86_64-w64-mingw32"
     !define PLATFORM "x86_64"
+    InstallDir "$PROGRAMFILES64\${GRASS_BASE}"
 !else
     !define PLATFORM "x86"
+    InstallDir "$PROGRAMFILES32\${GRASS_BASE}"
 !endif
 
 ;----------------------------------------------------------------------------------------------------------------------------
@@ -95,9 +99,6 @@
 ;Name of the output file (installer executable)
 OutFile "${INSTALLER_NAME}"
 
-;Define installation folder
-InstallDir "$PROGRAMFILES\${GRASS_BASE}"
-
 ;Request application privileges for Windows
 RequestExecutionLevel admin
 
@@ -848,7 +849,11 @@
 	AddSize 13500
 	
 	StrCpy $HTTP_PATH "http://download.osgeo.org/osgeo4w/${PLATFORM}/release/msvcrt/"
-	StrCpy $ARCHIVE_NAME "msvcrt-1.0.1-12.tar.bz2"
+        !if ${PLATFORM} == "x86_64"
+            StrCpy $ARCHIVE_NAME "msvcrt-1.0.1-8.tar.bz2"
+        !else
+            StrCpy $ARCHIVE_NAME "msvcrt-1.0.1-12.tar.bz2"
+        !endif
 	StrCpy $EXTENDED_ARCHIVE_NAME "Microsoft Visual C++ Redistributable Packages"
 	StrCpy $ORIGINAL_UNTAR_FOLDER "install_msruntime"