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

[svn_grass at osgeo.org]

Author: martinl
Date: 2013-07-28 09:00:47 -0700 (Sun, 28 Jul 2013)
New Revision: 57313

Modified:
   grass-addons/tools/wingrass-packager/grass_addons.sh
   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
   grass-addons/tools/wingrass-packager/grass_svn_info.sh
   grass-addons/tools/wingrass-packager/osgeo4w_upgrade.bat
Log:
wingrass: update building environment for new mingw package

Modified: grass-addons/tools/wingrass-packager/grass_addons.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_addons.sh	2013-07-28 15:21:12 UTC (rev 57312)
+++ grass-addons/tools/wingrass-packager/grass_addons.sh	2013-07-28 16:00:47 UTC (rev 57313)
@@ -3,7 +3,6 @@
 
 SVN_PATH=/c/osgeo4w/usr/src/grass_addons
 GISBASE_PATH=/c/osgeo4w/usr/src
-GISBASE_G7_PATH=/c/osgeo4w_g7/usr/src
 ADDON_PATH=/c/Users/landa/grass_packager
 
 PATH_ORIG=`echo $PATH`
@@ -59,7 +58,7 @@
     compile $SVN_PATH/grass6 $GISBASE_PATH/grass643RC3     $ADDON_PATH/grass643RC3/addons
     compile $SVN_PATH/grass6 $GISBASE_PATH/grass64_release $ADDON_PATH/grass64/addons
     compile $SVN_PATH/grass6 $GISBASE_PATH/grass6_devel    $ADDON_PATH/grass65/addons
-    compile $SVN_PATH/grass7 $GISBASE_G7_PATH/grass_trunk  $ADDON_PATH/grass70/addons _g7
+    compile $SVN_PATH/grass7 $GISBASE_PATH/grass_trunk     $ADDON_PATH/grass70/addons
 else
     compile $SVN_PATH/grass6 $GISBASE_PATH/grass$1         $ADDON_PATH/grass$1/addons
 fi

Modified: grass-addons/tools/wingrass-packager/grass_compile.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_compile.sh	2013-07-28 15:21:12 UTC (rev 57312)
+++ grass-addons/tools/wingrass-packager/grass_compile.sh	2013-07-28 16:00:47 UTC (rev 57313)
@@ -36,9 +36,9 @@
 
 if test -z $1 ; then
     # dev packages
-    compile grass64_release 64-dev
-    compile grass6_devel    65-dev
-    compile grass_trunk     70-dev _g7
+    compile grass64_release 64-dev 
+    compile grass6_devel    65-dev 
+    compile grass_trunk     70-dev
 else
     compile grass$1         $1
 fi

Modified: grass-addons/tools/wingrass-packager/grass_packager.bat
===================================================================
--- grass-addons/tools/wingrass-packager/grass_packager.bat	2013-07-28 15:21:12 UTC (rev 57312)
+++ grass-addons/tools/wingrass-packager/grass_packager.bat	2013-07-28 16:00:47 UTC (rev 57313)
@@ -5,7 +5,7 @@
 rem Compile GRASS versions
 rmdir /s /q C:\OSGeo4W\apps\grass\grass-6.4.3svn
 rmdir /s /q C:\OSGeo4W\apps\grass\grass-6.5.svn
-rmdir /s /q C:\OSGeo4W_g7\apps\grass\grass-7.0.svn
+rmdir /s /q C:\OSGeo4W\apps\grass\grass-7.0.svn
 rem native & osgeo4w
 C:\OSGeo4W\apps\msys\bin\bash.exe C:\Users\landa\grass_packager\grass_compile.sh
 
@@ -15,7 +15,7 @@
 if exist .\grass65 rmdir /S/Q .\grass65
 xcopy C:\OSGeo4W\usr\src\grass6_devel\mswindows\* .\grass65 /S/V/F/I
 if exist .\grass70 rmdir /S/Q .\grass70
-xcopy C:\OSGeo4W_g7\usr\src\grass_trunk\mswindows\* .\grass70 /S/V/F/I
+xcopy C:\OSGeo4W\usr\src\grass_trunk\mswindows\* .\grass70 /S/V/F/I
 
 cd .\grass64
 call .\GRASS-Packager.bat

Modified: grass-addons/tools/wingrass-packager/grass_packager_release.bat
===================================================================
--- grass-addons/tools/wingrass-packager/grass_packager_release.bat	2013-07-28 15:21:12 UTC (rev 57312)
+++ grass-addons/tools/wingrass-packager/grass_packager_release.bat	2013-07-28 16:00:47 UTC (rev 57313)
@@ -10,7 +10,7 @@
 
 set MAJOR=6
 set MINOR=4
-set PATCH=3RC4
+set PATCH=3
 set REV=1
 
 rem Compile GRASS versions

Modified: grass-addons/tools/wingrass-packager/grass_svn_info.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_svn_info.sh	2013-07-28 15:21:12 UTC (rev 57312)
+++ grass-addons/tools/wingrass-packager/grass_svn_info.sh	2013-07-28 16:00:47 UTC (rev 57313)
@@ -7,7 +7,7 @@
 
 function update {
     if [ "$1" = "grass_trunk" ] ; then
-	SRC_PATH=/c/osgeo4w_g7/$SRC/$1
+	SRC_PATH=/c/osgeo4w/$SRC/$1
     else
 	SRC_PATH=/c/osgeo4w/$SRC/$1
     fi

Modified: grass-addons/tools/wingrass-packager/osgeo4w_upgrade.bat
===================================================================
--- grass-addons/tools/wingrass-packager/osgeo4w_upgrade.bat	2013-07-28 15:21:12 UTC (rev 57312)
+++ grass-addons/tools/wingrass-packager/osgeo4w_upgrade.bat	2013-07-28 16:00:47 UTC (rev 57313)
@@ -5,7 +5,7 @@
 set PATH_ORIG=%PATH%
 
 rem
-rem OSGeo4W (GRASS 6)
+rem OSGeo4W (building environment)
 rem
 set PATH=C:\OSGeo4W\bin;%PATH_ORIG%
 call o4w_env.bat
@@ -14,18 +14,9 @@
 apt upgrade
 
 rem
-rem OSGeo4W (GRASS 7)
+rem OSGeo4W (dev)
 rem
-set PATH=C:\OSGeo4W_g7\bin;%PATH_ORIG%
-call o4w_env.bat
 
-apt update
-apt upgrade
-
-rem
-rem OSGeo4W (Dev)
-rem
-
 set PATH=C:\OSGeo4W_dev\bin;%PATH_ORIG%
 call o4w_env.bat