Changeset 913

Show
Ignore:
Timestamp:
10/14/07 08:10:48
Author:
alexamici
Message:

hook/mapserver.py patches the mapserver setup.py so that we can build a mapscript egg.
Added a mapstript section that uses the zc.recipe.egg, this way there is non need to install mapscript in the system site-packages
even when we use the system python.
Use the new mapscript part in the normal build.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • buildout/pcl.buildout/trunk/buildout.cfg

    r792 r913  
    1111    postgis 
    1212    gdal 
    13     mapserver 
     13    mapscript 
    1414    PCL-Core 
    1515    PCL-GDAL 
    …… 
    2929recipe = zc.recipe.egg 
    3030eggs = 
     31    mapscript 
    3132    PCL-Core 
    3233    PCL-GDAL 

  • buildout/pcl.buildout/trunk/dependencies.cfg

    r895 r913  
    1515[custom-python] 
    1616executable = ${python:location}/bin/python 
     17 
     18[system-python] 
     19executable = /usr/bin/python2.4 
    1720 
    1821[libpng] 
    …… 
    139142keep-compile-dir = true 
    140143 
     144[mapscript] 
     145recipe = zc.recipe.egg:develop 
     146setup = ${mapserver:compile-directory}/mapscript/python/setup.py 
     147 
    141148[worldborders] 
    142149recipe = hexagonit.recipe.download 

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

    r898 r913  
    5858 
    5959        run('%s -modern -python -o mapscript_wrap.c ../mapscript.i' % options['swig']) 
    60         run('%s setup.py install' % buildout[buildout['buildout']['python']]['executable']) 
     60        run('sed -ie \'s/distutils.core/setuptools/\' setup.py') 
    6161    finally: 
    6262        os.chdir(here) 
    …… 
    8282 
    8383        run('%s -modern -python -o mapscript_wrap.c ../mapscript.i' % options['swig']) 
    84         run('%s setup.py install --prefix %s' % (buildout[buildout['buildout']['python']]['executable'], options['location'])) 
     84        run('sed -ie \'s/distutils.core/setuptools/\' setup.py') 
    8585    finally: 
    8686        os.chdir(here) 

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

    r900 r913  
    88    postgis 
    99    gdal 
    10     mapserver 
     10    mapscript 
    1111    PCL-Core 
    1212    PCL-GDAL 
    …… 
    2222recipe = zc.recipe.egg 
    2323eggs = 
     24    mapscript 
    2425    PCL-Core 
    2526    PCL-GDAL 
    …… 
    5354recipe = zc.recipe.testrunner 
    5455eggs = 
     56    mapscript 
    5557    PCL-MapServer 
    5658    elementtree