[GRASS-SVN] r67596 - grass-addons/tools/wingrass-packager
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Jan 18 03:47:51 PST 2016
Author: martinl
Date: 2016-01-18 03:47:51 -0800 (Mon, 18 Jan 2016)
New Revision: 67596
Modified:
grass-addons/tools/wingrass-packager/grass_addons.sh
grass-addons/tools/wingrass-packager/grass_copy_wwwroot.sh
grass-addons/tools/wingrass-packager/grass_md5sum.sh
grass-addons/tools/wingrass-packager/grass_osgeo4w.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
Log:
wingrass: change layout
Modified: grass-addons/tools/wingrass-packager/grass_addons.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_addons.sh 2016-01-18 09:57:10 UTC (rev 67595)
+++ grass-addons/tools/wingrass-packager/grass_addons.sh 2016-01-18 11:47:51 UTC (rev 67596)
@@ -67,11 +67,11 @@
#compile ${SVN_PATH}/grass7 ${GISBASE_PATH}/grass700 ${ADDON_PATH}/grass700/addons
#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}/grass703RC2 ${ADDON_PATH}/${PLATFORM_DIR}/grass703RC2/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}/grass703RC2 ${ADDON_PATH}/grass703RC2/${PLATFORM_DIR}/addons
+ compile ${SVN_PATH}/grass7 ${GISBASE_PATH}/grass70_release ${ADDON_PATH}/grass70/${PLATFORM_DIR}/addons
+ compile ${SVN_PATH}/grass7 ${GISBASE_PATH}/grass_trunk ${ADDON_PATH}/grass71/${PLATFORM_DIR}/addons
else
- compile ${SVN_PATH}/grass6 ${GISBASE_PATH}/grass$2 ${ADDON_PATH}/${PLATFORM_DIR}/grass$2/addons
+ compile ${SVN_PATH}/grass6 ${GISBASE_PATH}/grass$2 ${ADDON_PATH}/grass$2/${PLATFORM_DIR}/addons
fi
exit 0
Modified: grass-addons/tools/wingrass-packager/grass_copy_wwwroot.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_copy_wwwroot.sh 2016-01-18 09:57:10 UTC (rev 67595)
+++ grass-addons/tools/wingrass-packager/grass_copy_wwwroot.sh 2016-01-18 11:47:51 UTC (rev 67596)
@@ -25,13 +25,13 @@
DIR=$1
VERSION=$2
- cd ${HOME}/${PLATFORM_DIR}/grass${DIR}
+ cd ${HOME}/grass${DIR}/${PLATFORM_DIR}
- if [ ! -d ${WWWDIR}/${PLATFORM_DIR} ] ; then
- mkdir ${WWWDIR}/${PLATFORM_DIR}
+ if [ ! -d ${WWWDIR}/grass${DIR} ] ; then
+ mkdir ${WWWDIR}/grass${DIR}
fi
- DST_DIR=${WWWDIR}/${PLATFORM_DIR}/grass${DIR}
+ DST_DIR=${WWWDIR}/grass${DIR}/${PLATFORM_DIR}
rm -rf $DST_DIR
mkdir $DST_DIR
@@ -51,12 +51,12 @@
DIR=$1
VERSION=$2
- cd ${HOME}/${PLATFORM_DIR}/grass${DIR}
+ cd ${HOME}/grass${DIR}/${PLATFORM_DIR}
if test -n "$VERSION"; then
- ADDONDIR=${WWWDIR}/${PLATFORM_DIR}/grass${DIR:0:2}/addons/grass-$VERSION
+ ADDONDIR=${WWWDIR}/grass${DIR:0:2}/${PLATFORM_DIR}/addons/grass-$VERSION
else
- ADDONDIR=${WWWDIR}/${PLATFORM_DIR}/grass${DIR:0:2}/addons
+ ADDONDIR=${WWWDIR}/grass${DIR:0:2}/${PLATFORM_DIR}/addons
fi
mkdir -p $ADDONDIR
@@ -67,9 +67,9 @@
function create_zip {
cd $WWWDIR
- zipfile=wingrass-${PLATFORM_DIR}.zip
+ zipfile=wingrass.zip
rm $zipfile
- zip $zipfile ${PLATFORM_DIR} -r -q
+ zip $zipfile grass* -r -q
}
echo "... ($PLATFORM_DIR)"
Modified: grass-addons/tools/wingrass-packager/grass_md5sum.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_md5sum.sh 2016-01-18 09:57:10 UTC (rev 67595)
+++ grass-addons/tools/wingrass-packager/grass_md5sum.sh 2016-01-18 11:47:51 UTC (rev 67596)
@@ -23,7 +23,7 @@
function create_md5sum {
GRASS_DIR=$1
- cd ${HOME}/${PLATFORM_DIR}/${GRASS_DIR}
+ cd ${HOME}/${GRASS_DIR}/${PLATFORM_DIR}
for file in `ls WinGRASS*.exe`; do
md5sum $file > ${file}.md5sum
done
Modified: grass-addons/tools/wingrass-packager/grass_osgeo4w.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_osgeo4w.sh 2016-01-18 09:57:10 UTC (rev 67595)
+++ grass-addons/tools/wingrass-packager/grass_osgeo4w.sh 2016-01-18 11:47:51 UTC (rev 67596)
@@ -28,7 +28,7 @@
VERSION=$2
PATCH=$3
- dir=${HOME}/${PLATFORM_DIR}/grass${POSTFIX}/osgeo4w/package
+ dir=${HOME}/grass${POSTFIX}/${PLATFORM_DIR}/osgeo4w/package
curr=`ls -t $dir/ 2>/dev/null | head -n1 | cut -d'-' -f4 | cut -d'.' -f1`
if [ $? -eq 0 ]; then
package=$curr
@@ -38,10 +38,10 @@
if test -z $VERSION; then
# daily builds
- cp $dir/grass*-$package*.tar.bz2 ${HOME}/${PLATFORM_DIR}/grass${POSTFIX}
+ cp $dir/grass*-$package*.tar.bz2 ${HOME}/grass${POSTFIX}/${PLATFORM_DIR}
else
# release
- cp $dir/grass*-$package*.tar.bz2 ${HOME}/${PLATFORM_DIR}/grass${POSTFIX}/grass-${VERSION}-${PATCH}.tar.bz2
+ cp $dir/grass*-$package*.tar.bz2 ${HOME}/grass${POSTFIX}/${PLATFORM_DIR}/grass-${VERSION}-${PATCH}.tar.bz2
fi
}
Modified: grass-addons/tools/wingrass-packager/grass_packager.bat
===================================================================
--- grass-addons/tools/wingrass-packager/grass_packager.bat 2016-01-18 09:57:10 UTC (rev 67595)
+++ grass-addons/tools/wingrass-packager/grass_packager.bat 2016-01-18 11:47:51 UTC (rev 67596)
@@ -67,25 +67,26 @@
:cleanUpPkg
echo ...(%~1)
- if not exist "%~1" mkdir %~1
- if exist .\%~1\grass70 rmdir /S/Q .\%~1\grass70
- 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:\msys%~2\usr\src\grass_trunk\mswindows\* .\%~1\grass71 /S/V/I > NUL
+ if not exist "grass70" mkdir grass70
+ if exist .\grass70\%~1 rmdir /S/Q .\grass70\%~1
+ xcopy C:\msys%~2\usr\src\grass70_release\mswindows\* .\grass70\%~1 /S/V/I > NUL
+ if not exist "grass71" mkdir grass71
+ if exist .\grass71\%~1 rmdir /S/Q .\grass71\%~1
+ xcopy C:\msys%~2\usr\src\grass_trunk\mswindows\* .\grass71\%~1 /S/V/I > NUL
exit /b 0
:preparePkg
echo ...(%~1)
- cd .\%~1\grass70
+ cd .\grass70\%~1
call .\GRASS-Packager.bat %~2 > .\GRASS-Packager.log
cd ..\..
- cd .\%~1\grass71
+ cd .\grass71\%~1
call .\GRASS-Packager.bat %~2 > .\GRASS-Packager.log
cd ..\..
exit /b 0
:createPkg
echo ...(%~1)
- 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
+ C:\DevTools\makensis.exe .\grass70\%~1\GRASS-Installer.nsi > .\grass70\%~1\GRASS-Installer.log
+ C:\DevTools\makensis.exe .\grass71\%~1\GRASS-Installer.nsi > .\grass71\%~1\GRASS-Installer.log
exit /b 0
Modified: grass-addons/tools/wingrass-packager/grass_packager_release.bat
===================================================================
--- grass-addons/tools/wingrass-packager/grass_packager_release.bat 2016-01-18 09:57:10 UTC (rev 67595)
+++ grass-addons/tools/wingrass-packager/grass_packager_release.bat 2016-01-18 11:47:51 UTC (rev 67596)
@@ -71,20 +71,20 @@
:cleanUpPkg
echo ...(%~1)
- if not exist "%~1" mkdir %~1
- if exist .\%~1\grass%GVERSION% rmdir /S/Q .\%~1\grass%GVERSION%
- xcopy C:\msys%~2\usr\src\grass%GVERSION%\mswindows\* .\%~1\grass%GVERSION% /S/V/I > NUL
+ if not exist "grass%GVERSION%" mkdir grass%GVERSION%
+ if exist .\grass%GVERSION%\%~1 rmdir /S/Q .\grass%GVERSION%\%~1
+ xcopy C:\msys%~2\usr\src\grass%GVERSION%\mswindows\* .\grass%GVERSION%\%~1 /S/V/I > NUL
exit /b 0
:preparePkg
echo ...(%~1)
- cd .\%~1\grass%GVERSION%
+ cd .\grass%GVERSION%\%~1
call .\GRASS-Packager.bat %~2 > .\GRASS-Packager.log
cd ..\..
exit /b 0
:createPkg
echo ...(%~1)
- C:\DevTools\makensis.exe .\%~1\grass%GVERSION%\GRASS-Installer.nsi > .\%~1\grass%GVERSION%\GRASS-Installer.log
+ C:\DevTools\makensis.exe .\grass%GVERSION%\%~1\GRASS-Installer.nsi > .\grass%GVERSION%\%~1\GRASS-Installer.log
exit /b 0
Modified: grass-addons/tools/wingrass-packager/grass_svn_info.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_svn_info.sh 2016-01-18 09:57:10 UTC (rev 67595)
+++ grass-addons/tools/wingrass-packager/grass_svn_info.sh 2016-01-18 11:47:51 UTC (rev 67596)
@@ -30,7 +30,7 @@
PATCH_NUM=$3
SRC_PATH=/c/msys${PLATFORM}/$SRC/$GRASS_DIR
- DEST_PATH=${HOME}/${PLATFORM_DIR}/${DST_DIR}
+ DEST_PATH=${HOME}/${DST_DIR}/${PLATFORM_DIR}
cd $SRC_PATH
@@ -69,7 +69,7 @@
REV=$2
PATCH=$3
- cd ${HOME}/${PLATFORM_DIR}/grass${VERSION}
+ cd ${HOME}/grass${VERSION}/${PLATFORM_DIR}
LOG_DIR=log-r$2-$3
mkdir -p $LOG_DIR
More information about the grass-commit
mailing list