[py-svn] r11413 - in py/dist/py: . bin misc

[hpk at codespeak.net]

Author: hpk
Date: Sun Apr 24 23:47:04 2005
New Revision: 11413

Modified:
   py/dist/py/__init__.py
   py/dist/py/bin/_makepyrelease.py
   py/dist/py/misc/_dist.py
Log:
- don't put .svn files into distributions 

- enhance the _makepyrelease script a bit
  to build a win32 installer as well (untested)



Modified: py/dist/py/__init__.py
==============================================================================
--- py/dist/py/__init__.py	(original)
+++ py/dist/py/__init__.py	Sun Apr 24 23:47:04 2005
@@ -7,11 +7,11 @@
 
 initpkg(__name__, 
     description = "py.test and the py lib",
-    revision = '$LastChangedRevision$',
+    revision = int('$LastChangedRevision$'.split(':')[1][:-1]),
     lastchangedate = '$LastChangedDate$',
-    version = "0.8.0-pre-alpha", 
+    version = "0.8.0-alpha1", 
     url = "http://codespeak.net/py",
-    download_url = "http://codespeak.net/download/py/py-0.8.0-pre-alpha.tar.gz", 
+    download_url = "http://codespeak.net/download/py/py-0.8.0-alpha1.tar.gz", 
     license = "MIT license",
     platforms = ['unix', 'linux', 'cygwin'],
     author = "holger krekel & others",

Modified: py/dist/py/bin/_makepyrelease.py
==============================================================================
--- py/dist/py/bin/_makepyrelease.py	(original)
+++ py/dist/py/bin/_makepyrelease.py	Sun Apr 24 23:47:04 2005
@@ -15,7 +15,7 @@
     versioned = dict([(x.localpath,1) for x in status.allpath()])
 
     l = []
-    for x in rootdir.visit(): 
+    for x in rootdir.visit(None, lambda x: x.basename != '.svn'): 
         if x.check(file=1): 
             names = [y.basename for y in x.parts()]
             if '.svn' in names: 
@@ -57,6 +57,10 @@
                                         '-m', str(manifest), 
                                         '--formats=gztar,zip',  
                                         '-d', str(distdir)))
+        py._dist.setup(py, script_name="setup.py", 
+                           script_args=('-q', 'bdist_wininst', 
+                                        #'-m', str(manifest), 
+                                        '-d', str(distdir)))
     finally: 
         oldir.chdir()
     return distdir 
@@ -156,21 +160,21 @@
     distdir = make_distfiles(tmpdir) 
     targz = distdir.join('py-%s.tar.gz' % version)
     zip = distdir.join('py-%s.zip' % version)
-    files = targz, zip
+    files = distdir.listdir() 
     for fn in files: 
         assert fn.check(file=1) 
 
     remotedir = 'codespeak.net://www/codespeak.net/htdocs/download/py/' 
-    source = " ".join([str(x) for x in files]) 
+    source = distdir  # " ".join([str(x) for x in files]) 
     trace("rsyncing %(source)s to %(remotedir)s" % locals())
-    py.process.cmdexec("rsync -avz %(source)s %(remotedir)s" % locals())
+    py.process.cmdexec("rsync -avz %(source)s/ %(remotedir)s" % locals())
 
     ddir = tmpdir.ensure('download', dir=1)
     URL = py.__package__.download_url # 'http://codespeak.net/download/py/' 
     unpacked = unpackremotetar(ddir, URL)
     assert unpacked == ddir.join("py-%s" % (version,))
 
-    checksvnworks(unpacked) 
+    #checksvnworks(unpacked) 
     #pytest(unpacked)
 
     pytest_remote('test at codespeak.net', py.__package__.download_url)

Modified: py/dist/py/misc/_dist.py
==============================================================================
--- py/dist/py/misc/_dist.py	(original)
+++ py/dist/py/misc/_dist.py	Sun Apr 24 23:47:04 2005
@@ -24,7 +24,7 @@
         self.scripts.sort()
 
     def hacktree(self): 
-        for p in self._pkgdir.visit(): 
+        for p in self._pkgdir.visit(None, lambda x: x.basename != '.svn'): 
             if p.check(file=1): 
                 if p.ext in ('.pyc', '.pyo'): 
                     continue
@@ -35,9 +35,9 @@
                     self.addpythonfile(p) 
                 else: 
                     self.adddatafile(p)
-            else: 
-                if not p.listdir(): 
-                    self.adddatafile(p.ensure('dummy'))
+            #else: 
+            #    if not p.listdir(): 
+            #        self.adddatafile(p.ensure('dummy'))
 
     def adddatafile(self, p): 
         if p.ext in ('.pyc', 'pyo'):