Index: trunk/pyext/ez_setup.py =================================================================== --- trunk/pyext/ez_setup.py (revision 924) +++ trunk/pyext/ez_setup.py (revision 925) @@ -1,276 +0,0 @@ -#!python -"""Bootstrap setuptools installation - -If you want to use setuptools in your package's setup.py, just include this -file in the same directory with it, and add this to the top of your setup.py:: - - from ez_setup import use_setuptools - use_setuptools() - -If you want to require a specific version of setuptools, set a download -mirror, or use an alternate download directory, you can do so by supplying -the appropriate options to ``use_setuptools()``. - -This file can also be run as a script to install or upgrade setuptools. -""" -import sys -DEFAULT_VERSION = "0.6c9" -DEFAULT_URL = "http://pypi.python.org/packages/%s/s/setuptools/" % sys.version[:3] - -md5_data = { - 'setuptools-0.6b1-py2.3.egg': '8822caf901250d848b996b7f25c6e6ca', - 'setuptools-0.6b1-py2.4.egg': 'b79a8a403e4502fbb85ee3f1941735cb', - 'setuptools-0.6b2-py2.3.egg': '5657759d8a6d8fc44070a9d07272d99b', - 'setuptools-0.6b2-py2.4.egg': '4996a8d169d2be661fa32a6e52e4f82a', - 'setuptools-0.6b3-py2.3.egg': 'bb31c0fc7399a63579975cad9f5a0618', - 'setuptools-0.6b3-py2.4.egg': '38a8c6b3d6ecd22247f179f7da669fac', - 'setuptools-0.6b4-py2.3.egg': '62045a24ed4e1ebc77fe039aa4e6f7e5', - 'setuptools-0.6b4-py2.4.egg': '4cb2a185d228dacffb2d17f103b3b1c4', - 'setuptools-0.6c1-py2.3.egg': 'b3f2b5539d65cb7f74ad79127f1a908c', - 'setuptools-0.6c1-py2.4.egg': 'b45adeda0667d2d2ffe14009364f2a4b', - 'setuptools-0.6c2-py2.3.egg': 'f0064bf6aa2b7d0f3ba0b43f20817c27', - 'setuptools-0.6c2-py2.4.egg': '616192eec35f47e8ea16cd6a122b7277', - 'setuptools-0.6c3-py2.3.egg': 'f181fa125dfe85a259c9cd6f1d7b78fa', - 'setuptools-0.6c3-py2.4.egg': 'e0ed74682c998bfb73bf803a50e7b71e', - 'setuptools-0.6c3-py2.5.egg': 'abef16fdd61955514841c7c6bd98965e', - 'setuptools-0.6c4-py2.3.egg': 'b0b9131acab32022bfac7f44c5d7971f', - 'setuptools-0.6c4-py2.4.egg': '2a1f9656d4fbf3c97bf946c0a124e6e2', - 'setuptools-0.6c4-py2.5.egg': '8f5a052e32cdb9c72bcf4b5526f28afc', - 'setuptools-0.6c5-py2.3.egg': 'ee9fd80965da04f2f3e6b3576e9d8167', - 'setuptools-0.6c5-py2.4.egg': 'afe2adf1c01701ee841761f5bcd8aa64', - 'setuptools-0.6c5-py2.5.egg': 'a8d3f61494ccaa8714dfed37bccd3d5d', - 'setuptools-0.6c6-py2.3.egg': '35686b78116a668847237b69d549ec20', - 'setuptools-0.6c6-py2.4.egg': '3c56af57be3225019260a644430065ab', - 'setuptools-0.6c6-py2.5.egg': 'b2f8a7520709a5b34f80946de5f02f53', - 'setuptools-0.6c7-py2.3.egg': '209fdf9adc3a615e5115b725658e13e2', - 'setuptools-0.6c7-py2.4.egg': '5a8f954807d46a0fb67cf1f26c55a82e', - 'setuptools-0.6c7-py2.5.egg': '45d2ad28f9750e7434111fde831e8372', - 'setuptools-0.6c8-py2.3.egg': '50759d29b349db8cfd807ba8303f1902', - 'setuptools-0.6c8-py2.4.egg': 'cba38d74f7d483c06e9daa6070cce6de', - 'setuptools-0.6c8-py2.5.egg': '1721747ee329dc150590a58b3e1ac95b', - 'setuptools-0.6c9-py2.3.egg': 'a83c4020414807b496e4cfbe08507c03', - 'setuptools-0.6c9-py2.4.egg': '260a2be2e5388d66bdaee06abec6342a', - 'setuptools-0.6c9-py2.5.egg': 'fe67c3e5a17b12c0e7c541b7ea43a8e6', - 'setuptools-0.6c9-py2.6.egg': 'ca37b1ff16fa2ede6e19383e7b59245a', -} - -import sys, os -try: from hashlib import md5 -except ImportError: from md5 import md5 - -def _validate_md5(egg_name, data): - if egg_name in md5_data: - digest = md5(data).hexdigest() - if digest != md5_data[egg_name]: - print >>sys.stderr, ( - "md5 validation of %s failed! (Possible download problem?)" - % egg_name - ) - sys.exit(2) - return data - -def use_setuptools( - version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir, - download_delay=15 -): - """Automatically find/download setuptools and make it available on sys.path - - `version` should be a valid setuptools version number that is available - as an egg for download under the `download_base` URL (which should end with - a '/'). `to_dir` is the directory where setuptools will be downloaded, if - it is not already available. If `download_delay` is specified, it should - be the number of seconds that will be paused before initiating a download, - should one be required. If an older version of setuptools is installed, - this routine will print a message to ``sys.stderr`` and raise SystemExit in - an attempt to abort the calling script. - """ - was_imported = 'pkg_resources' in sys.modules or 'setuptools' in sys.modules - def do_download(): - egg = download_setuptools(version, download_base, to_dir, download_delay) - sys.path.insert(0, egg) - import setuptools; setuptools.bootstrap_install_from = egg - try: - import pkg_resources - except ImportError: - return do_download() - try: - pkg_resources.require("setuptools>="+version); return - except pkg_resources.VersionConflict, e: - if was_imported: - print >>sys.stderr, ( - "The required version of setuptools (>=%s) is not available, and\n" - "can't be installed while this script is running. Please install\n" - " a more recent version first, using 'easy_install -U setuptools'." - "\n\n(Currently using %r)" - ) % (version, e.args[0]) - sys.exit(2) - else: - del pkg_resources, sys.modules['pkg_resources'] # reload ok - return do_download() - except pkg_resources.DistributionNotFound: - return do_download() - -def download_setuptools( - version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir, - delay = 15 -): - """Download setuptools from a specified location and return its filename - - `version` should be a valid setuptools version number that is available - as an egg for download under the `download_base` URL (which should end - with a '/'). `to_dir` is the directory where the egg will be downloaded. - `delay` is the number of seconds to pause before an actual download attempt. - """ - import urllib2, shutil - egg_name = "setuptools-%s-py%s.egg" % (version,sys.version[:3]) - url = download_base + egg_name - saveto = os.path.join(to_dir, egg_name) - src = dst = None - if not os.path.exists(saveto): # Avoid repeated downloads - try: - from distutils import log - if delay: - log.warn(""" ---------------------------------------------------------------------------- -This script requires setuptools version %s to run (even to display -help). I will attempt to download it for you (from -%s), but -you may need to enable firewall access for this script first. -I will start the download in %d seconds. - -(Note: if this machine does not have network access, please obtain the file - - %s - -and place it in this directory before rerunning this script.) ----------------------------------------------------------------------------""", - version, download_base, delay, url - ); from time import sleep; sleep(delay) - log.warn("Downloading %s", url) - src = urllib2.urlopen(url) - # Read/write all in one block, so we don't create a corrupt file - # if the download is interrupted. - data = _validate_md5(egg_name, src.read()) - dst = open(saveto,"wb"); dst.write(data) - finally: - if src: src.close() - if dst: dst.close() - return os.path.realpath(saveto) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -def main(argv, version=DEFAULT_VERSION): - """Install or upgrade setuptools and EasyInstall""" - try: - import setuptools - except ImportError: - egg = None - try: - egg = download_setuptools(version, delay=0) - sys.path.insert(0,egg) - from setuptools.command.easy_install import main - return main(list(argv)+[egg]) # we're done here - finally: - if egg and os.path.exists(egg): - os.unlink(egg) - else: - if setuptools.__version__ == '0.0.1': - print >>sys.stderr, ( - "You have an obsolete version of setuptools installed. Please\n" - "remove it from your system entirely before rerunning this script." - ) - sys.exit(2) - - req = "setuptools>="+version - import pkg_resources - try: - pkg_resources.require(req) - except pkg_resources.VersionConflict: - try: - from setuptools.command.easy_install import main - except ImportError: - from easy_install import main - main(list(argv)+[download_setuptools(delay=0)]) - sys.exit(0) # try to force an exit - else: - if argv: - from setuptools.command.easy_install import main - main(argv) - else: - print "Setuptools version",version,"or greater has been installed." - print '(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)' - -def update_md5(filenames): - """Update our built-in md5 registry""" - - import re - - for name in filenames: - base = os.path.basename(name) - f = open(name,'rb') - md5_data[base] = md5(f.read()).hexdigest() - f.close() - - data = [" %r: %r,\n" % it for it in md5_data.items()] - data.sort() - repl = "".join(data) - - import inspect - srcfile = inspect.getsourcefile(sys.modules[__name__]) - f = open(srcfile, 'rb'); src = f.read(); f.close() - - match = re.search("\nmd5_data = {\n([^}]+)}", src) - if not match: - print >>sys.stderr, "Internal error!" - sys.exit(2) - - src = src[:match.start(1)] + repl + src[match.end(1):] - f = open(srcfile,'w') - f.write(src) - f.close() - - -if __name__=='__main__': - if len(sys.argv)>2 and sys.argv[1]=='--md5update': - update_md5(sys.argv[2:]) - else: - main(sys.argv[1:]) - - - - - - Index: trunk/pyext/AGILe/__init__.py =================================================================== --- trunk/pyext/AGILe/__init__.py (revision 924) +++ trunk/pyext/AGILe/__init__.py (revision 925) @@ -1,24 +1,24 @@ "Python interface to the Rivet MC validation system" ## Change dlopen status to GLOBAL for AGILe lib loading import sys try: import ctypes sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL) del ctypes except: import dl sys.setdlopenflags(sys.getdlopenflags() | dl.RTLD_GLOBAL) del dl del sys ## Import SWIG-generated wrapper core from agilewrap import * ## Provide an extra Python-only function used to enforce the AGILe scripts' minimal Python version def check_python_version(): import sys - req_version = (2,4,0) + req_version = (2,7,0) if sys.version_info[:3] < req_version: - print "rivet scripts require Python version >= %s... exiting" % ".".join(req_version) + print("AGILe scripts require Python version >= %s... exiting" % ".".join(req_version)) sys.exit(1) Index: trunk/configure.ac =================================================================== --- trunk/configure.ac (revision 924) +++ trunk/configure.ac (revision 925) @@ -1,251 +1,251 @@ ## Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) AC_INIT([AGILe],[1.5.0],[rivet@projects.hepforge.org],[AGILe]) ## Check and block installation into the src/build dir if test "$prefix" = "$PWD"; then AC_MSG_ERROR([Installation into the build directory is not supported: use a different --prefix argument]) fi ## Force default prefix to have a path value rather than NONE if test "$prefix" = "NONE"; then prefix=/usr/local fi AC_CONFIG_SRCDIR([src/Core/Loader.cc]) AC_CONFIG_HEADER([include/AGILe/DummyConfig.hh include/AGILe/AGILeConfig.hh include/AGILe/FortranWrappers.hh]) AM_INIT_AUTOMAKE(dist-bzip2) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_CONFIG_MACRO_DIR([m4]) ## Package-specific #defines AC_DEFINE_UNQUOTED(AGILE_VERSION, "$PACKAGE_VERSION", "AGILe version string") AC_DEFINE_UNQUOTED(AGILE_NAME, "$PACKAGE_NAME", "AGILe name string") AC_DEFINE_UNQUOTED(AGILE_STRING, "$PACKAGE_STRING", "AGILe name and version string") AC_DEFINE_UNQUOTED(AGILE_TARNAME, "$PACKAGE_TARNAME", "AGILe short name string") AC_DEFINE_UNQUOTED(AGILE_BUGREPORT, "$PACKAGE_BUGREPORT", "AGILe contact email address") ## Library version flags, current:revision:age (increment these for each new version) -VERSIONFLAGS="-version-info 10:0:0" ## set for 1.4.1 +VERSIONFLAGS="-version-info 10:0:0" ## set for 1.5.0 AC_SUBST(VERSIONFLAGS) ## Cache PATH variable AC_ARG_VAR(PATH, [we grab the PATH variable, since various generator config scripts may need to be called repeatably]) ## Set default compiler flags if test "x$CXXFLAGS" == "x"; then CXXFLAGS="-O3"; fi ## More comprehensible error messages if possible. See: ## http://www.bdsoft.com/tools/stlfilt.html if test "x$CXXFLAGS" == "x"; then AC_PATH_PROG(GFILT, gfilt, $CXX, $PATH:$HOME/bin:$HOME/local/bin) CXX=$GFILT fi ## Declare language AC_LANG(C++) ## OS X AC_CEDAR_OSX ## LCG platform tag AC_LCG_TAG ## Checks for programs. AC_PROG_CXX AC_PROG_FC(gfortran g95 g77) AC_FC_LIBRARY_LDFLAGS AC_FC_WRAPPERS AC_PROG_INSTALL AC_PROG_LN_S AC_DISABLE_STATIC ## Hack to make libtool use the FC Fortran compiler via F77, since ## libtool < 2.x doesn't understand --tag=FC F77=$FC AM_FFLAGS=$AM_FCFLAGS AC_SUBST(F77) AC_SUBST(AM_FFLAGS) AC_LIBTOOL_DLOPEN AC_PROG_LIBTOOL ## Work out library suffix for the build LIB_SUFFIX=\\\"$shrext_cmds\\\" AC_SUBST([LIB_SUFFIX]) ## System libraries AC_CEDAR_HEADERS([Boost], , , [AC_MSG_ERROR([Boost is required])]) oldCPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$BOOSTINCPATH" BOOSTERRMSG="You need at least version 1.34.0 of Boost for this installation." BOOSTERRMSG="$BOOSTERRMSG If you want to use Boost from a non-standard location," BOOSTERRMSG="$BOOSTERRMSG please specify '--with-boost-incpath=/path/to/boost_1_35/include'" BOOSTERRMSG="$BOOSTERRMSG as option to the configure script or run 'export" BOOSTERRMSG="$BOOSTERRMSG BOOSTFLAGS=--with-boost-incpath=/path/to/boost_1_35/include'" BOOSTERRMSG="$BOOSTERRMSG before you run the rivet-bootstrap script." AC_CHECK_HEADER([boost/foreach.hpp], [], [AC_MSG_ERROR([Boost foreach not found. $BOOSTERRMSG])]) AC_CHECK_HEADER([boost/smart_ptr.hpp], [], [AC_MSG_ERROR([Boost smart_ptr not found. $BOOSTERRMSG])]) AC_CHECK_HEADER([boost/lexical_cast.hpp], [], [AC_MSG_ERROR([Boost lexical_cast not found. $BOOSTERRMSG])]) AC_CHECK_HEADER([boost/assign.hpp], [], [AC_MSG_ERROR([Boost assign not found. $BOOSTERRMSG])]) CPPFLAGS=$oldCPPFLAGS ## Testing HepMC AC_CEDAR_LIBRARYANDHEADERS([HepMC], , , [AC_MSG_ERROR([HepMC is required])]) #AC_CEDAR_LIBRARY([HepMCfio], , , [AC_MSG_ERROR([HepMCfio is required])]) ## Standard build flags AM_CPPFLAGS="-I\$(top_srcdir)/include -I\$(top_builddir)/include " AM_CPPFLAGS="$AM_CPPFLAGS -I\$(BOOSTINCPATH) \$(BOOST_CPPFLAGS)" AM_CPPFLAGS="$AM_CPPFLAGS -I\$(HEPMCINCPATH) " AM_LDFLAGS="-L\$(top_builddir)/src/Tools -L\$(top_builddir)/src" AM_CXXFLAGS="$AM_CXXFLAGS -DLIB_SUFFIX=$LIB_SUFFIX " AC_CEDAR_CHECKCXXFLAG([-pedantic], [AM_CXXFLAGS="$AM_CXXFLAGS -pedantic "]) AC_CEDAR_CHECKCXXFLAG([-ansi], [AM_CXXFLAGS="$AM_CXXFLAGS -ansi "]) AC_CEDAR_CHECKCXXFLAG([-Wall], [AM_CXXFLAGS="$AM_CXXFLAGS -Wall "]) AC_CEDAR_CHECKCXXFLAG([-Wno-long-long], [AM_CXXFLAGS="$AM_CXXFLAGS -Wno-long-long "]) ## Debug flag (default=none) AC_ARG_ENABLE([debug], [AC_HELP_STRING(--enable-debug, [build with debugging symbols @<:@default=no@:>@])], [], [enable_debug=no]) if test x$enable_debug == xyes; then AC_CEDAR_CHECKCXXFLAG([-g], [AM_CXXFLAGS="$AM_CXXFLAGS -g "]) fi AC_SUBST(AM_CPPFLAGS) AC_SUBST(AM_LDFLAGS) AC_SUBST(AM_CXXFLAGS) ## Fortran build flags FORTRANLDFLAGS="-L$HEPMCLIBPATH" # -L$HEPMCFIOLIBPATH" FORTRANLIBADD="$FCLIBS" # -l$HEPMCFIOLIBNAME AC_SUBST(FORTRANLDFLAGS) AC_SUBST(FORTRANLIBADD) ## Dlopen export flags DLOPENFLAGS="-export-dynamic" AC_SUBST(DLOPENFLAGS) ## Python extension AC_ARG_ENABLE(pyext, [AC_HELP_STRING(--disable-pyext, [don't build Python module (default=build)])], [], [enable_pyext=yes]) AZ_PYTHON_DEFAULT ## Basic Python checks if test x$enable_pyext == xyes; then AZ_PYTHON_PATH AZ_PYTHON_VERSION_ENSURE([2.4]) PYTHON_VERSION=`$PYTHON -c "import sys; print '.'.join(map(str, sys.version_info@<:@:2@:>@));"` AC_SUBST(PYTHON_VERSION) AGILE_PYTHONPATH=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(prefix='$prefix', plat_specific=True);"` AC_SUBST(AGILE_PYTHONPATH) ## Test for Python header if test -x "$PYTHON"; then AC_MSG_CHECKING([for Python include path]) python_incpath=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_python_inc();"` AC_MSG_RESULT([$python_incpath]) python_header="$python_incpath/Python.h" if test -z "$python_incpath"; then AC_MSG_ERROR([Can't build Python extension since include directory cannot be determined from distutils]) enable_pyext=no elif test ! -e "$python_header"; then AC_MSG_ERROR([Can't build Python extension since header file $python_header cannot be found]) enable_pyext=no fi else AC_MSG_ERROR([Can't build Python extension since python can't be found]) enable_pyext=no fi fi ## SWIG checks if test x$enable_pyext == xyes; then AC_PROG_SWIG if test x$SWIG == x; then AC_MSG_ERROR([Can't build Python extension since swig could not be found]) enable_pyext=no else ## Test that SWIG makes a compilable source file... ## cf. g++ 4.x requires that string literal is "_const_ char*" cat > conftest.i <&1 1>&5` ; test -z "$stat_string" || flag_ok=no AC_MSG_RESULT([$flag_ok]) if test x$flag_ok != xyes; then AC_MSG_ERROR([Can't build Python extension since $SWIG is not able to make a Python wrapper]) enable_pyext=no else swig_compiler=$CXX AC_CEDAR_CHECKCXXFLAG([-Wno-format], [AC_MSG_NOTICE([adding -Wno-format to swig compilation test]); swig_compiler="$swig_compiler -Wno-format"]) AC_MSG_CHECKING([if $SWIG is compatible with the $CXX compiler]) flag_ok=yes if test x$flag_ok == xyes; then stat_string=`$swig_compiler -c conftest_wrap.cxx $CPPFLAGS $CXXFLAGS -I$python_incpath 2>&1 1>&5` ; test -z "$stat_string" || flag_ok=no fi AC_MSG_RESULT([$flag_ok]) if test x$flag_ok != xyes; then AC_MSG_ERROR([Can't build Python extension since $SWIG is not compatible with $CXX. Get a newer SWIG version!]) enable_pyext=no fi fi fi rm -rf conftest* fi ## Finish if test x$enable_pyext == xyes; then AC_MSG_NOTICE([All Python build checks successful: 'AGILe' Python extension will be built]) fi AM_CONDITIONAL(ENABLE_PYEXT, [test x$enable_pyext == xyes]) AC_EMPTY_SUBST AC_CONFIG_FILES(Makefile) AC_CONFIG_FILES(include/Makefile include/AGILe/Makefile) AC_CONFIG_FILES(src/Makefile src/Core/Makefile src/Tools/Makefile src/IO/Makefile) AC_CONFIG_FILES(src/FPythia/Makefile) AC_CONFIG_FILES(src/FHerwig/Makefile) AC_CONFIG_FILES(src/AlpGen/Makefile) AC_CONFIG_FILES(src/Charybdis/Makefile) AC_CONFIG_FILES(src/Rapgap/Makefile) AC_CONFIG_FILES(src/Cascade/Makefile) AC_CONFIG_FILES(src/Phojet/Makefile) AC_CONFIG_FILES(src/Ariadne/Makefile) AC_CONFIG_FILES(bin/Makefile bin/agile-config) AC_CONFIG_FILES(pyext/Makefile pyext/AGILe/Makefile pyext/setup.py) AC_CONFIG_FILES(data/Makefile) AC_CONFIG_FILES(test/Makefile) AC_CONFIG_FILES(agileenv.sh agileenv.csh) AC_OUTPUT if test x$enable_python == xyes; then cat <