diff options
| author | Morgan Deters <mdeters@gmail.com> | 2012-10-06 17:27:51 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2012-10-06 17:27:51 +0000 |
| commit | 99cad5495be99efae434177d1537d4cfac35581c (patch) | |
| tree | d96995c91bfcec7d4cd40d9aa6cedef5a19fa18f /src/bindings | |
| parent | 8116fa6b55db64301ed89f1f174b95780449007f (diff) | |
* Some documentation about building compatibility and language bindings
* Better errors/warnings when SWIG isn't installed (resolves bug 373)
* Allow compatibility bindings to be built when SWIG isn't available
Diffstat (limited to 'src/bindings')
| -rw-r--r-- | src/bindings/Makefile.am | 10 | ||||
| -rw-r--r-- | src/bindings/compat/java/Makefile.am | 10 | ||||
| -rw-r--r-- | src/bindings/compat/java/src/cvc3/Embedded.java | 2 |
3 files changed, 15 insertions, 7 deletions
diff --git a/src/bindings/Makefile.am b/src/bindings/Makefile.am index 65961b019..d172e5cf0 100644 --- a/src/bindings/Makefile.am +++ b/src/bindings/Makefile.am @@ -54,7 +54,8 @@ csharpdata_DATA = csharplib_LTLIBRARIES = rubylib_LTLIBRARIES = tcllib_LTLIBRARIES = -if CVC4_LANGUAGE_BINDING_JAVA +if CVC4_HAS_SWIG +if CVC4_LANGUAGE_BINDING_JAVA javalib_LTLIBRARIES += java/libcvc4jni.la javadata_DATA += CVC4.jar java_libcvc4jni_la_LDFLAGS = \ @@ -136,6 +137,8 @@ tcl_CVC4_la_LIBADD = \ -L@builddir@/.. -lcvc4 \ -L@builddir@/../parser -lcvc4parser endif +# this endif matches the "if CVC4_HAS_SWIG" above +endif nodist_java_libcvc4jni_la_SOURCES = java.cpp java_libcvc4jni_la_CXXFLAGS = -fno-strict-aliasing @@ -206,6 +209,9 @@ ruby.lo: ruby.cpp tcl.lo: tcl.cpp $(AM_V_CXX)$(LTCXXCOMPILE) -c $(TCL_CPPFLAGS) -o $@ $< #tcl.cpp:; + +if CVC4_HAS_SWIG + $(patsubst %,%.cpp,$(filter-out c c++,$(CVC4_LANGUAGE_BINDINGS))): %.cpp: @srcdir@/../cvc4.i $(AM_V_at)mkdir -p $(patsubst %.cpp,%,$@) $(AM_V_GEN)$(SWIG) -Wall -I@srcdir@/../include -I@srcdir@/.. -I@builddir@/.. -c++ -$(patsubst %.cpp,%,$@) -outdir $(patsubst %.cpp,%,$@) $($(subst .,_,$@)_SWIGFLAGS) -o $@ $< @@ -218,4 +224,6 @@ $(patsubst %,%.d,$(filter-out c c++,$(CVC4_LANGUAGE_BINDINGS))): %.d: @srcdir@/. $(AM_V_GEN)cat $+ </dev/null >$@ @mk_include@ .swig_deps +endif + clean-local:; rm -fr $(patsubst %.cpp,%,$(filter-out c c++,$(CVC4_LANGUAGE_BINDINGS))) diff --git a/src/bindings/compat/java/Makefile.am b/src/bindings/compat/java/Makefile.am index 2cc6a14d6..f0808334b 100644 --- a/src/bindings/compat/java/Makefile.am +++ b/src/bindings/compat/java/Makefile.am @@ -25,11 +25,11 @@ BUILT_SOURCES = if CVC4_LANGUAGE_BINDING_JAVA -lib_LTLIBRARIES += libcvc4bindings_java_compat.la +lib_LTLIBRARIES += libcvc4compatjni.la javadata_DATA += CVC4compat.jar -libcvc4bindings_java_compat_la_LDFLAGS = \ +libcvc4compatjni_la_LDFLAGS = \ -version-info $(LIBCVC4BINDINGS_VERSION) -libcvc4bindings_java_compat_la_LIBADD = \ +libcvc4compatjni_la_LIBADD = \ -L@builddir@/../../.. -lcvc4 \ -L@builddir@/../../../parser -lcvc4parser \ -L@builddir@/../../../compat -lcvc4compat @@ -112,8 +112,8 @@ SRC_CPP_FILES = src/cvc3/JniUtils.cpp # all cpp files (to compile) CPP_FILES = $(SRC_CPP_FILES) $(JNI_CPP_FILES) -dist_libcvc4bindings_java_compat_la_SOURCES = $(SRC_CPP_FILES) include/cvc3/JniUtils.h -nodist_libcvc4bindings_java_compat_la_SOURCES = $(JNI_CPP_FILES) +dist_libcvc4compatjni_la_SOURCES = $(SRC_CPP_FILES) include/cvc3/JniUtils.h +nodist_libcvc4compatjni_la_SOURCES = $(JNI_CPP_FILES) EXTRA_DIST = \ formula_value.h \ diff --git a/src/bindings/compat/java/src/cvc3/Embedded.java b/src/bindings/compat/java/src/cvc3/Embedded.java index fdeeef058..742e128d8 100644 --- a/src/bindings/compat/java/src/cvc3/Embedded.java +++ b/src/bindings/compat/java/src/cvc3/Embedded.java @@ -14,7 +14,7 @@ public abstract class Embedded { static { System.loadLibrary("cvc4"); System.loadLibrary("cvc4parser"); - System.loadLibrary("cvc4bindings_java_compat"); + System.loadLibrary("cvc4compatjni"); /* // for debugging: stop here by waiting for a key press, |