[GRASS-SVN] r37993 - in grass/trunk: lib/python swig/python
svn_grass at osgeo.org
svn_grass at osgeo.org
Sat Jun 20 05:10:50 EDT 2009
Author: martinl
Date: 2009-06-20 05:10:50 -0400 (Sat, 20 Jun 2009)
New Revision: 37993
Added:
grass/trunk/lib/python/grass__init__.py
Modified:
grass/trunk/lib/python/Makefile
grass/trunk/lib/python/__init__.py
grass/trunk/swig/python/Makefile
Log:
fix grass/__init__.py
Modified: grass/trunk/lib/python/Makefile
===================================================================
--- grass/trunk/lib/python/Makefile 2009-06-20 09:03:30 UTC (rev 37992)
+++ grass/trunk/lib/python/Makefile 2009-06-20 09:10:50 UTC (rev 37993)
@@ -22,8 +22,7 @@
$(DSTDIR): $(GDIR)
test -d $@ || $(MKDIR) -p $@
- test -f __init__.py || touch $(GDIR)/__init__.py
- @echo "import script" >> $(GDIR)/__init__.py
+ @cat grass__init__.py > $(GDIR)/__init__.py
$(DSTDIR)/%: %
$(INSTALL_DATA) $< $@
Modified: grass/trunk/lib/python/__init__.py
===================================================================
--- grass/trunk/lib/python/__init__.py 2009-06-20 09:03:30 UTC (rev 37992)
+++ grass/trunk/lib/python/__init__.py 2009-06-20 09:10:50 UTC (rev 37993)
@@ -2,4 +2,3 @@
from db import *
from raster import *
from vector import *
-
Added: grass/trunk/lib/python/grass__init__.py
===================================================================
--- grass/trunk/lib/python/grass__init__.py (rev 0)
+++ grass/trunk/lib/python/grass__init__.py 2009-06-20 09:10:50 UTC (rev 37993)
@@ -0,0 +1,4 @@
+import os
+__all__ = ["script"]
+if os.path.exists(os.path.join(os.path.dirname(__file__), "lib", "__init__.py")):
+ __all__.append("lib")
Property changes on: grass/trunk/lib/python/grass__init__.py
___________________________________________________________________
Name: svn:mime-type
+ text/x-python
Name: svn:keywords
+ Author Date Id
Name: svn:eol-style
+ native
Modified: grass/trunk/swig/python/Makefile
===================================================================
--- grass/trunk/swig/python/Makefile 2009-06-20 09:03:30 UTC (rev 37992)
+++ grass/trunk/swig/python/Makefile 2009-06-20 09:10:50 UTC (rev 37993)
@@ -65,8 +65,6 @@
$(DSTDIR): $(GDIR)
test -d $@ || $(MKDIR) -p $@
- test -f __init__.py || touch $(GDIR)/__init__.py
- @echo "import lib" >> $(GDIR)/__init__.py
$(DSTDIR)/_%.so: _%.so
$(INSTALL) $< $@
More information about the grass-commit
mailing list