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

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-11-30 15:58:22 -0800 (Wed, 30 Nov 2011)
New Revision: 49448

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_svn_info.sh
Log:
wingrass packager support scripts: addons update

Modified: grass-addons/tools/wingrass-packager/grass_addons.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_addons.sh	2011-11-30 23:14:58 UTC (rev 49447)
+++ grass-addons/tools/wingrass-packager/grass_addons.sh	2011-11-30 23:58:22 UTC (rev 49448)
@@ -6,15 +6,36 @@
 ADDON_PREFIX=/c/Users/landa/grass_packager
 
 cd $SVN_PATH
-#svn up
+svn up
+cp -r database display general gui imagery misc postscript raster \
+    vector grass6/
 
 function compile {
     path=`echo $PATH`
-    export PATH=$PATH:/c/OSGeo4W/apps/msys/bin:$2/bin:$2/scripts    
-    ./tools/addons/compile.sh $1 $2 $3
+    export PATH=$PATH:/c/OSGeo4W/apps/msys/bin:$2/bin:$2/scripts
+    rm -rf $3
+    ./tools/addons/compile.sh $1 $2 $3 1
+    cd $3
+    for d in `ls -d */`; do
+	mod=${d%%/}
+	if [ $mod == "log" ] ; then
+	    continue
+	fi
+	cd $mod
+	zip -r $mod.zip *
+	mv $mod.zip ..
+	cd ..
+	md5sum $mod.zip > ${mod}.md5sum
+    done
     export PATH=$path
 }
 
+# ugly hack for GRASS 6
+mkdir -p $GISBASE_PREFIX/grass6_devel/dist.i686-pc-mingw32/lib/gis/OBJ.i686-pc-mingw32/
+cp $GISBASE_PREFIX/grass6_devel/lib/gis/OBJ.i686-pc-mingw32/fmode.o \
+    $GISBASE_PREFIX/grass6_devel/dist.i686-pc-mingw32/lib/gis/OBJ.i686-pc-mingw32
+
+compile $SVN_PATH/grass6 $GISBASE_PREFIX/grass6_devel/dist.i686-pc-mingw32 $ADDON_PREFIX/grass65/addons
 compile $SVN_PATH/grass7 $GISBASE_PREFIX/grass_trunk/dist.i686-pc-mingw32 $ADDON_PREFIX/grass70/addons
 
 exit 0

Modified: grass-addons/tools/wingrass-packager/grass_compile.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_compile.sh	2011-11-30 23:14:58 UTC (rev 49447)
+++ grass-addons/tools/wingrass-packager/grass_compile.sh	2011-11-30 23:58:22 UTC (rev 49448)
@@ -4,12 +4,6 @@
 SRC=/osgeo4w/usr/src
 PACKAGEDIR=mswindows/osgeo4w/package
 
-function update {
-    echo "Updating $1..."     
-    cd $SRC/$1
-    svn up || (svn cleanup && svn up)
-}
-
 function rm_package_7 {
     for f in `/c/OSGeo4W/apps/msys/bin/find $PACKAGEDIR/grass*.tar.bz2 -mtime +7 2>/dev/null`; do
         rm -rfv $f
@@ -33,8 +27,6 @@
 
 export PATH=$PATH:/c/OSGeo4W/apps/msys/bin
 
-update grass_addons
-
 compile grass64_release 64-dev
 compile grass6_devel 65-dev
 compile grass_trunk 70-dev

Modified: grass-addons/tools/wingrass-packager/grass_packager.bat
===================================================================
--- grass-addons/tools/wingrass-packager/grass_packager.bat	2011-11-30 23:14:58 UTC (rev 49447)
+++ grass-addons/tools/wingrass-packager/grass_packager.bat	2011-11-30 23:58:22 UTC (rev 49448)
@@ -30,9 +30,9 @@
 call .\GRASS-Packager.bat
 cd ..
 
-copy .\msys.bat .\grass64\GRASS-64-Dev-Package\msys\
-copy .\msys.bat .\grass65\GRASS-65-Dev-Package\msys\
-copy .\msys.bat .\grass70\GRASS-70-Dev-Package\msys\
+copy .\msys.bat .\grass64\GRASS-64-Package\msys\
+copy .\msys.bat .\grass65\GRASS-65-Package\msys\
+copy .\msys.bat .\grass70\GRASS-70-Package\msys\
 
 C:\OSGeo4W\apps\msys\bin\sh.exe .\grass_osgeo4w.sh
 C:\OSGeo4W\apps\msys\bin\sh.exe .\grass_svn_info.sh
@@ -51,4 +51,9 @@
 pscp.exe -i    .\ssh\id_dsa.ppk .\grass65\grass*.tar.bz2 landa at geo102:/work/wingrass/grass65/osgeo4w
 pscp.exe -i    .\ssh\id_dsa.ppk .\grass70\WinGRASS*.exe* landa at geo102:/work/wingrass/grass70
 pscp.exe -i    .\ssh\id_dsa.ppk .\grass70\grass*.tar.bz2 landa at geo102:/work/wingrass/grass70/osgeo4w
-pscp.exe -r -i .\ssh\id_dsa.ppk .\grass70\addons landa at geo102:/work/wingrass/grass70
\ No newline at end of file
+
+pscp.exe -r -i .\ssh\id_dsa.ppk .\grass65\addons\*.zip .\grass65\addons\*.md5sum landa at geo102:/work/wingrass/grass65/addons
+pscp.exe -r -i .\ssh\id_dsa.ppk .\grass65\addons\log .\grass65\addons\make.log   landa at geo102:/work/wingrass/grass65/addons
+pscp.exe -r -i .\ssh\id_dsa.ppk .\grass70\addons\*.zip .\grass70\addons\*.md5sum landa at geo102:/work/wingrass/grass70/addons
+pscp.exe -r -i .\ssh\id_dsa.ppk .\grass70\addons\log .\grass70\addons\make.log   landa at geo102:/work/wingrass/grass70/addons
+

Modified: grass-addons/tools/wingrass-packager/grass_svn_info.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_svn_info.sh	2011-11-30 23:14:58 UTC (rev 49447)
+++ grass-addons/tools/wingrass-packager/grass_svn_info.sh	2011-11-30 23:58:22 UTC (rev 49448)
@@ -7,7 +7,7 @@
 function update {
     cd $SRC/$1
     REV=`svn info | grep 'Last Changed Rev:' | cut -d':' -f2 | tr -d ' '`
-    sed "s/_SVN_REVISION \"36599\"/_SVN_REVISION \"$REV\"/g" $HOME/$2/GRASS-Installer.nsi > tmp
+    sed "s/SVN_REVISION \"36599\"/SVN_REVISION \"$REV\"/g" $HOME/$2/GRASS-Installer.nsi > tmp
     mv tmp $HOME/$2/GRASS-Installer.nsi
 }