alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix paths mentioning buddy/src/.libs

Browse source 
Those had been incorrectly renamed to buddy/spot/.libs when we rename
the main src/ directory into spot/.  This only affected the setting of
DYLD_LIBRARY_PATH, that used to be needed on Darwin.

* doc/org/.dir-locals.el.in, doc/org/init.el.in, python/ajax/spotcgi.in,
tests/run.in: Fix the PATH.
This commit is contained in:
Alexandre Duret-Lutz 2016-02-12 14:02:47 +01:00
parent fbdd146565
commit 064ccd5c05
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/org/.dir-locals.el.in
View file

@ -18,7 +18,7 @@
"@abs_top_srcdir@/python/spot:" "@abs_top_srcdir@/python/spot:"
(getenv "PYTHONPATH"))) (getenv "PYTHONPATH")))
(setenv "DYLD_LIBRARY_PATH" (setenv "DYLD_LIBRARY_PATH"
(concat "@abs_top_builddir@/python/.libs:@abs_top_builddir@/spot/.libs:@abs_top_builddir@/buddy/spot/.libs:" (concat "@abs_top_builddir@/python/.libs:@abs_top_builddir@/spot/.libs:@abs_top_builddir@/buddy/src/.libs:"
(getenv "DYLD_LIBRARY_PATH"))) (getenv "DYLD_LIBRARY_PATH")))
(setenv "SPOT_DOTDEFAULT" "Brf(Lato)C(#ffffa0)") (setenv "SPOT_DOTDEFAULT" "Brf(Lato)C(#ffffa0)")
(setenv "SPOT_DOTEXTRA" "edge[arrowhead=vee, arrowsize=.7]") (setenv "SPOT_DOTEXTRA" "edge[arrowhead=vee, arrowsize=.7]")

2
doc/org/init.el.in
View file

@ -41,7 +41,7 @@
"@abs_top_srcdir@/python/spot:" "@abs_top_srcdir@/python/spot:"
(getenv "PYTHONPATH"))) (getenv "PYTHONPATH")))
(setenv "DYLD_LIBRARY_PATH" (setenv "DYLD_LIBRARY_PATH"
(concat "@abs_top_builddir@/python/.libs:@abs_top_builddir@/spot/.libs:@abs_top_builddir@/buddy/spot/.libs:" (concat "@abs_top_builddir@/python/.libs:@abs_top_builddir@/spot/.libs:@abs_top_builddir@/buddy/src/.libs:"
(getenv "DYLD_LIBRARY_PATH"))) (getenv "DYLD_LIBRARY_PATH")))
(setenv "SPOT_DOTDEFAULT" "Brf(Lato)C(#ffffa0)") (setenv "SPOT_DOTDEFAULT" "Brf(Lato)C(#ffffa0)")
(setenv "SPOT_DOTEXTRA" "edge[arrowhead=vee, arrowsize=.7]") (setenv "SPOT_DOTEXTRA" "edge[arrowhead=vee, arrowsize=.7]")

4
python/ajax/spotcgi.in
View file

@ -1,6 +1,6 @@
#!@PYTHON@ #!@PYTHON@
# -*- mode: python; coding: utf-8 -*- # -*- mode: python; coding: utf-8 -*-
# Copyright (C) 2011, 2012, 2013, 2014, 2015 Laboratoire de Recherche et # Copyright (C) 2011, 2012, 2013, 2014, 2015, 2016 Laboratoire de Recherche et
# Développement de l'Epita (LRDE). # Développement de l'Epita (LRDE).
# #
# This file is part of Spot, a model checking library. # This file is part of Spot, a model checking library.
@ -202,7 +202,7 @@ if ('SERVER_SOFTWARE' in os.environ and
# Darwin needs some help in figuring out where non-installed libtool # Darwin needs some help in figuring out where non-installed libtool
# libraries are (on this platform libtool encodes the expected final # libraries are (on this platform libtool encodes the expected final
# path of dependent libraries in each library). # path of dependent libraries in each library).
m = '../.libs:@top_builddir@/spot/.libs:@top_builddir@/buddy/spot/.libs' m = '../.libs:@top_builddir@/spot/.libs:@top_builddir@/buddy/src/.libs'
os.environ['DYLD_LIBRARY_PATH'] = m os.environ['DYLD_LIBRARY_PATH'] = m
try: try:

2
tests/run.in
View file

@ -25,7 +25,7 @@
# libraries are (on this platform libtool encodes the expected final # libraries are (on this platform libtool encodes the expected final
# path of dependent libraries in each library). # path of dependent libraries in each library).
modpath='@abs_top_builddir@/python/.libs:@abs_top_builddir@/python/spot/.libs' modpath='@abs_top_builddir@/python/.libs:@abs_top_builddir@/python/spot/.libs'
modpath=$modpath:'@top_builddir@/spot/.libs:@top_builddir@/buddy/spot/.libs' modpath=$modpath:'@top_builddir@/spot/.libs:@top_builddir@/buddy/src/.libs'
# We need access to both the *.py files, and the *.so. We used to # We need access to both the *.py files, and the *.so. We used to
# rely on a module called ltihooks.py to teach the import function how # rely on a module called ltihooks.py to teach the import function how