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

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-08-09 10:16:42 +0000 (Mon, 09 Aug 2010)
New Revision: 43017

Added:
   grass/trunk/gui/scripts/d.rast3d.py
Removed:
   grass/trunk/gui/scripts/d.rast3.py
Modified:
   grass/trunk/gui/scripts/Makefile
   grass/trunk/include/Make/Python.make
Log:
install wxGUI scripts correctly
d.rast3 renamed to d.rast3d


Modified: grass/trunk/gui/scripts/Makefile
===================================================================
--- grass/trunk/gui/scripts/Makefile	2010-08-09 09:37:04 UTC (rev 43016)
+++ grass/trunk/gui/scripts/Makefile	2010-08-09 10:16:42 UTC (rev 43017)
@@ -1,17 +1,24 @@
 MODULE_TOPDIR = ../..
 
-include $(MODULE_TOPDIR)/include/Make/Dir.make
+include $(MODULE_TOPDIR)/include/Make/Rules.make
+include $(MODULE_TOPDIR)/include/Make/Vars.make
 include $(MODULE_TOPDIR)/include/Make/Python.make
 
-ETCDIR = $(ETC)/gui/scripts
+SCRIPTDIR = $(ETC)/gui/scripts
 
-SRCFILES := $(wildcard *.py)
-DSTFILES := $(patsubst %,$(ETCDIR)/%,$(SRCFILES)) $(patsubst %.py,$(ETCDIR)/%.pyc,$(filter %.py,$(SRCFILES)))
+ifdef MINGW
+PYFILES := $(patsubst %.py, $(SCRIPTDIR)/%.py, $(filter %.py, $(PY_SOURCES)))
+else
+PYFILES := $(patsubst %.py, $(SCRIPTDIR)/%, $(filter %.py, $(PY_SOURCES)))
+endif
 
-default: $(DSTFILES)
+default: $(PYFILES)
 
-$(ETCDIR)/%: % | $(ETCDIR)
+$(SCRIPTDIR)/%: %.py | $(SCRIPTDIR)
 	$(INSTALL) $< $@
 
-$(ETCDIR):
-	$(MKDIR) $@
+$(SCRIPTDIR)/%.py: %.py | $(SCRIPTDIR)
+	$(INSTALL) $< $@
+
+$(SCRIPTDIR):
+	-test -d $@ | $(MKDIR) $@

Deleted: grass/trunk/gui/scripts/d.rast3.py
===================================================================
--- grass/trunk/gui/scripts/d.rast3.py	2010-08-09 09:37:04 UTC (rev 43016)
+++ grass/trunk/gui/scripts/d.rast3.py	2010-08-09 10:16:42 UTC (rev 43017)
@@ -1,36 +0,0 @@
-#!/usr/bin/env python
-#
-############################################################################
-#
-# MODULE:       d.rast3d
-#
-# AUTHOR(S):    Martin Landa <landa.martin gmail.com>
-#
-# PURPOSE:	Wrapper for wxGUI -- add 3d raster map layer into layer tree
-#
-# COPYRIGHT:	(C) 2008 by the GRASS Development Team
-#
-#		This program is free software under the GNU General Public
-#		License (>=v2). Read the file COPYING that comes with GRASS
-#		for details.
-#
-#############################################################################
-
-#%module
-#%  description: Displays 3d raster data in the active frame on the graphics monitor.
-#%  keywords: display, raster3d
-#%end
-
-#%option
-#% key: map
-#% type: string
-#% gisprompt: old,grid3,3d-raster
-#% description: 3D raster map to be displayed
-#% required : yes
-#%end
-
-from grass.script import core as grass
-
-if __name__ == "__main__":
-    options, flags = grass.parser()
-    main()

Copied: grass/trunk/gui/scripts/d.rast3d.py (from rev 43010, grass/trunk/gui/scripts/d.rast3.py)
===================================================================
--- grass/trunk/gui/scripts/d.rast3d.py	                        (rev 0)
+++ grass/trunk/gui/scripts/d.rast3d.py	2010-08-09 10:16:42 UTC (rev 43017)
@@ -0,0 +1,36 @@
+#!/usr/bin/env python
+#
+############################################################################
+#
+# MODULE:       d.rast3d
+#
+# AUTHOR(S):    Martin Landa <landa.martin gmail.com>
+#
+# PURPOSE:	Wrapper for wxGUI to add 3D raster map into layer tree
+#
+# COPYRIGHT:	(C) 2008, 2010 by the GRASS Development Team
+#
+#		This program is free software under the GNU General
+#		Public License (>=v2). Read the file COPYING that
+#		comes with GRASS for details.
+#
+#############################################################################
+
+#%module
+#% description: Displays 3D raster map layer.
+#% keywords: display, raster3d
+#%end
+
+#%option
+#% key: map
+#% type: string
+#% gisprompt: old,grid3,3d-raster
+#% description: 3D raster map to be displayed
+#% required : yes
+#%end
+
+from grass.script import core as grass
+
+if __name__ == "__main__":
+    options, flags = grass.parser()
+    main()

Modified: grass/trunk/include/Make/Python.make
===================================================================
--- grass/trunk/include/Make/Python.make	2010-08-09 09:37:04 UTC (rev 43016)
+++ grass/trunk/include/Make/Python.make	2010-08-09 10:16:42 UTC (rev 43017)
@@ -8,6 +8,8 @@
 endif
 PYMOD_CFLAGS = $(SHLIB_CFLAGS) $(PYTHONINC) $(PYTHON_CFLAGS)
 
+PY_SOURCES := $(wildcard *.py)
+
 %.pyc: %.py
 	$(PYTHON) -m py_compile $<