[Pymoul-svn] SF.net SVN: pymoul: [94] pymoul/trunk

[<ti...@us...>]

Revision: 94
          http://pymoul.svn.sourceforge.net/pymoul/?rev=94&view=rev
Author:   tiran
Date:     2007-01-28 13:14:23 -0800 (Sun, 28 Jan 2007)

Log Message:
-----------
include more files in dist
Added hash stuff

Modified Paths:
--------------
    pymoul/trunk/Makefile.in
    pymoul/trunk/compileui.py
    pymoul/trunk/setup.py

Modified: pymoul/trunk/Makefile.in
===================================================================
--- pymoul/trunk/Makefile.in	2007-01-28 17:15:47 UTC (rev 93)
+++ pymoul/trunk/Makefile.in	2007-01-28 21:14:23 UTC (rev 94)
@@ -4,7 +4,8 @@
 FINDPYTXT=find src/moul \( -name '*.py' -o -name '*.txt' \) $(NOTSVN) 
 FINDPY=find src/moul -name '*.py' $(NOTSVN)
 FINDQT=find src/moul/qt \( -name '*.py' -o -name '*.ui' \) $(NOTSVN)
-FINDTEXT=find src/moul \( -name '*.py' -o -name '*.txt' -o -name '*.qrc' -o -name '*.ui' -o -name '*.ts' \) $(NOTSVN) 
+FINDTEXT=find src/moul \( -name '*.py' -o -name '*.txt' -o -name '*.qrc' -o -name '*.ui' -o -name '*.ts' \) $(NOTSVN)
+FINDHASH= find . -not \( -name '*.txt' -o -name '*.asc' \) -a -not -type d 
 LANGS=de fr it es
 TESTFLAGS=-v
 TESTOPTS=
@@ -78,3 +79,9 @@
 	    lrelease src/moul/qt/i18n/pymoul_$${L}.ts; \
 	done 
 
+hash:
+	cd dist && $(FINDHASH) | xargs md5sum >md5.txt
+	cd dist && $(FINDHASH) | xargs sha1sum >sha1.txt
+	cd dist && $(FINDHASH) | xargs gpg --detach-sign -a
+	
+

Modified: pymoul/trunk/compileui.py
===================================================================
--- pymoul/trunk/compileui.py	2007-01-28 17:15:47 UTC (rev 93)
+++ pymoul/trunk/compileui.py	2007-01-28 21:14:23 UTC (rev 94)
@@ -11,7 +11,7 @@
 
 from PyQt4 import uic
 
-RE_RC_TEXT = "^import\ (?P<module>[a-zA-Z]\w*_rc)\s$"
+RE_RC_TEXT = "^import[ \.\\/]*(?P<module>[a-zA-Z]\w*_rc)\s$"
 RE_RC = re.compile(RE_RC_TEXT)
 
 UI_EXT = '.ui'
@@ -19,7 +19,7 @@
 QRC_EXT = '.qrc'
 PY_QRC_EXT = '_rc.py'
 QRC_COMPILER = "pyrcc4 -o %(py)s %(qrc)s"
-UI_MODULE = "moul.qt.ui"
+QRC_PACKAGE = "moul.qt.ui"
 
 def _newer(orig, py):
     try:
@@ -81,7 +81,7 @@
             # faster than re
             match = RE_RC.match(line)
             if match:
-                line = match.expand("from %s import \g<module>" % UI_MODULE)
+                line = match.expand("from %s import \g<module>" % QRC_PACKAGE)
         lines.append(line)
     fin.close()
     fout = open(fname, 'w')

Modified: pymoul/trunk/setup.py
===================================================================
--- pymoul/trunk/setup.py	2007-01-28 17:15:47 UTC (rev 93)
+++ pymoul/trunk/setup.py	2007-01-28 21:14:23 UTC (rev 94)
@@ -58,7 +58,10 @@
 setup_options = dict(
     setup_requires = ["setuptools>="+SETUPTOOLS_VERSION,],
     install_requires = [],
-    data_files = list(glob('*.txt')),
+    data_files = [
+        ('docs', list(glob('*.txt'))),
+        ('i18', list(glob('src/moul/qt/i18n/pymoul_*.*'))),
+        ],
     package_dir = {'' : 'src'},
     packages = find_packages('src', exclude="moul.qt"),
     include_package_data = True, 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.