Changeset 831

Timestamp:

08/11/07 11:48:14

Author:

dokai

Message:

Added rpath configuration for all relevant components. It is no longer necessary to set LD_LIBRARY_PATH.

Files:

• buildout/pcl.buildout/trunk/dependencies.cfg (modified) (2 diffs)
• buildout/pcl.buildout/trunk/hooks/gdal.py (modified) (2 diffs)
• buildout/pcl.buildout/trunk/hooks/mapserver.py (modified) (1 diff)
• buildout/pcl.buildout/trunk/pcl-core.cfg (modified) (1 diff)
• buildout/pcl.buildout/trunk/pcl-gdal.cfg (modified) (1 diff)
• buildout/pcl.buildout/trunk/pcl-mapserver.cfg (modified) (1 diff)
• buildout/pcl.buildout/trunk/README.txt (modified) (2 diffs)
• buildout/pcl.buildout/trunk/setenv (deleted)

buildout/pcl.buildout/trunk/dependencies.cfg

@@ -81 +81 @@
-include-dirs = ${postgresql:location}/include
-library-dirs = ${postgresql:location}/lib
+rpath = ${postgresql:location}/lib
-
-[proj]
@@ -101 +102 @@
-    --with-pg=${postgresql:location}/bin/pg_config
-    --with-png=${libpng:location}
+    --with-jpeg=${libjpeg:location}
-    --with-gif=${libgif:location}
-    --with-tiff=${libtiff:location}
+    --with-curl=${curl:location}/bin/curl-config
-    PYTHON=${custom-python:executable}
-make-targets =

buildout/pcl.buildout/trunk/hooks/gdal.py

@@ -1 +1 @@
-import logging
+import shutil
-import os
+import re
-
-import zc.buildout
@@ -6 +8 @@
-log = logging.getLogger('GDAL hook')
-
+def substitute(filename, search_re, replacement):
+    """Substitutes text within the contents of ``filename`` matching
+    ``search_re`` with ``replacement``.
+    """
+    search = re.compile(search_re, re.MULTILINE)
+    text = open(filename).read()
+    text = replacement.join(search.split(text))
+    
+    newfilename = '%s%s' % (filename, '.~new')
+    newfile = open(newfilename, 'w')
+    newfile.write(text)
+    newfile.close()
+    shutil.copymode(filename, newfilename)
+    shutil.move(newfilename, filename)
+
+
-def post_make(options, buildout):
-    """Custom post-make hook for bulding GDAL python bindings."""
+    # Generate rpath information..
+    rpath = ['%s/lib' % buildout[part]['location']
+             for part
+             in ('geos','proj','postgresql','libpng','libtiff','libgif','libjpeg','curl')
+             ] + ['%s/lib' % options['location']]
+
+    # ..and push it into the setup file
+    substitute('setup.py',
+               'extra_link_args=EXTRA_LINK_ARGS,',
+               'extra_link_args=EXTRA_LINK_ARGS, runtime_library_dirs=%s' % str(rpath))
+    
-    cmd = '%s setup.py install' % buildout[buildout['buildout']['python']]['executable']
-    log.info('Installing GDAL python bindings')

buildout/pcl.buildout/trunk/hooks/mapserver.py

@@ -41 +41 @@
-    here = os.getcwd()
-    os.chdir('mapscript/python')
+
-    try:
-        log.info('Installing python mapscript')
+
+        # Generate rpath information..
+        rpath = ['%s/lib' % buildout[part]['location']
+                 for part
+                 in ('geos','proj','postgresql','libpng','libtiff','libgif',
+                     'libjpeg','curl','postgis','libgd','freetype','gdal')
+                 ]
+
+        # ..and push it into the setup file
+        substitute('setup.py',
+                   'extra_link_args = extras,',
+                   'extra_link_args = extras, runtime_library_dirs=%s' % str(rpath))
+
-        run('%s -modern -python -o mapscript_wrap.c ../mapscript.i' % options['swig'])
-        run('%s setup.py install' % buildout[buildout['buildout']['python']]['executable'])

buildout/pcl.buildout/trunk/pcl-core.cfg

@@ -35 +35 @@
-    ${geos:location}/lib
-    ${proj:location}/lib
+rpath = 
+    ${geos:location}/lib
+    ${proj:location}/lib
-
-[test-pcl-core]

buildout/pcl.buildout/trunk/pcl-gdal.cfg

@@ -37 +37 @@
-    ${gdal:location}/lib
-    ${proj:location}/lib
+rpath = 
+    ${proj:location}/lib
+    ${libpng:location}/lib
+    ${libgif:location}/lib
+    ${libtiff:location}/lib
+    ${gdal:location}/lib
+    ${postgresql:location}/lib
-
-[test-pcl-gdal]

buildout/pcl.buildout/trunk/pcl-mapserver.cfg

@@ -41 +41 @@
-library-dirs =
-    ${geos:location}/lib
+rpath =
+    ${curl:location}/lib
+    ${geos:location}/lib
+    ${proj:location}/lib
+    ${libgd:location}/lib
+
-swig = ${swig:location}/bin/swig
-swig-opts = -python -modern -keyword

buildout/pcl.buildout/trunk/README.txt

@@ -30 +30 @@
- $ python bootstrap.py
- $ ./bin/buildout
- $ . ./setenv
- $ python init_postgresql.py
- $ ./bin/test_core
@@ -116 +115 @@
-
-
-Setting up the search path for dynamic libraries
-------------------------------------------------
-
-Because many of the dependencies contain libraries that are installed
-within the buildout sandbox, we need to tell the dynamic linker where
-to find these libraries.
-
-Some of the components are smart enough to use the information
-provided during the make process, but the rest of them must be told
-explicitly. The easiest and non-intrusive way to do this is to use an
-environment variable.
-
-On Linux (and possibly other *nix systems) you must use
-
-  LD_LIBRARY_PATH
-
-on Max OS X
-
-  DYLD_LIBRARY_PATH
-
-Check your operating system documentation for the correct environment
-variable to use. The contents of the variable should be a colon
-separated list of filesystem location containing the libraries.
-
-There is a helper script ``setenv`` that will set the paths for
-you. You need to check and possibly modify it to make sure it sets the
-correct environment variable variable for your system. The script
-already contains options for some environments so can simply uncomment
-the one suitable for you.
-
-On a Linux system using ``bash`` for a shell you can simply do::
-
-  $ . ./setenv
-
-which will set your environment. You can check this by running::
-
-  $ env | grep LD_LIBRARY_PATH
-
-
-Setting up PostgreSQL
----------------------