* swig/run.in: Remove symlink, and replace it by an actual copy of ../../swilena/run.in. (modpath): Append @abs_top_builddir@/src/wrappers/.libs. --- dynamic-use-of-static-c++/ChangeLog | 8 ++++ dynamic-use-of-static-c++/swig/run.in | 60 ++++++++++++++++++++++++++++++++- 2 files changed, 67 insertions(+), 1 deletions(-) mode change 120000 => 100755 dynamic-use-of-static-c++/swig/run.in diff --git a/dynamic-use-of-static-c++/ChangeLog b/dynamic-use-of-static-c++/ChangeLog index 6921732..81c90c3 100644 --- a/dynamic-use-of-static-c++/ChangeLog +++ b/dynamic-use-of-static-c++/ChangeLog @@ -1,3 +1,11 @@ +2009-11-03 Roland Levillain <roland(a)lrde.epita.fr> + + Help Mac OS X's Mach-O dynamic linker (dyld) find libdynmilena. + + * swig/run.in: Remove symlink, and replace it by an actual copy of + ../../swilena/run.in. + (modpath): Append @abs_top_builddir@/src/wrappers/.libs. + 2009-11-02 Roland Levillain <roland(a)lrde.epita.fr> Expose the Milena wrappers to SWIG. diff --git a/dynamic-use-of-static-c++/swig/run.in b/dynamic-use-of-static-c++/swig/run.in deleted file mode 120000 index 585aed6..0000000 --- a/dynamic-use-of-static-c++/swig/run.in +++ /dev/null @@ -1 +0,0 @@ -../../swilena/run.in \ No newline at end of file diff --git a/dynamic-use-of-static-c++/swig/run.in b/dynamic-use-of-static-c++/swig/run.in new file mode 100755 index 0000000..41ec0e8 --- /dev/null +++ b/dynamic-use-of-static-c++/swig/run.in @@ -0,0 +1,59 @@ +#!/bin/sh + +# Copyright (C) 2003, 2004, 2006, 2009 Laboratoire d'Informatique de Paris 6 +# (LIP6), département Systèmes Répartis Coopératifs (SRC), Université +# Pierre et Marie Curie. +# +# This file is part of Spot, a model checking library. +# +# Spot is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# Spot is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public +# License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Spot; see the file COPYING. If not, write to the Free +# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + + +# If we are running from make check (srcdir is set) and VERBOSE is +# unset, be quiet. +test -n "$srcdir" && test -z "$VERBOSE" && exec >/dev/null 2>&1 + +# Darwin needs some help in figuring out where non-installed libtool +# libraries are (on this platform libtool encodes the expected final +# path of dependent libraries in each library). +## FIXME: This path should be configurable from outside the script. +modpath='.libs:@abs_top_builddir@/src/.libs:@abs_top_builddir@/src/wrappers/.libs' + +case $1 in + '' | *.py) + PYTHONPATH='@abs_builddir@/python:@abs_srcdir@/python':"$PYTHONPATH" \ + DYLD_LIBRARY_PATH=$modpath \ + exec @PYTHON@ "$@" + ;; + # What's the point in adding `.libs' to SWILENA_RUBY_PATH? + # + # As some of our SWIG interfaces import other SWIG interfaces + # (with the `%import' keyword), we must add the `.libs' directory + # to SWILENA_RUBY_PATH so that the Ruby interpreter can load the + # corresponding dynamic module(s) (SWIG's `%import' statements + # generate code in dynamic modules that bypass Ruby's + # `Kernel.require' mechanism). + *.rb) + SWILENA_RUBY_PATH='@abs_builddir@/ruby:@abs_srcdir@/ruby:.libs' \ + DYLD_LIBRARY_PATH=$modpath \ + exec @RUBY@ "$@" + ;; + *.test) + exec sh -x "$@";; + *) + echo "Unknown extension" 2>&1 + exit 2;; +esac -- 1.6.5