Rev 974: Merge setup.py improvements. in file:///data/jelmer/bzr-svn/pyrex/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 974
revision-id:jelmer at samba.org-20080315134756-4g5s5s6bbeeblead
parent: jelmer at samba.org-20080315134627-4p3oyo53o45k0b09
parent: jelmer at samba.org-20080315131229-eg609rswlx1ls082
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: pyrex
timestamp: Sat 2008-03-15 14:47:56 +0100
message:
  Merge setup.py improvements.
modified:
  setup.py                       setup.py-20060502115218-86950492da22353f
    ------------------------------------------------------------
    revno: 972.1.1
    revision-id:jelmer at samba.org-20080315131229-eg609rswlx1ls082
    parent: jelmer at samba.org-20080314131927-818n92rrq2ql3p86
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: pyrex
    timestamp: Sat 2008-03-15 14:12:29 +0100
    message:
      Clearer error when APR or Subversion header files are not found.
    modified:
      setup.py                       setup.py-20060502115218-86950492da22353f
=== modified file 'setup.py'
--- a/setup.py	2008-03-14 13:19:27 +0000
+++ b/setup.py	2008-03-15 13:12:29 +0000
@@ -1,4 +1,6 @@
 #!/usr/bin/env python2.4
+# Setup file for bzr-svn
+# Copyright (C) 2005-2008 Jelmer Vernooij <jelmer at samba.org>
 
 from distutils.core import setup
 from distutils.extension import Extension
@@ -6,14 +8,19 @@
 import os
 
 def apr_include_dir():
+    """Determine the APR header file location."""
     f = os.popen("apr-config --includedir")
     dir = f.read().rstrip("\n")
-    assert os.path.isdir(dir)
+    if not os.path.isdir(dir):
+        raise Exception("APR development headers not found")
     return dir
 
 def svn_include_dir():
-    # FIXME
-    return "/usr/include/subversion-1"
+    """Determine the Subversion header file location."""
+    dir = "/usr/include/subversion-1"
+    if not os.path.isdir(dir):
+        raise Exception("Subversion development headers not found")
+    return dir
 
 setup(name='bzr-svn',
       description='Support for Subversion branches in Bazaar',