[GRASS-SVN] r63529 - in grass/branches/releasebranch_7_0: . gui/scripts include/Make lib/init
svn_grass at osgeo.org
svn_grass at osgeo.org
Sat Dec 13 11:13:08 PST 2014
Author: martinl
Date: 2014-12-13 11:13:07 -0800 (Sat, 13 Dec 2014)
New Revision: 63529
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/gui/scripts/Makefile
grass/branches/releasebranch_7_0/include/Make/GuiScript.make
grass/branches/releasebranch_7_0/lib/init/grass.py
Log:
gui scripts: makefile cosmetics
wingrass: generate bat files also for GUI modules
grass.py: remove PY from PATHEXT
(merge r62932, r62955-6, r63160 from trunk)
Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
- /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940,62942,62944-62946,62949,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,63076,63079,63081,63083,63085,63087,
63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63276,63279,63281,63283,63287,63290,63292,63302,63315,63319,63330,63332,63339,63342,63345,63362,63367,63391,63393,63408-63409,63416-63417,63425,63427,63429,63431,63433,63451,63453,63457,63459,63473,63482,63497,63505,63508,63510,63515,63524,63526
+ /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,63076,63079,63081,
63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63276,63279,63281,63283,63287,63290,63292,63302,63315,63319,63330,63332,63339,63342,63345,63362,63367,63391,63393,63408-63409,63416-63417,63425,63427,63429,63431,63433,63451,63453,63457,63459,63473,63482,63497,63505,63508,63510,63515,63524,63526
Modified: grass/branches/releasebranch_7_0/gui/scripts/Makefile
===================================================================
--- grass/branches/releasebranch_7_0/gui/scripts/Makefile 2014-12-13 17:02:27 UTC (rev 63528)
+++ grass/branches/releasebranch_7_0/gui/scripts/Makefile 2014-12-13 19:13:07 UTC (rev 63529)
@@ -8,17 +8,19 @@
ifdef MINGW
PYFILES := $(patsubst %.py, $(DSTDIR)/%.py, $(filter %.py, $(PY_SOURCES)))
+BATFILES := $(patsubst %.py, $(DSTDIR)/%.bat, $(filter %.py, $(PY_SOURCES)))
+$(DSTDIR)/%.py: %.py | $(DSTDIR)
+ $(INSTALL) $< $@
+$(DSTDIR)/%.bat: $(MODULE_TOPDIR)/scripts/windows_launch.bat
+ sed -e "s#SCRIPT_NAME#$(*)#" -e "s#SCRIPT_DIR#%GISBASE%/gui/scripts#" $(MODULE_TOPDIR)/scripts/windows_launch.bat > $@
+ unix2dos $@
+default: $(PYFILES) $(BATFILES)
else
PYFILES := $(patsubst %.py, $(DSTDIR)/%, $(filter %.py, $(PY_SOURCES)))
-endif
-
-default: $(PYFILES)
-
$(DSTDIR)/%: %.py | $(DSTDIR)
$(INSTALL) $< $@
+default: $(PYFILES)
+endif
-$(DSTDIR)/%.py: %.py | $(DSTDIR)
- $(INSTALL) $< $@
-
$(DSTDIR):
-test -d $@ | $(MKDIR) $@
Modified: grass/branches/releasebranch_7_0/include/Make/GuiScript.make
===================================================================
--- grass/branches/releasebranch_7_0/include/Make/GuiScript.make 2014-12-13 17:02:27 UTC (rev 63528)
+++ grass/branches/releasebranch_7_0/include/Make/GuiScript.make 2014-12-13 19:13:07 UTC (rev 63529)
@@ -3,12 +3,6 @@
include $(MODULE_TOPDIR)/include/Make/Vars.make
-ifdef MINGW
-SCRIPTEXT = .py
-else
-SCRIPTEXT =
-endif
-
include $(MODULE_TOPDIR)/include/Make/Rules.make
include $(MODULE_TOPDIR)/include/Make/ScriptRules.make
include $(MODULE_TOPDIR)/include/Make/HtmlRules.make
@@ -16,9 +10,16 @@
MODULES := $(patsubst g.gui.%.py,%,$(wildcard g.gui.*.py))
CMDHTML := $(patsubst %,$(HTMLDIR)/g.gui.%.html,$(MODULES))
GUIHTML := $(patsubst %,$(HTMLDIR)/wxGUI.%.html,$(MODULES))
+ifdef MINGW
+SCRIPTEXT = .py
+BATFILES := $(patsubst %,$(BIN)/g.gui.%.bat,$(MODULES))
+else
+SCRIPTEXT =
+BATFILES =
+endif
PYFILES := $(patsubst %,$(SCRIPTDIR)/g.gui.%$(SCRIPTEXT),$(MODULES))
-guiscript: $(IMGDST) $(PYFILES)
+guiscript: $(IMGDST) $(PYFILES) $(BATFILES)
$(MAKE) $(CMDHTML)
-rm -f g.gui.*.tmp.html
$(MAKE) $(GUIHTML)
@@ -38,4 +39,8 @@
$(SCRIPTDIR)/g.gui.%$(SCRIPTEXT): g.gui.%.py | $(SCRIPTDIR)
$(INSTALL) $< $@
+$(BIN)/g.gui.%.bat: $(MODULE_TOPDIR)/scripts/windows_launch.bat
+ sed -e "s#SCRIPT_NAME#g.gui.$(*)#" -e "s#SCRIPT_DIR#%GISBASE%/scripts#" $(MODULE_TOPDIR)/scripts/windows_launch.bat > $@
+ unix2dos $@
+
.PHONY: guiscript
Modified: grass/branches/releasebranch_7_0/lib/init/grass.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/init/grass.py 2014-12-13 17:02:27 UTC (rev 63528)
+++ grass/branches/releasebranch_7_0/lib/init/grass.py 2014-12-13 19:13:07 UTC (rev 63529)
@@ -423,12 +423,7 @@
os.environ['MANPATH'] = addons_man_path
path_prepend(grass_man_path, 'MANPATH')
- # Add .py (Python) to list of executable extensions to search for
- # in MS-Windows PATH
- if windows:
- path_append('.PY', 'PATHEXT')
-
def find_exe(pgm):
for dir in os.getenv('PATH').split(os.pathsep):
path = os.path.join(dir, pgm)
More information about the grass-commit
mailing list