[GRASS-SVN] r61869 - in grass/branches/releasebranch_7_0: include/Make scripts

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-09-12 04:26:24 -0700 (Fri, 12 Sep 2014)
New Revision: 61869

Added:
   grass/branches/releasebranch_7_0/scripts/windows_launch.bat
Modified:
   grass/branches/releasebranch_7_0/include/Make/Script.make
Log:
wingrass: produce bat files for scripts
          fix bat wrapper generation for addons (patch provided by glynn, see #2150)
          (merge r61136 & r61715 from trunk)


Modified: grass/branches/releasebranch_7_0/include/Make/Script.make
===================================================================
--- grass/branches/releasebranch_7_0/include/Make/Script.make	2014-09-12 09:19:59 UTC (rev 61868)
+++ grass/branches/releasebranch_7_0/include/Make/Script.make	2014-09-12 11:26:24 UTC (rev 61869)
@@ -18,9 +18,17 @@
 include $(MODULE_TOPDIR)/include/Make/ScriptRules.make
 
 SCRIPT_ACTIONS = $(SCRIPT) $(ETCPYFILES) $(ETCPYCFILES) html scriptstrings
+ifdef MINGW
+SCRIPT_ACTIONS += $(BIN)/$(PGM).bat
+SCRIPT_DIR = %GISBASE%/scripts
+endif
 
 script: $(SCRIPT_ACTIONS)
 
+$(BIN)/$(PGM).bat: $(MODULE_TOPDIR)/scripts/windows_launch.bat
+	sed -e "s#SCRIPT_NAME#$(PGM)#" -e "s#SCRIPT_DIR#$(SCRIPT_DIR)#" $(MODULE_TOPDIR)/scripts/windows_launch.bat > $@
+	unix2dos $@
+
 scriptstrings: $(STRINGDIR)/$(PGM)_to_translate.c
 
 install:

Copied: grass/branches/releasebranch_7_0/scripts/windows_launch.bat (from rev 61136, grass/trunk/scripts/windows_launch.bat)
===================================================================
--- grass/branches/releasebranch_7_0/scripts/windows_launch.bat	                        (rev 0)
+++ grass/branches/releasebranch_7_0/scripts/windows_launch.bat	2014-09-12 11:26:24 UTC (rev 61869)
@@ -0,0 +1 @@
+@"%GRASS_PYTHON%" "SCRIPT_DIR/SCRIPT_NAME.py" %*