BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

setup.py: Do VPATH search for swig/enums.i 

Also, in swig/classes.i include swig/enums.i rather than plain
enums.i, to guard against future name clashes.
This commit is contained in:
Daniel Elstner 2015-08-15 19:43:29 +02:00
parent cf5b338e07
commit 5a3e34285d
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -611,7 +611,7 @@ $(JCXX): $(JSWG) $(JDOC) bindings/swig/classes.i bindings/swig/enums.i \
$(library_include_HEADERS) $(nodist_library_include_HEADERS) $(library_include_HEADERS) $(nodist_library_include_HEADERS)
$(AM_V_at)make java-clean $(AM_V_at)make java-clean
$(AM_V_GEN)swig -c++ -java -package org.sigrok.core.classes \ $(AM_V_GEN)swig -c++ -java -package org.sigrok.core.classes \
$(local_includes) -I$(JCLS) -I. -I$(srcdir) -outdir $(JCLS) -o $@ $< -Ibindings -I$(JCLS) $(local_includes) -I$(srcdir) -outdir $(JCLS) -o $@ $<
$(JJAR): $(JCXX) $(JJAR): $(JCXX)
$(AM_V_GEN)$(JAVAC) -sourcepath $(JDIR) -d $(JDIR) $(JSRC) $(AM_V_GEN)$(JAVAC) -sourcepath $(JDIR) -d $(JDIR) $(JSRC)

5
bindings/python/setup.py
View File

@ -35,7 +35,7 @@ sr_includes, sr_lib_dirs, sr_libs, (sr_version,) = [
includes = ['../../include', '../cxx/include'] includes = ['../../include', '../cxx/include']
includes += [os.path.join(srcdir, path) for path in includes] includes += [os.path.join(srcdir, path) for path in includes]
includes += ['../..', '../../include/libsigrok', '../cxx/include/libsigrokcxx'] includes += ['../..']
includes += [i[2:] for i in sr_includes] includes += [i[2:] for i in sr_includes]
includes += [np.get_include(), ] includes += [np.get_include(), ]
libdirs = ['../../.libs', '../cxx/.libs'] + [l[2:] for l in sr_lib_dirs] libdirs = ['../../.libs', '../cxx/.libs'] + [l[2:] for l in sr_lib_dirs]
@ -77,7 +77,8 @@ setup(
ext_modules = [ ext_modules = [
Extension('sigrok.core._classes', Extension('sigrok.core._classes',
sources = [vpath('sigrok/core/classes.i')], sources = [vpath('sigrok/core/classes.i')],
swig_opts = ['-c++', '-threads', '-Isigrok/core'] + swig_opts = ['-c++', '-threads', '-Isigrok/core',
'-I..', '-I%s' % os.path.join(srcdir, '..')] +
['-I%s' % i for i in includes], ['-I%s' % i for i in includes],
extra_compile_args = ['-std=c++11', '-Wno-uninitialized'], extra_compile_args = ['-std=c++11', '-Wno-uninitialized'],
include_dirs = includes, include_dirs = includes,

2
bindings/swig/classes.i
View File

@ -273,7 +273,7 @@ typedef std::map<const sigrok::ConfigKey *, Glib::VariantBase>
%include <libsigrokcxx/libsigrokcxx.hpp> %include <libsigrokcxx/libsigrokcxx.hpp>
%include "enums.i" %include "swig/enums.i"
namespace sigrok { namespace sigrok {
%include <libsigrokcxx/enums.hpp> %include <libsigrokcxx/enums.hpp>