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

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-12-14 03:33:14 -0800 (Mon, 14 Dec 2015)
New Revision: 67118

Modified:
   grass-addons/tools/wingrass-packager/grass_addons.sh
   grass-addons/tools/wingrass-packager/grass_compile.sh
   grass-addons/tools/wingrass-packager/grass_md5sum.sh
   grass-addons/tools/wingrass-packager/grass_packager.bat
Log:
wingrass-packager: various fixes for msys2 (addons still disabled)

Modified: grass-addons/tools/wingrass-packager/grass_addons.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_addons.sh	2015-12-14 11:29:26 UTC (rev 67117)
+++ grass-addons/tools/wingrass-packager/grass_addons.sh	2015-12-14 11:33:14 UTC (rev 67118)
@@ -10,12 +10,14 @@
     exit 1
 fi
 PLATFORM=$1
-export PATH=/c/msys${PLATFORM}/usr/bin:/c/msys${PLATFORM}/mingw${PLATFORM}/bin:/c/osgeo4w${PLATFORM}/bin:${PATH}
+export PATH=/c/osgeo4w${PLATFORM}/bin:/c/msys${PLATFORM}/usr/bin:/c/msys${PLATFORM}/mingw${PLATFORM}/bin:${PATH}
+export GRASS_PYTHON=/c/OSGeo4W${PLATFORM}/pythonw.exe
+export GRASS_PYTHONPATH=/c/OSGeo4W${PLATFORM}/apps/Python27/Lib
 export PYTHONHOME=/c/OSGeo4W${PLATFORM}/apps/Python27
 export LANGUAGE=C
 
-SVN_PATH=/c/osgeo4w${PLATFORM}/usr/src/grass_addons
-GISBASE_PATH=/c/osgeo4w${PLATFORM}/usr/src
+SVN_PATH=/c/msys${PLATFORM}/usr/src/grass_addons
+GISBASE_PATH=/c/msys${PLATFORM}/usr/src
 ADDON_PATH=/c/Users/landa/grass_packager
 if [ "$PLATFORM" = "32" ] ; then
     PLATFORM_DIR=x86
@@ -66,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_compile.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_compile.sh	2015-12-14 11:29:26 UTC (rev 67117)
+++ grass-addons/tools/wingrass-packager/grass_compile.sh	2015-12-14 11:33:14 UTC (rev 67118)
@@ -41,7 +41,7 @@
     
     echo "Compiling ${PLATFORM}bit $GRASS_DIR ($package)..."
     rm -f mswindows/osgeo4w/configure-stamp
-    PACKAGE_POSTFIX=$PACKAGE_POSTFIX OSGEO4W_POSTFIX=$PLATFORM ./mswindows/osgeo4w/package.sh
+    PACKAGE_PATCH=$package PACKAGE_POSTFIX=$PACKAGE_POSTFIX OSGEO4W_POSTFIX=$PLATFORM ./mswindows/osgeo4w/package.sh
 }
 
 if test -z $2 ; then

Modified: grass-addons/tools/wingrass-packager/grass_md5sum.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_md5sum.sh	2015-12-14 11:29:26 UTC (rev 67117)
+++ grass-addons/tools/wingrass-packager/grass_md5sum.sh	2015-12-14 11:33:14 UTC (rev 67118)
@@ -14,15 +14,15 @@
 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 create_md5sum {
     GRASS_DIR=$1
     
-    if [ "$PLATFORM" = "32" ] ; then
-	PLATFORM_DIR=x86
-    else
-	PLATFORM_DIR=x86_64
-    fi
-
     cd ${HOME}/${PLATFORM_DIR}/${GRASS_DIR}
     for file in `ls WinGRASS*.exe`; do
 	md5sum $file > ${file}.md5sum

Modified: grass-addons/tools/wingrass-packager/grass_packager.bat
===================================================================
--- grass-addons/tools/wingrass-packager/grass_packager.bat	2015-12-14 11:29:26 UTC (rev 67117)
+++ grass-addons/tools/wingrass-packager/grass_packager.bat	2015-12-14 11:33:14 UTC (rev 67118)
@@ -17,8 +17,8 @@
 REM
 echo Clean-up for packaging...
 REM
-REM call:cleanUpPkg x86
-REM call:cleanUpPkg x86_64
+call:cleanUpPkg x86
+call:cleanUpPkg x86_64
 
 REM
 echo Preparing packages...
@@ -40,8 +40,6 @@
 call:createPkg x86
 call:createPkg x86_64
 
-pause
-
 REM
 REM Create md5sum files
 REM
@@ -49,16 +47,16 @@
 C:\msys64\usr\bin\bash.exe .\grass_md5sum.sh 64
 
 REM
-REM Build Addons 
+echo Building addons...
 REM
-C:\msys32\usr\bin\bash.exe .\grass_addons.sh 32
-C:\msys64\usr\bin\bash.exe .\grass_addons.sh 64
+REM REM C:\msys32\usr\bin\bash.exe .\grass_addons.sh 32
+REM REM C:\msys64\usr\bin\bash.exe .\grass_addons.sh 64
 
 REM
 REM Copy packages
 REM
-C:\msys32\usr\bin\bash.exe .\grass_copy_wwwroot.sh 32
-C:\msys64\usr\bin\bash.exe .\grass_copy_wwwroot.sh 64
+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
 
 exit /b %ERRORLEVEL%
 
@@ -84,6 +82,6 @@
 exit /b 0
 
 :createPkg
-	C:\DevTools\makensis.exe .\%~1\grass70\GRASS-Installer.nsi > .\%~1\grass71\GRASS-Installer.log
+	C:\DevTools\makensis.exe .\%~1\grass70\GRASS-Installer.nsi > .\%~1\grass70\GRASS-Installer.log
 	C:\DevTools\makensis.exe .\%~1\grass71\GRASS-Installer.nsi > .\%~1\grass71\GRASS-Installer.log
 exit /b 0