Rev 2237: Install subvertpy as separate module. in http://people.samba.org/bzr/jelmer/bzr-svn/0.5

Jelmer Vernooij jelmer at samba.org
Mon Dec 8 15:00:27 GMT 2008


At http://people.samba.org/bzr/jelmer/bzr-svn/0.5

------------------------------------------------------------
revno: 2237
revision-id: jelmer at samba.org-20081208150013-8k10beqjat1dbe7r
parent: jelmer at samba.org-20081208143548-f3rqv15yjusdn69q
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.5
timestamp: Mon 2008-12-08 16:00:13 +0100
message:
  Install subvertpy as separate module.
modified:
  __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
  setup.py                       setup.py-20081002195455-nascfq8sx5o40xap-1
=== modified file '__init__.py'
--- a/__init__.py	2008-12-08 03:00:20 +0000
+++ b/__init__.py	2008-12-08 15:00:13 +0000
@@ -83,6 +83,7 @@
 try:
     import subvertpy 
 except ImportError:
+    # Apparently running from the source directory
     sys.path.insert(0, os.path.join(os.path.dirname(__file__), "subvertpy"))
     import subvertpy
 

=== modified file 'setup.py'
--- a/setup.py	2008-12-08 03:00:20 +0000
+++ b/setup.py	2008-12-08 15:00:13 +0000
@@ -22,16 +22,16 @@
       Bazaar.
       """,
       package_dir={'bzrlib.plugins.svn':'.',
-                   'bzrlib.plugins.svn.subvertpy':'subvertpy/subvertpy'},
+                   'subvertpy':'subvertpy/subvertpy'},
       packages=['bzrlib.plugins.svn', 
                 'bzrlib.plugins.svn.foreign', 
                 'bzrlib.plugins.svn.layout', 
                 'bzrlib.plugins.svn.mapping3', 
-                'bzrlib.plugins.svn.subvertpy', 
-                'bzrlib.plugins.svn.subvertpy.tests', 
+                'subvertpy', 
+                'subvertpy.tests', 
                 'bzrlib.plugins.svn.tests',
                 'bzrlib.plugins.svn.tests.mapping3',
                 'bzrlib.plugins.svn.tests.mapping_implementations'],
-      ext_modules=subvertpy_modules("bzrlib.plugins.svn.subvertpy"),
+      ext_modules=subvertpy_modules("subvertpy"),
       cmdclass = { 'install_lib': install_lib_with_dlls },
       )




More information about the bazaar-commits mailing list