Rev 1011: Simplify version handling. in file:///data/jelmer/bzr-svn/pyrex/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/pyrex/

------------------------------------------------------------
revno: 1011
revision-id:jelmer at samba.org-20080318203411-xy7ogj0mi12i468w
parent: jelmer at samba.org-20080318193331-74qkzmvt4s1wp6om
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: pyrex
timestamp: Tue 2008-03-18 21:34:11 +0100
message:
  Simplify version handling.
modified:
  Makefile                       makefile.other-20080311181537-5svhje3v1flh1n4f-1
  ra.pyx                         ra.pyx-20080313140933-qybkqaxe3m4mcll7-1
  wc.pyx                         wc.pyx-20080313142018-10l8l23vha2j9e6b-1
=== modified file 'Makefile'
--- a/Makefile	2008-03-16 04:31:39 +0000
+++ b/Makefile	2008-03-18 20:34:11 +0000
@@ -20,6 +20,7 @@
 
 clean::
 	$(SETUP) clean
+	rm -f *.c *.so
 
 TMP_PLUGINS_DIR = $(shell pwd)/.plugins
 

=== modified file 'ra.pyx'
--- a/ra.pyx	2008-03-18 19:33:31 +0000
+++ b/ra.pyx	2008-03-18 20:34:11 +0000
@@ -57,7 +57,7 @@
 
     ctypedef struct svn_delta_editor_t:
         svn_error_t *(*set_target_revision)(void *edit_baton, 
-                svn_revnum_t target_revision, apr_pool_t *pool) except *
+                svn_revnum_t target_revision, apr_pool_t *pool) except * 
         svn_error_t *(*open_root)(void *edit_baton, svn_revnum_t base_revision, 
                                   apr_pool_t *dir_pool, void **root_baton)
 
@@ -517,8 +517,9 @@
 
     :return: tuple with major, minor, patch version number and tag.
     """
-    return (svn_ra_version().major, svn_ra_version().minor, 
-            svn_ra_version().minor, svn_ra_version().tag)
+    cdef svn_version_t *ver
+    ver = svn_ra_version()
+    return (ver.major, ver.minor, ver.minor, ver.tag)
 
 cdef svn_error_t *py_editor_set_target_revision(void *edit_baton, svn_revnum_t target_revision, apr_pool_t *pool) except *:
     self = <object>edit_baton

=== modified file 'wc.pyx'
--- a/wc.pyx	2008-03-18 19:33:31 +0000
+++ b/wc.pyx	2008-03-18 20:34:11 +0000
@@ -238,8 +238,9 @@
 
     :return: tuple with major, minor, patch version number and tag.
     """
-    return (svn_wc_version().major, svn_wc_version().minor, 
-            svn_wc_version().minor, svn_wc_version().tag)
+    cdef svn_version_t *ver
+    ver = svn_wc_version()
+    return (ver.major, ver.minor, ver.minor, ver.tag)
 
 
 cdef void py_wc_notify_func(void *baton, svn_wc_notify_t *notify, apr_pool_t *pool):