[GRASS-SVN] r45027 - in grass/branches/develbranch_6/mswindows: . osgeo4w

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-01-14 05:27:03 -0800 (Fri, 14 Jan 2011)
New Revision: 45027

Modified:
   grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi
   grass/branches/develbranch_6/mswindows/osgeo4w/package.sh
Log:
update wingrass installer

Modified: grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi
===================================================================
--- grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi	2011-01-14 13:09:02 UTC (rev 45026)
+++ grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi	2011-01-14 13:27:03 UTC (rev 45027)
@@ -35,13 +35,13 @@
 !define RELEASE_SVN_REVISION "365995"
 !define RELEASE_BINARY_REVISION "1"
 !define RELEASE_GRASS_COMMAND "grass65"
-!define RELEASE_GRASS_BASE "GRASS-65"
+!define RELEASE_GRASS_BASE "GRASS 6.5"
 
 !define DEVEL_VERSION_NUMBER "6.5.SVN"
 !define DEVEL_SVN_REVISION "36599"
 !define DEVEL_BINARY_REVISION "1"
 !define DEVEL_GRASS_COMMAND "grass65svn"
-!define DEVEL_GRASS_BASE "GRASS-65-SVN"
+!define DEVEL_GRASS_BASE "GRASS 6.5.SVN"
 
 ;----------------------------------------------------------------------------------------------------------------------------
 
@@ -86,7 +86,7 @@
 
 !define PUBLISHER "GRASS Development Team"
 !define WEB_SITE "http://grass.osgeo.org"
-!define WIKI_PAGE "http://grass.osgeo.org/wiki/Main_Page"
+!define WIKI_PAGE "http://grass.osgeo.org/wiki"
 
 ;----------------------------------------------------------------------------------------------------------------------------
 

Modified: grass/branches/develbranch_6/mswindows/osgeo4w/package.sh
===================================================================
--- grass/branches/develbranch_6/mswindows/osgeo4w/package.sh	2011-01-14 13:09:02 UTC (rev 45026)
+++ grass/branches/develbranch_6/mswindows/osgeo4w/package.sh	2011-01-14 13:27:03 UTC (rev 45027)
@@ -1,6 +1,6 @@
 #!/c/OSGeo4W/apps/msys/bin/sh
 
-set -e
+### set -e
 
 if ! [ -d mswindows ]; then
 	echo Start from GRASS toplevel dir
@@ -66,7 +66,7 @@
 fi
 
 echo $(date): STARTING make
-make || make
+make
 
 echo $(date): STARTING make install
 make install