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

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-12-14 15:01:38 -0800 (Mon, 14 Dec 2015)
New Revision: 67136

Modified:
   grass-addons/tools/wingrass-packager/grass_copy_wwwroot.sh
   grass-addons/tools/wingrass-packager/grass_osgeo4w.sh
   grass-addons/tools/wingrass-packager/grass_packager.bat
Log:
wingrass-packages: various cosmetic issues

Modified: grass-addons/tools/wingrass-packager/grass_copy_wwwroot.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_copy_wwwroot.sh	2015-12-14 22:49:19 UTC (rev 67135)
+++ grass-addons/tools/wingrass-packager/grass_copy_wwwroot.sh	2015-12-14 23:01:38 UTC (rev 67136)
@@ -27,8 +27,6 @@
     
     cd ${HOME}/${PLATFORM_DIR}/grass${DIR}
 
-    echo "Copying grass${DIR}..."
-    
     if [ ! -d ${WWWDIR}/${PLATFORM_DIR} ] ; then
 	mkdir ${WWWDIR}/${PLATFORM_DIR}
     fi
@@ -46,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 {
@@ -55,8 +53,6 @@
     
     cd ${HOME}/${PLATFORM_DIR}/grass${DIR}
 
-    echo "Copying AddOns for grass${DIR}..."
-    
     if test -n "$VERSION"; then
 	ADDONDIR=${WWWDIR}/${PLATFORM_DIR}grass${DIR:0:2}/addons/grass-$VERSION
     else
@@ -70,11 +66,14 @@
 }
 
 function create_zip {
-    echo "Creating zip..."
     cd $WWWDIR
-    rm wingrass-$PLATFORM_DIR}.zip
-    zip wingrass-$PLATFORM_DIR}.zip ${PLATFORM_DIR} -r -q
+    zipfile=wingrass-${PLATFORM_DIR}.zip
+    rm $zipfile
+    zip $zipfile ${PLATFORM_DIR} -r -q
 }
+
+echo "... ($PLATFORM_DIR)"
+
 if test -z $2 ; then
     # daily builds
     ### copy 64 6.4.5svn

Modified: grass-addons/tools/wingrass-packager/grass_osgeo4w.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_osgeo4w.sh	2015-12-14 22:49:19 UTC (rev 67135)
+++ grass-addons/tools/wingrass-packager/grass_osgeo4w.sh	2015-12-14 23:01:38 UTC (rev 67136)
@@ -17,17 +17,17 @@
 PLATFORM=$1
 export PATH=/c/msys${PLATFORM}/usr/bin:/c/msys${PLATFORM}/mingw${PLATFORM}/bin:/c/osgeo4w${PLATFORM}/bin:${PATH}
 
+if [ "$PLATFORM" = "32" ] ; then
+    PLATFORM_DIR=x86
+else
+    PLATFORM_DIR=x86_64
+fi
+
 function rsync_package {
     POSTFIX=$1
     VERSION=$2
     PATCH=$3
 
-    if [ "$PLATFORM" = "32" ] ; then
-	PLATFORM_DIR=x86
-    else
-	PLATFORM_DIR=x86_64
-    fi
-    
     dir=${HOME}/${PLATFORM_DIR}/grass${POSTFIX}/osgeo4w/package
     curr=`ls -t $dir/ 2>/dev/null | head -n1 | cut -d'-' -f4 | cut -d'.' -f1`
     if [ $? -eq 0 ]; then

Modified: grass-addons/tools/wingrass-packager/grass_packager.bat
===================================================================
--- grass-addons/tools/wingrass-packager/grass_packager.bat	2015-12-14 22:49:19 UTC (rev 67135)
+++ grass-addons/tools/wingrass-packager/grass_packager.bat	2015-12-14 23:01:38 UTC (rev 67136)
@@ -17,13 +17,13 @@
 REM
 echo Clean-up for packaging...
 REM
-call:cleanUpPkg x86
-call:cleanUpPkg x86_64
+call:cleanUpPkg x86    32
+call:cleanUpPkg x86_64 64
 
 REM
 echo Preparing packages...
 REM
-call:preparePkg x86 32
+call:preparePkg x86    32
 call:preparePkg x86_64 64
 
 REM
@@ -53,10 +53,10 @@
 REM REM C:\msys64\usr\bin\bash.exe .\grass_addons.sh 64
 
 REM
-REM Copy packages
+echo Publishing packages...
 REM
-REM REM C:\msys32\usr\bin\bash.exe .\grass_copy_wwwroot.sh 32
-REM REM C:\msys64\usr\bin\bash.exe .\grass_copy_wwwroot.sh 64
+C:\msys32\usr\bin\bash.exe .\grass_copy_wwwroot.sh 32
+C:\msys64\usr\bin\bash.exe .\grass_copy_wwwroot.sh 64
 
 exit /b %ERRORLEVEL%
 
@@ -67,9 +67,9 @@
 :cleanUpPkg
 	if not exist "%~1" mkdir %~1
 	if exist .\%~1\grass70 rmdir /S/Q .\%~1\grass70
-	xcopy C:\msys32\usr\src\grass70_release\mswindows\* .\%~1\grass70 /S/V/I > NUL
+	xcopy C:\msys%~2\usr\src\grass70_release\mswindows\* .\%~1\grass70 /S/V/I > NUL
 	if exist .\%~1\grass71 rmdir /S/Q .\%~1\grass71
-	xcopy C:\msys32\usr\src\grass_trunk\mswindows\*     .\%~1\grass71 /S/V/I > NUL
+	xcopy C:\msys%~2\usr\src\grass_trunk\mswindows\*     .\%~1\grass71 /S/V/I > NUL
 exit /b 0
 
 :preparePkg