[GRASS-SVN] r37085 - in grass/branches/develbranch_6/gui: scripts wxpython/scripts

[svn_grass at osgeo.org]

Author: hamish
Date: 2009-05-10 03:21:00 -0400 (Sun, 10 May 2009)
New Revision: 37085

Added:
   grass/branches/develbranch_6/gui/scripts/windows_launch.bat
Modified:
   grass/branches/develbranch_6/gui/scripts/Makefile
   grass/branches/develbranch_6/gui/wxpython/scripts/Makefile
Log:
attept to fix WinGRASS GUI scripts (bugs #234, #553, #580, and #586?)

Modified: grass/branches/develbranch_6/gui/scripts/Makefile
===================================================================
--- grass/branches/develbranch_6/gui/scripts/Makefile	2009-05-09 18:54:17 UTC (rev 37084)
+++ grass/branches/develbranch_6/gui/scripts/Makefile	2009-05-10 07:21:00 UTC (rev 37085)
@@ -2,7 +2,16 @@
 
 include $(MODULE_TOPDIR)/include/Make/Dir.make
 
-default:
+ifdef MINGW
+SCRIPT_ACTIONS += create.bat
+endif
+
+default: $(SCRIPT_ACTIONS)
 	if [ ! -d $(GISBASE)/etc/gui ] ; then $(MKDIR) $(GISBASE)/etc/gui ; fi
 	if [ ! -d $(GISBASE)/etc/gui/scripts ] ; then $(MKDIR) $(GISBASE)/etc/gui/scripts ; fi
-	for file in *.* ; do $(INSTALL) $$file $(GISBASE)/etc/gui/scripts/ ; done
+	for file in d.* g.* r.* v.* ; do $(INSTALL) $$file $(GISBASE)/etc/gui/scripts/ ; done
+
+create.bat:
+	for file in d.* g.* r.* v.* ; do \
+	sed -e "s#SCRIPT_NAME#$$file#" $(MODULE_TOPDIR)/gui/scripts/windows_launch.bat \
+		> $(GISBASE)/etc/gui/scripts/$$file.bat ; done

Copied: grass/branches/develbranch_6/gui/scripts/windows_launch.bat (from rev 36951, grass/branches/develbranch_6/scripts/windows_launch.bat)
===================================================================
--- grass/branches/develbranch_6/gui/scripts/windows_launch.bat	                        (rev 0)
+++ grass/branches/develbranch_6/gui/scripts/windows_launch.bat	2009-05-10 07:21:00 UTC (rev 37085)
@@ -0,0 +1 @@
+@"%GRASS_SH%" -c '"%GISBASE%/etc/gui/scripts/SCRIPT_NAME" %*'

Modified: grass/branches/develbranch_6/gui/wxpython/scripts/Makefile
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/scripts/Makefile	2009-05-09 18:54:17 UTC (rev 37084)
+++ grass/branches/develbranch_6/gui/wxpython/scripts/Makefile	2009-05-10 07:21:00 UTC (rev 37085)
@@ -7,8 +7,16 @@
 
 default: install_scripts
 
-install_scripts:
+ifdef MINGW
+SCRIPT_ACTIONS += create.bat
+endif
+
+install_scripts: $(SCRIPT_ACTIONS)
 	$(MKDIR) $(ETCDIR)
 	$(INSTALL) d.rast3d $(ETCDIR)/
 
+create.bat:
+	sed -e "s#SCRIPT_NAME#d.rast3d#" $(MODULE_TOPDIR)/gui/scripts/windows_launch.bat \
+		> $(ETCDIR)/d.rast3d.bat
+
 clean: cleansubdirs