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

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-12-17 01:33:23 -0800 (Thu, 17 Dec 2015)
New Revision: 67198

Modified:
   grass-addons/tools/wingrass-packager/grass_addons.sh
   grass-addons/tools/wingrass-packager/grass_copy_wwwroot.sh
   grass-addons/tools/wingrass-packager/grass_packager.bat
Log:
wingrass packager: enable addons

Modified: grass-addons/tools/wingrass-packager/grass_addons.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_addons.sh	2015-12-17 09:12:01 UTC (rev 67197)
+++ grass-addons/tools/wingrass-packager/grass_addons.sh	2015-12-17 09:33:23 UTC (rev 67198)
@@ -68,7 +68,7 @@
     #compile $SVN_PATH/grass7 $GISBASE_PATH/grass701        $ADDON_PATH/grass701/addons
     #compile $SVN_PATH/grass7 $GISBASE_PATH/grass702        $ADDON_PATH/grass702/addons
     compile $SVN_PATH/grass7 $GISBASE_PATH/grass70_release ${ADDON_PATH}/${PLATFORM_DIR}/grass70/addons
-    #compile $SVN_PATH/grass7 $GISBASE_PATH/grass_trunk     ${ADDON_PATH}/${PLATFORM_DIR}/grass71/addons
+    compile $SVN_PATH/grass7 $GISBASE_PATH/grass_trunk     ${ADDON_PATH}/${PLATFORM_DIR}/grass71/addons
 else
     compile $SVN_PATH/grass6 $GISBASE_PATH/grass$2         ${ADDON_PATH}/${PLATFORM_DIR}/grass$2/addons
 fi

Modified: grass-addons/tools/wingrass-packager/grass_copy_wwwroot.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_copy_wwwroot.sh	2015-12-17 09:12:01 UTC (rev 67197)
+++ grass-addons/tools/wingrass-packager/grass_copy_wwwroot.sh	2015-12-17 09:33:23 UTC (rev 67198)
@@ -44,7 +44,7 @@
     mkdir ${DST_DIR}/logs
     cp -r log-r*         ${DST_DIR}/logs
 
-    # copy_addon $DIR $VERSION
+    copy_addon $DIR $VERSION
 }
 
 function copy_addon {
@@ -54,9 +54,9 @@
     cd ${HOME}/${PLATFORM_DIR}/grass${DIR}
 
     if test -n "$VERSION"; then
-	ADDONDIR=${WWWDIR}/${PLATFORM_DIR}grass${DIR:0:2}/addons/grass-$VERSION
+	ADDONDIR=${WWWDIR}/${PLATFORM_DIR}/grass${DIR:0:2}/addons/grass-$VERSION
     else
-	ADDONDIR=${WWWDIR}/${PLATFORM_DIR}grass${DIR:0:2}/addons
+	ADDONDIR=${WWWDIR}/${PLATFORM_DIR}/grass${DIR:0:2}/addons
     fi
         
     mkdir -p $ADDONDIR

Modified: grass-addons/tools/wingrass-packager/grass_packager.bat
===================================================================
--- grass-addons/tools/wingrass-packager/grass_packager.bat	2015-12-17 09:12:01 UTC (rev 67197)
+++ grass-addons/tools/wingrass-packager/grass_packager.bat	2015-12-17 09:33:23 UTC (rev 67198)
@@ -49,8 +49,8 @@
 REM
 echo Building addons...
 REM
-REM REM C:\msys32\usr\bin\bash.exe .\grass_addons.sh 32
-REM REM C:\msys64\usr\bin\bash.exe .\grass_addons.sh 64
+C:\msys32\usr\bin\bash.exe .\grass_addons.sh 32
+C:\msys64\usr\bin\bash.exe .\grass_addons.sh 64
 
 REM
 echo Publishing packages...