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

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-09-06 09:35:21 -0700 (Tue, 06 Sep 2011)
New Revision: 48172

Modified:
   grass-addons/tools/wingrass-packager/grass_compile.sh
   grass-addons/tools/wingrass-packager/grass_packager.bat
Log:
winGRASS: update for osgeo4w packaging

Modified: grass-addons/tools/wingrass-packager/grass_compile.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_compile.sh	2011-09-06 16:33:51 UTC (rev 48171)
+++ grass-addons/tools/wingrass-packager/grass_compile.sh	2011-09-06 16:35:21 UTC (rev 48172)
@@ -14,15 +14,18 @@
     cd $SRC/$1
     rm -f mswindows/osgeo4w/configure-stamp
     svn up || (svn cleanup && svn up)
-    ./mswindows/osgeo4w/package.sh
+    ./mswindows/osgeo4w/package.sh $2
 }
 
 export PATH=$PATH:/c/OSGeo4W/apps/msys/bin
 
+# empty for native installer
+PACKAGE=$1
+
 update grass_addons
 
-compile grass64_release
-compile grass6_devel
-compile grass_trunk
+compile grass64_release $PACKAGE
+compile grass6_devel $PACKAGE
+compile grass_trunk $PACKAGE
 
 exit 0

Modified: grass-addons/tools/wingrass-packager/grass_packager.bat
===================================================================
--- grass-addons/tools/wingrass-packager/grass_packager.bat	2011-09-06 16:33:51 UTC (rev 48171)
+++ grass-addons/tools/wingrass-packager/grass_packager.bat	2011-09-06 16:35:21 UTC (rev 48172)
@@ -6,15 +6,19 @@
 rmdir /s /q C:\OSGeo4W\apps\grass\grass-6.4.2svn
 rmdir /s /q C:\OSGeo4W\apps\grass\grass-6.5.svn
 rmdir /s /q C:\OSGeo4W\apps\grass\grass-7.0.svn
-C:\OSGeo4W\apps\msys\bin\bash.exe C:\Users\landa\grass_packager\grass_compile.sh
+rem native & osgeo4w
+C:\OSGeo4W\apps\msys\bin\bash.exe C:\Users\landa\grass_packager\grass_compile.sh 1
 
 rem Preparation
 if exist .\grass64 rmdir /S/Q .\grass64
 xcopy C:\OSGeo4W\usr\src\grass64_release\mswindows\* .\grass64 /S/V/F/I
+xcopy C:\OSGeo4W\usr\src\grass64_release\package\grass64\* .\grass64\ /S/V/F/I
 if exist .\grass65 rmdir /S/Q .\grass65
 xcopy C:\OSGeo4W\usr\src\grass6_devel\mswindows\* .\grass65 /S/V/F/I
+xcopy C:\OSGeo4W\usr\src\grass6_devel\package\grass65\* .\grass65\ /S/V/F/I
 if exist .\grass70 rmdir /S/Q .\grass70
 xcopy C:\OSGeo4W\usr\src\grass_trunk\mswindows\* .\grass70 /S/V/F/I
+xcopy C:\OSGeo4W\usr\src\grass_trunk\package\grass70\* .\grass70\ /S/V/F/I
 
 cd .\grass64
 call .\GRASS-Packager.bat