[GRASS-SVN] r39043 - in grass/branches/develbranch_6/mswindows: .
osgeo4w
svn_grass at osgeo.org
svn_grass at osgeo.org
Sun Sep 6 09:18:27 EDT 2009
Author: neteler
Date: 2009-09-06 09:18:26 -0400 (Sun, 06 Sep 2009)
New Revision: 39043
Added:
grass/branches/develbranch_6/mswindows/osgeo4w/grass65.bat.tmpl
grass/branches/develbranch_6/mswindows/osgeo4w/grass65.tmpl
Removed:
grass/branches/develbranch_6/mswindows/osgeo4w/grass64.bat.tmpl
grass/branches/develbranch_6/mswindows/osgeo4w/grass64.tmpl
Modified:
grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi
grass/branches/develbranch_6/mswindows/GRASS-Packager.bat
grass/branches/develbranch_6/mswindows/README.html
grass/branches/develbranch_6/mswindows/osgeo4w/ini.bat.tmpl
grass/branches/develbranch_6/mswindows/osgeo4w/package.cmd
grass/branches/develbranch_6/mswindows/osgeo4w/package.sh
grass/branches/develbranch_6/mswindows/osgeo4w/postinstall.bat
grass/branches/develbranch_6/mswindows/osgeo4w/preremove.bat
Log:
cleanup version mixture: all 65/6.5.svn now
Modified: grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi
===================================================================
--- grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi 2009-09-06 10:58:05 UTC (rev 39042)
+++ grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi 2009-09-06 13:18:26 UTC (rev 39043)
@@ -21,7 +21,7 @@
;Version variables
-!define RELEASE_VERSION_NUMBER "6.4.0RC4"
+!define RELEASE_VERSION_NUMBER "6.4.0RC5"
!define RELEASE_SVN_REVISION "36599"
!define RELEASE_BINARY_REVISION "1"
!define RELEASE_GRASS_COMMAND "grass64"
@@ -513,7 +513,7 @@
"$INSTALL_DIR\icons\GRASS_MSys.ico" "" SW_SHOWNORMAL "" "Launch GRASS ${VERSION_NUMBER} with the new wxPython GUI and a MSYS UNIX terminal"
; FIXME: ship the WinGrass release notes .html file instead of URL
-; http://trac.osgeo.org/grass/browser/grass-web/trunk/grass64/binary/mswindows/native/README.html?format=raw
+; http://trac.osgeo.org/grass/browser/grass-web/trunk/grass65/binary/mswindows/native/README.html?format=raw
; probably ship with devel versions too? ie Release Notes, not the Release Announcement press release.
!if ${INSTALLER_TYPE} == "Release"
CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\Release Notes.lnk" "$INSTALL_DIR\WinGRASS-README.url" ""\
Modified: grass/branches/develbranch_6/mswindows/GRASS-Packager.bat
===================================================================
--- grass/branches/develbranch_6/mswindows/GRASS-Packager.bat 2009-09-06 10:58:05 UTC (rev 39042)
+++ grass/branches/develbranch_6/mswindows/GRASS-Packager.bat 2009-09-06 13:18:26 UTC (rev 39043)
@@ -10,7 +10,7 @@
set OSGEO4W_DIR=c:\osgeo4w
-set GRASS_RELEASE_INSTALL_FOLDER=%OSGEO4W_DIR%\apps\grass\grass-6.4.0RC4
+set GRASS_RELEASE_INSTALL_FOLDER=%OSGEO4W_DIR%\apps\grass\grass-6.4.0RC5
set GRASS_6_DEV_INSTALL_FOLDER=%OSGEO4W_DIR%\apps\grass\grass-6.5.svn
set GRASS_7_DEV_INSTALL_FOLDER=%OSGEO4W_DIR%\apps\grass\grass-7.0.svn
Modified: grass/branches/develbranch_6/mswindows/README.html
===================================================================
--- grass/branches/develbranch_6/mswindows/README.html 2009-09-06 10:58:05 UTC (rev 39042)
+++ grass/branches/develbranch_6/mswindows/README.html 2009-09-06 13:18:26 UTC (rev 39043)
@@ -203,7 +203,7 @@
<p>Edit lines 11-15 in the file <code>c:\temp\GRASS-Packager.bat</code> to
reflect the paths to your OSGeo4W tree (eg. <code>c:\OSGeo4W</code>) and
-the GRASS version being packaged (eg. <code>grass-6.4.0RC4</code>).</p>
+the GRASS version being packaged (eg. <code>grass-6.5.svn</code>).</p>
<p>Launch the file <code>c:\temp\GRASS-Packager.bat</code> and select
the option number 1.</p>
@@ -211,7 +211,7 @@
<p>When finished, you should have a GRASS self-contained release package
in <code>c:\temp\GRASS-Release-Package</code>.</p>
-<p>Download README.html from <a href="http://trac.osgeo.org/grass/browser/grass-web/trunk/grass64/binary/mswindows/native/README.html?format=raw">here</a>,
+<p>Download README.html from <a href="http://trac.osgeo.org/grass/browser/grass-web/trunk/grass65/binary/mswindows/native/README.html?format=raw">here</a>,
place in <code>c:\temp\GRASS-Release-Package</code> (update version numbers as necessary).</p>
</div>
@@ -275,7 +275,7 @@
<p>At line 13 set the <code>DEMOLOCATION_PATH</code> varibale to the
demolocation folder in the source tree.
-For example, <code>c:\msys\local\src\grass-6.4.0RC4\demolocation</code>
+For example, <code>c:\msys\local\src\grass-6.5.svn\demolocation</code>
<p>At line 18 set the <code>INSTALLER_TYPE</code> variable to <code>"Release"</code>,
then, at lines 24-26, set the <code>RELEASE_VERSION_NUMBER</code>, the
Deleted: grass/branches/develbranch_6/mswindows/osgeo4w/grass64.bat.tmpl
===================================================================
--- grass/branches/develbranch_6/mswindows/osgeo4w/grass64.bat.tmpl 2009-09-06 10:58:05 UTC (rev 39042)
+++ grass/branches/develbranch_6/mswindows/osgeo4w/grass64.bat.tmpl 2009-09-06 13:18:26 UTC (rev 39043)
@@ -1,3 +0,0 @@
- at echo off
-call @osgeo4w@\bin\o4w_env.bat
-"%WINGISBASE%"\etc\init.bat %*
Deleted: grass/branches/develbranch_6/mswindows/osgeo4w/grass64.tmpl
===================================================================
--- grass/branches/develbranch_6/mswindows/osgeo4w/grass64.tmpl 2009-09-06 10:58:05 UTC (rev 39042)
+++ grass/branches/develbranch_6/mswindows/osgeo4w/grass64.tmpl 2009-09-06 13:18:26 UTC (rev 39043)
@@ -1,25 +0,0 @@
-#! /bin/sh
-#############################################################################
-#
-# MODULE: GRASS Initialization
-# AUTHOR(S): Justin Hickey - Thailand - jhickey at hpcc.nectec.or.th
-# PURPOSE: The source file for this shell script is in
-# lib/init/grass.src and is the grass startup script. It
-# requires a source file because the definition of GISBASE
-# is not known until compile time and is substituted from the
-# Makefile. Any command line options are passed to Init.sh.
-# COPYRIGHT: (C) 2000-2005 by the GRASS Development Team
-#
-# This program is free software under the GNU General Public
-# License (>=v2). Read the file COPYING that comes with GRASS
-# for details.
-#
-#############################################################################
-
-trap "echo 'User break!' ; exit" 2 3 9 15
-
-# Set the GISBASE variable
-GISBASE=@osgeo4w_msys@
-export GISBASE
-
-exec "$GISBASE/etc/Init.sh" "$@"
Copied: grass/branches/develbranch_6/mswindows/osgeo4w/grass65.bat.tmpl (from rev 38987, grass/branches/develbranch_6/mswindows/osgeo4w/grass64.bat.tmpl)
===================================================================
--- grass/branches/develbranch_6/mswindows/osgeo4w/grass65.bat.tmpl (rev 0)
+++ grass/branches/develbranch_6/mswindows/osgeo4w/grass65.bat.tmpl 2009-09-06 13:18:26 UTC (rev 39043)
@@ -0,0 +1,3 @@
+ at echo off
+call @osgeo4w@\bin\o4w_env.bat
+"%WINGISBASE%"\etc\init.bat %*
Copied: grass/branches/develbranch_6/mswindows/osgeo4w/grass65.tmpl (from rev 38987, grass/branches/develbranch_6/mswindows/osgeo4w/grass64.tmpl)
===================================================================
--- grass/branches/develbranch_6/mswindows/osgeo4w/grass65.tmpl (rev 0)
+++ grass/branches/develbranch_6/mswindows/osgeo4w/grass65.tmpl 2009-09-06 13:18:26 UTC (rev 39043)
@@ -0,0 +1,25 @@
+#! /bin/sh
+#############################################################################
+#
+# MODULE: GRASS Initialization
+# AUTHOR(S): Justin Hickey - Thailand - jhickey at hpcc.nectec.or.th
+# PURPOSE: The source file for this shell script is in
+# lib/init/grass.src and is the grass startup script. It
+# requires a source file because the definition of GISBASE
+# is not known until compile time and is substituted from the
+# Makefile. Any command line options are passed to Init.sh.
+# COPYRIGHT: (C) 2000-2005 by the GRASS Development Team
+#
+# This program is free software under the GNU General Public
+# License (>=v2). Read the file COPYING that comes with GRASS
+# for details.
+#
+#############################################################################
+
+trap "echo 'User break!' ; exit" 2 3 9 15
+
+# Set the GISBASE variable
+GISBASE=@osgeo4w_msys@
+export GISBASE
+
+exec "$GISBASE/etc/Init.sh" "$@"
Modified: grass/branches/develbranch_6/mswindows/osgeo4w/ini.bat.tmpl
===================================================================
--- grass/branches/develbranch_6/mswindows/osgeo4w/ini.bat.tmpl 2009-09-06 10:58:05 UTC (rev 39042)
+++ grass/branches/develbranch_6/mswindows/osgeo4w/ini.bat.tmpl 2009-09-06 13:18:26 UTC (rev 39043)
@@ -1,5 +1,5 @@
-set GISBASE=%OSGEO4W_ROOT%\apps\grass\grass-6.4.0svn
-set WINGISBASE=%OSGEO4W_ROOT%\apps\grass\grass-6.4.0svn
+set GISBASE=%OSGEO4W_ROOT%\apps\grass\grass-6.5.svn
+set WINGISBASE=%OSGEO4W_ROOT%\apps\grass\grass-6.5.svn
set GRASS_SH=%OSGEO4W_ROOT%\apps\msys\bin\sh.exe
set GRASS_WISH=%OSGEO4W_ROOT%\bin\wish.exe
set GRASS_PYTHON=%OSGEO4W_ROOT%\bin\python.exe
Modified: grass/branches/develbranch_6/mswindows/osgeo4w/package.cmd
===================================================================
--- grass/branches/develbranch_6/mswindows/osgeo4w/package.cmd 2009-09-06 10:58:05 UTC (rev 39042)
+++ grass/branches/develbranch_6/mswindows/osgeo4w/package.cmd 2009-09-06 13:18:26 UTC (rev 39043)
@@ -1,7 +1,7 @@
path %PATH%;%OSGEO4W_ROOT%\apps\swig
set WXWIN=h:\windows\wxPython-src-2.8.9.1
-set GRASS_HOME=%OSGEO4W_ROOT%\apps\grass\grass-6.4.0RC3
+set GRASS_HOME=%OSGEO4W_ROOT%\apps\grass\grass-6.5.svn
set GRASS_INC=%GRASS_HOME%\include
set GRASS_LPATH=%GRASS_HOME%\lib
Modified: grass/branches/develbranch_6/mswindows/osgeo4w/package.sh
===================================================================
--- grass/branches/develbranch_6/mswindows/osgeo4w/package.sh 2009-09-06 10:58:05 UTC (rev 39042)
+++ grass/branches/develbranch_6/mswindows/osgeo4w/package.sh 2009-09-06 13:18:26 UTC (rev 39043)
@@ -76,7 +76,7 @@
mv $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/include/grass/config.h $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/include/grass/config.h.mingw
cp mswindows/osgeo4w/config.h.switch $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/include/grass/config.h
cp mswindows/osgeo4w/config.h.vc $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/include/grass
-cp mswindows/osgeo4w/grass64.bat.tmpl $OSGEO4W_ROOT_MSYS/bin/grass64.bat.tmpl
+cp mswindows/osgeo4w/grass65.bat.tmpl $OSGEO4W_ROOT_MSYS/bin/grass65.bat.tmpl
cp mswindows/osgeo4w/ini.bat.tmpl $OSGEO4W_ROOT_MSYS/etc/ini/grass.bat.tmpl
cp mswindows/osgeo4w/postinstall.bat $OSGEO4W_ROOT_MSYS/etc/postinstall/grass.bat
cp mswindows/osgeo4w/preremove.bat $OSGEO4W_ROOT_MSYS/etc/preremove/grass.bat
@@ -88,7 +88,7 @@
P=${P//\//\\\\}\\\\dist.i686-pc-mingw32
sed -e "s#$P#@osgeo4w@#" $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/etc/fontcap >$OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/etc/fontcap.tmpl
-sed -e "s#$P#@osgeo4w_msys@#" $OSGEO4W_ROOT_MSYS/apps/grass/bin/grass64 >$OSGEO4W_ROOT_MSYS/apps/grass/bin/grass64.tmpl
+sed -e "s#$P#@osgeo4w_msys@#" $OSGEO4W_ROOT_MSYS/apps/grass/bin/grass65 >$OSGEO4W_ROOT_MSYS/apps/grass/bin/grass65.tmpl
rm $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/etc/fontcap
echo $(date): STARTING building vc libraries
@@ -114,7 +114,7 @@
apps/grass/grass-$VERSION/lib/*.lib
tar -cjf $PDIR/grass/grass-$VERSION-$PACKAGE.tar.bz2 \
- apps/grass/bin/grass64.tmpl \
+ apps/grass/bin/grass65.tmpl \
apps/grass/grass-$VERSION/authors \
apps/grass/grass-$VERSION/bin/ \
apps/grass/grass-$VERSION/bwidget/ \
@@ -129,7 +129,7 @@
bin/libgnurx-0.dll \
bin/libiconv-2.dll \
bin/libintl-8.dll \
- bin/grass64.bat.tmpl \
+ bin/grass65.bat.tmpl \
bin/libgrass_*.$VERSION.dll \
etc/ini/grass.bat \
etc/postinstall/grass.bat \
Modified: grass/branches/develbranch_6/mswindows/osgeo4w/postinstall.bat
===================================================================
--- grass/branches/develbranch_6/mswindows/osgeo4w/postinstall.bat 2009-09-06 10:58:05 UTC (rev 39042)
+++ grass/branches/develbranch_6/mswindows/osgeo4w/postinstall.bat 2009-09-06 13:18:26 UTC (rev 39043)
@@ -1,9 +1,9 @@
-set ICON=%OSGEO4W_ROOT%\apps\grass\grass-6.4.0svn\etc\gui\icons\grass.ico
-set BATCH=%OSGEO4W_ROOT%\bin\grass64.bat
+set ICON=%OSGEO4W_ROOT%\apps\grass\grass-6.5.svn\etc\gui\icons\grass.ico
+set BATCH=%OSGEO4W_ROOT%\bin\grass65.bat
-textreplace -std -t "%OSGEO4W_ROOT%"\bin\grass64.bat
-textreplace -std -t "%OSGEO4W_ROOT%"\apps\grass\grass-6.4.0svn\etc\fontcap
-textreplace -std -t "%OSGEO4W_ROOT%"\apps\grass\bin\grass64
+textreplace -std -t "%OSGEO4W_ROOT%"\bin\grass65.bat
+textreplace -std -t "%OSGEO4W_ROOT%"\apps\grass\grass-6.5.svn\etc\fontcap
+textreplace -std -t "%OSGEO4W_ROOT%"\apps\grass\bin\grass65
mkdir "%OSGEO4W_STARTMENU%\GRASS GIS"
xxmklink "%OSGEO4W_STARTMENU%\GRASS GIS\wxPython.lnk" "%BATCH%" "-wxpython" \ "wxPython interface" 1 "%ICON%"
Modified: grass/branches/develbranch_6/mswindows/osgeo4w/preremove.bat
===================================================================
--- grass/branches/develbranch_6/mswindows/osgeo4w/preremove.bat 2009-09-06 10:58:05 UTC (rev 39042)
+++ grass/branches/develbranch_6/mswindows/osgeo4w/preremove.bat 2009-09-06 13:18:26 UTC (rev 39043)
@@ -10,6 +10,6 @@
del "%ALLUSERSPROFILE%\Desktop\GRASS GIS (TclTk).lnk"
del "%ALLUSERSPROFILE%\Desktop\GRASS GIS (Text).lnk"
-del "%OSGEO4W_ROOT%"\apps\grass\grass-6.4.0svn\etc\fontcap
-del "%OSGEO4W_ROOT%"\apps\grass\bin\grass64
-del "%OSGEO4W_ROOT%"\bin\grass64.bat
+del "%OSGEO4W_ROOT%"\apps\grass\grass-6.5.svn\etc\fontcap
+del "%OSGEO4W_ROOT%"\apps\grass\bin\grass65
+del "%OSGEO4W_ROOT%"\bin\grass65.bat
More information about the grass-commit
mailing list