[GRASS-SVN] r37087 - in grass/trunk/gui: scripts wxpython/scripts

[svn_grass at osgeo.org]

Author: hamish
Date: 2009-05-10 03:35:07 -0400 (Sun, 10 May 2009)
New Revision: 37087

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

Modified: grass/trunk/gui/scripts/Makefile
===================================================================
--- grass/trunk/gui/scripts/Makefile	2009-05-10 07:26:11 UTC (rev 37086)
+++ grass/trunk/gui/scripts/Makefile	2009-05-10 07:35:07 UTC (rev 37087)
@@ -2,13 +2,23 @@
 
 include $(MODULE_TOPDIR)/include/Make/Dir.make
 
+# FIXME: adjust so SRCFILES doesn't install windows_launch.bat
 SRCFILES := $(wildcard *.*)
 DSTFILES := $(patsubst %,$(ETC)/gui/scripts/%,$(SRCFILES))
 
-default:
+ifdef MINGW
+SCRIPT_ACTIONS += create.bat
+endif
+
+default: $(SCRIPT_ACTIONS)
 	if [ ! -d $(ETC)/gui ] ; then $(MKDIR) $(ETC)/gui ; fi
 	if [ ! -d $(ETC)/gui/scripts ] ; then $(MKDIR) $(ETC)/gui/scripts ; fi
 	$(MAKE) $(DSTFILES)
 
 $(ETC)/gui/scripts/%: %
 	$(INSTALL) $< $@
+
+create.bat:
+	for file in d.* g.* r.* v.* ; do \
+	sed -e "s#SCRIPT_NAME#$$file#" $(MODULE_TOPDIR)/gui/scripts/windows_launch.bat \
+		> $(ETC)/gui/scripts/$$file.bat ; done

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

Modified: grass/trunk/gui/wxpython/scripts/Makefile
===================================================================
--- grass/trunk/gui/wxpython/scripts/Makefile	2009-05-10 07:26:11 UTC (rev 37086)
+++ grass/trunk/gui/wxpython/scripts/Makefile	2009-05-10 07:35:07 UTC (rev 37087)
@@ -4,12 +4,21 @@
 
 ETCDIR = $(ETC)/gui/scripts
 
+ifdef MINGW
+SCRIPT_ACTIONS += create.bat
+endif
+
 default: install_scripts
 
-install_scripts:
+install_scripts: $(SCRIPT_ACTIONS)
 	if [ ! -d $(ETCDIR) ] ; then $(MKDIR) $(ETCDIR) ; fi
 	$(MAKE) $(ETCDIR)/d.rast3d
 
 $(ETCDIR)/%: %
 	$(INSTALL) $< $@
 
+create.bat:
+	sed -e "s#SCRIPT_NAME#d.rast3d#" $(MODULE_TOPDIR)/gui/scripts/windows_launch.bat \
+		> $(ETCDIR)/d.rast3d.bat
+
+clean: cleansubdirs