[GRASS-SVN] r37163 - in grass/trunk: gui/scripts gui/wxpython/scripts include/Make scripts

[svn_grass at osgeo.org]

Author: glynn
Date: 2009-05-11 10:35:03 -0400 (Mon, 11 May 2009)
New Revision: 37163

Modified:
   grass/trunk/gui/scripts/Makefile
   grass/trunk/gui/scripts/windows_launch.bat
   grass/trunk/gui/wxpython/scripts/Makefile
   grass/trunk/include/Make/Script.make
   grass/trunk/scripts/windows_launch.bat
Log:
Windows fixes: retain .py extension on scripts
Eliminate .bat wrappers


Modified: grass/trunk/gui/scripts/Makefile
===================================================================
--- grass/trunk/gui/scripts/Makefile	2009-05-11 14:33:55 UTC (rev 37162)
+++ grass/trunk/gui/scripts/Makefile	2009-05-11 14:35:03 UTC (rev 37163)
@@ -6,19 +6,10 @@
 SRCFILES := $(wildcard *.*)
 DSTFILES := $(patsubst %,$(ETC)/gui/scripts/%,$(SRCFILES))
 
-ifdef MINGW
-SCRIPT_ACTIONS += create.bat
-endif
-
-default: $(SCRIPT_ACTIONS)
+default:
 	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

Modified: grass/trunk/gui/scripts/windows_launch.bat
===================================================================
--- grass/trunk/gui/scripts/windows_launch.bat	2009-05-11 14:33:55 UTC (rev 37162)
+++ grass/trunk/gui/scripts/windows_launch.bat	2009-05-11 14:35:03 UTC (rev 37163)
@@ -1 +0,0 @@
-@"%GRASS_SH%" -c '"%GISBASE%/etc/gui/scripts/SCRIPT_NAME" %*'

Modified: grass/trunk/gui/wxpython/scripts/Makefile
===================================================================
--- grass/trunk/gui/wxpython/scripts/Makefile	2009-05-11 14:33:55 UTC (rev 37162)
+++ grass/trunk/gui/wxpython/scripts/Makefile	2009-05-11 14:35:03 UTC (rev 37163)
@@ -4,21 +4,13 @@
 
 ETCDIR = $(ETC)/gui/scripts
 
-ifdef MINGW
-SCRIPT_ACTIONS += create.bat
-endif
-
 default: install_scripts
 
-install_scripts: $(SCRIPT_ACTIONS)
+install_scripts:
 	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

Modified: grass/trunk/include/Make/Script.make
===================================================================
--- grass/trunk/include/Make/Script.make	2009-05-11 14:33:55 UTC (rev 37162)
+++ grass/trunk/include/Make/Script.make	2009-05-11 14:35:03 UTC (rev 37163)
@@ -1,17 +1,19 @@
 
+include $(MODULE_TOPDIR)/include/Make/Vars.make
+
+ifdef MINGW
+SCRIPT = $(SCRIPTDIR)/$(PGM).py
+else
 SCRIPT = $(SCRIPTDIR)/$(PGM)
+endif
 
 HTMLSRC = $(SCRIPT)
 
-include $(MODULE_TOPDIR)/include/Make/Vars.make
 include $(MODULE_TOPDIR)/include/Make/Rules.make
 include $(MODULE_TOPDIR)/include/Make/Html.make
 include $(MODULE_TOPDIR)/include/Make/ScriptRules.make
 
 SCRIPT_ACTIONS = $(SCRIPT) html scriptstrings
-ifdef MINGW
-SCRIPT_ACTIONS += $(BIN)/$(PGM).bat
-endif
 
 script: $(SCRIPT_ACTIONS)
 

Modified: grass/trunk/scripts/windows_launch.bat
===================================================================
--- grass/trunk/scripts/windows_launch.bat	2009-05-11 14:33:55 UTC (rev 37162)
+++ grass/trunk/scripts/windows_launch.bat	2009-05-11 14:35:03 UTC (rev 37163)
@@ -1 +0,0 @@
-@"%GRASS_SH%" -c '"%GISBASE%/scripts/SCRIPT_NAME" %*'