[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH] swig-dist-install.patch (2)

From: Brandon Ehle <behle_at_pipedreaminteractive.com>
Date: 2002-12-12 05:12:22 CET

* Makefile.in:
 This adds the ability for package maintainers to provide a
 --prefix= command or for users to provide --home=~ if they don't
 have write permissions to lib/python2.2/site-packages.

* subversion/bindings/swig/INSTALL:
  Corrected documentation for swig-py-ext and install-swig-py-ext.

* subversion/bindings/swig/python/setup.py:
  Documentation corrections and removed unused code.

Index: Makefile.in
===================================================================
--- Makefile.in (revision 4098)
+++ Makefile.in (working copy)
@@ -309,11 +309,11 @@
 
 swig-py-ext: swig-assert-available
         cd $(SWIG_BUILD_DIR)/python; \
- $(PYTHON) $(PYTHON_DISTUTIL) build
+ $(PYTHON) $(PYTHON_DISTUTIL) build $(DISTUTIL_PARAM)
 
 install-swig-py-ext: swig-assert-available
         cd $(SWIG_BUILD_DIR)/python; \
- $(PYTHON) $(PYTHON_DISTUTIL) install
+ $(PYTHON) $(PYTHON_DISTUTIL) install $(DISTUTIL_PARAM)
 
 swig-py-ext-clean:
         rm -rf $(SWIG_BUILD_DIR)/python/build
Index: subversion/bindings/swig/python/setup.py
===================================================================
--- subversion/bindings/swig/python/setup.py (revision 4098)
+++ subversion/bindings/swig/python/setup.py (working copy)
@@ -57,13 +57,12 @@
   _do_usage()
 
 # Parse the command-line arguments, keeping what we want and letting
-# distutils have the rest. This effectively guts all manor of
-# command-line option support from distutils, leaving us to specify
-# all the options that we allow (which is FAR less than the set of
-# distutils options). If we find that people actually care, we can
-# revisit this.
+# distutils have the rest. Distutils parameters should come after
+# the target as in 'python setup.py build --prefix=/usr/local' and
+# parameters for us should appear before the target as in
+# 'python setup.py -I/usr/include build'.
 options, leftovers = getopt.getopt(sys.argv[1:], "I:L:C:R:S:s:h",
- ["prefix=", "install-dir=", "help"])
+ ["help"])
 for option in options:
   if option[0] == '-I':
     include_dirs.append(option[1])
Index: subversion/bindings/swig/INSTALL
===================================================================
--- subversion/bindings/swig/INSTALL (revision 4098)
+++ subversion/bindings/swig/INSTALL (working copy)
@@ -62,13 +62,20 @@
        will copy your new Python libraries into the appropriate system
        location.
 
+ Note: If you don't have access to install to python's site-packages
+ directory, you can have the python modules install to your home
+ directory. You can do this by running
+ 'make install-swig-py-ext DISTUTIL_PARAM=--home=~'.
+
+ Note: If you want to install to an alterante prefix (usually only
+ if you are building packages), you can supply the prefix here. An
+ example of doing this for building rpms looks like
+ 'make install-swig-py-ext DISTUTIL_PARAM=--prefix=$RPM_BUILD_ROOT/usr'.
+
        On Windows, ???
 
- 3. Verify that an 'svn' package has been created. It should be
- sitting right in the current directory: a subdir containing
- .py files and an __init__.py. Also verify that the package was
- installed to a public area. (For example, some place like
- /usr/local/lib/python2.2/site-packages/svn)
+ 3. Verify that an 'svn' package has been installed correctly. You can
+ do this by running python via 'python -c "from svn import client"'.
 
    4. Try some demo programs. From the top of your svn working copy,
        cd tools/examples/, and try running 'svnlook.py'.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Dec 12 02:09:41 2002

This is an archived mail posted to the Subversion Dev mailing list.