[Erp5-report] r41113 kazuhiko - in /erp5/trunk/utils/pysvn: ./ Source/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Fri Dec  3 22:44:11 2010
New Revision: 41113

URL: http://svn.erp5.org?rev=41113&view=rev
Log:
pysvn-1.7.4nxd006
* use relative path to make ccache working.
* call bdist_egg.make_zipfile() instead of calling zip command.

Modified:
    erp5/trunk/utils/pysvn/Source/pysvn_common.mak
    erp5/trunk/utils/pysvn/Source/setup_configure.py
    erp5/trunk/utils/pysvn/setup.py

Modified: erp5/trunk/utils/pysvn/Source/pysvn_common.mak
URL: http://svn.erp5.org/erp5/trunk/utils/pysvn/Source/pysvn_common.mak?rev=41113&r1=41112&r2=41113&view=diff
==============================================================================
--- erp5/trunk/utils/pysvn/Source/pysvn_common.mak [utf8] (original)
+++ erp5/trunk/utils/pysvn/Source/pysvn_common.mak [utf8] Fri Dec  3 22:44:11 2010
@@ -181,13 +181,16 @@ clean:
 test: pysvn/__init__.py pysvn/%(pysvn_module_name)s
 	PYTHONPATH=. $(PYTHON) -c "import pysvn;print( pysvn );print( pysvn.version );print( pysvn.svn_version );print( pysvn.Client() )"
 
-DISTDIR=$(shell python -c "import os; print os.path.abspath(os.path.join(os.curdir, '..', 'dist'))")
-egg: pysvn/%(pysvn_module_name)s
+DISTDIR=$(shell $(PYTHON) -c "import os; print os.path.abspath(os.path.join(os.curdir, '..', 'dist'))")
+dist: all
+	rm -rf dist
 	mkdir -p dist/EGG-INFO
-	mkdir -p $(DISTDIR)
 	cp -rvf pysvn dist
 	cp -rvf ../pysvn.egg-info/* dist/EGG-INFO
 	find dist/ | sed 's:dist/::' > dist/EGG-INFO/SOURCES.txt
+
+egg: dist
+	mkdir -p $(DISTDIR)
 	rm -f $(DISTDIR)/pysvn-%(pysvn_version)s-py%(python_version)s-%(python_platform)s.egg
 	(cd dist ; zip -r $(DISTDIR)/pysvn-%(pysvn_version)s-py%(python_version)s-%(python_platform)s.egg *)
 	rm -rf dist

Modified: erp5/trunk/utils/pysvn/Source/setup_configure.py
URL: http://svn.erp5.org/erp5/trunk/utils/pysvn/Source/setup_configure.py?rev=41113&r1=41112&r2=41113&view=diff
==============================================================================
--- erp5/trunk/utils/pysvn/Source/setup_configure.py [utf8] (original)
+++ erp5/trunk/utils/pysvn/Source/setup_configure.py [utf8] Fri Dec  3 22:44:11 2010
@@ -315,7 +315,7 @@ class MakeFileCreater:
             'python_platform':  distutils.util.get_platform(),
 
             # pysvn version:
-            'pysvn_version':    '%(MAJOR)s.%(MINOR)s.%(PATCH)snxd005' % pysvn_version_info,
+            'pysvn_version':    '%(MAJOR)s.%(MINOR)s.%(PATCH)snxd006' % pysvn_version_info,
 
             # mac arch options
             'mac_os_x_arch':    self.mac_os_x_arch
@@ -979,7 +979,7 @@ LDLIBS= \
             if self.verbose:
                 print( 'Info: Checking for %s in %s' % (name, full_check_file) )
             if os.path.exists( full_check_file ):
-                return os.path.abspath( dirname )
+                return dirname
 
         raise SetupError( 'cannot find %s %s - use %s' % (name, check_file, kw) )
 

Modified: erp5/trunk/utils/pysvn/setup.py
URL: http://svn.erp5.org/erp5/trunk/utils/pysvn/setup.py?rev=41113&r1=41112&r2=41113&view=diff
==============================================================================
--- erp5/trunk/utils/pysvn/setup.py [utf8] (original)
+++ erp5/trunk/utils/pysvn/setup.py [utf8] Fri Dec  3 22:44:11 2010
@@ -42,8 +42,9 @@ def run(self):
     os.chdir('Source')
     os.system(sys.executable + ' setup.py configure --include-dirs=%(include-dirs)s --library-dirs=%(library-dirs)s' % kw)
     os.system('make clean')
-    os.system('make')
-    os.system('make egg DISTDIR="%s"' % os.path.abspath(os.path.join('..', self.dist_dir)))
+    os.system('make dist')
+    setuptools.command.bdist_egg.make_zipfile(self.egg_output, 'dist', verbose=self.verbose,
+                       dry_run=self.dry_run, mode=self.gen_header())
     os.chdir('..')              # Go back in parent directory
     # Add to 'Distribution.dist_files' so that the "upload" command works
     getattr( self.distribution, 'dist_files', [] ).append(
@@ -56,7 +57,7 @@ name = "pysvn"
 
 setuptools.setup(
     name = name,
-    version='%(MAJOR)s.%(MINOR)s.%(PATCH)snxd005' % pysvn_version_info,
+    version='%(MAJOR)s.%(MINOR)s.%(PATCH)snxd006' % pysvn_version_info,
     author="Barry Scott",
     author_email="barryscott at tigris.org",
     description="Subversion support for Python",