[GRASS-SVN] r63438 - grass-addons/tools/wingrass-packager

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-12-08 04:28:54 -0800 (Mon, 08 Dec 2014)
New Revision: 63438

Modified:
   grass-addons/tools/wingrass-packager/grass_compile.sh
   grass-addons/tools/wingrass-packager/grass_packager.bat
   grass-addons/tools/wingrass-packager/grass_packager_release.bat
Log:
wingrass-packager: write also log for nsi output

Modified: grass-addons/tools/wingrass-packager/grass_compile.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_compile.sh	2014-12-08 12:22:59 UTC (rev 63437)
+++ grass-addons/tools/wingrass-packager/grass_compile.sh	2014-12-08 12:28:54 UTC (rev 63438)
@@ -41,7 +41,7 @@
     compile grass70_release 70-dev 
     compile grass_trunk     71-dev
 else
-    compile grass$1         $1
+    compile grass$1         $2
 fi
 
 exit 0

Modified: grass-addons/tools/wingrass-packager/grass_packager.bat
===================================================================
--- grass-addons/tools/wingrass-packager/grass_packager.bat	2014-12-08 12:22:59 UTC (rev 63437)
+++ grass-addons/tools/wingrass-packager/grass_packager.bat	2014-12-08 12:28:54 UTC (rev 63438)
@@ -31,16 +31,16 @@
 REM Prepare packages
 REM
 cd .\grass64
-call .\GRASS-Packager.bat
+call .\GRASS-Packager.bat > .\GRASS-Packager.log
 cd ..
 REM cd .\grass65
 REM call .\GRASS-Packager.bat
 REM cd ..
 cd .\grass70
-call .\GRASS-Packager.bat
+call .\GRASS-Packager.bat > .\GRASS-Packager.log
 cd ..
 cd .\grass71
-call .\GRASS-Packager.bat
+call .\GRASS-Packager.bat > .\GRASS-Packager.log
 cd ..
 
 C:\OSGeo4W\apps\msys\bin\sh.exe .\grass_osgeo4w.sh
@@ -49,10 +49,10 @@
 REM
 REM Create standalone installer
 REM
-C:\DevTools\makensis.exe .\grass64\GRASS-Installer.nsi
+C:\DevTools\makensis.exe .\grass64\GRASS-Installer.nsi > .\grass64\GRASS-Installer.log
 REM C:\DevTools\makensis.exe .\grass65\GRASS-Installer.nsi
-C:\DevTools\makensis.exe .\grass70\GRASS-Installer.nsi
-C:\DevTools\makensis.exe .\grass71\GRASS-Installer.nsi
+C:\DevTools\makensis.exe .\grass70\GRASS-Installer.nsi > .\grass70\GRASS-Installer.log
+C:\DevTools\makensis.exe .\grass71\GRASS-Installer.nsi > .\grass71\GRASS-Installer.log
 
 REM
 REM Create md5sum files

Modified: grass-addons/tools/wingrass-packager/grass_packager_release.bat
===================================================================
--- grass-addons/tools/wingrass-packager/grass_packager_release.bat	2014-12-08 12:22:59 UTC (rev 63437)
+++ grass-addons/tools/wingrass-packager/grass_packager_release.bat	2014-12-08 12:28:54 UTC (rev 63438)
@@ -16,7 +16,7 @@
 rem Compile GRASS versions
 rmdir /s /q C:\OSGeo4W\apps\grass\grass-%MAJOR%.%MINOR%.%PATCH%
 rem native & osgeo4w
-C:\OSGeo4W\apps\msys\bin\bash.exe C:\Users\landa\grass_packager\grass_compile.sh %MAJOR%%MINOR%%PATCH%
+C:\OSGeo4W\apps\msys\bin\bash.exe C:\Users\landa\grass_packager\grass_compile.sh %MAJOR%%MINOR%%PATCH% %MAJOR%%MINOR%%PATCH%
 
 rem Preparation
 if exist .\grass%MAJOR%%MINOR%%PATCH% rmdir /S/Q .\grass%MAJOR%%MINOR%%PATCH%