diff options
| author | Morgan Deters <mdeters@gmail.com> | 2011-11-22 16:26:16 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2011-11-22 16:26:16 +0000 |
| commit | 28bb25889bccc10e7e7ae59bd60f908b6babdce5 (patch) | |
| tree | eabb2479389213216377f6c992bb64f223b9faa4 | |
| parent | 38bfb8f76514b154c9d6cc370c5cdbdb8118e66c (diff) | |
fix module name for CVC4 jar file; part of the fix for the Debian package build failure last night
| -rw-r--r-- | examples/Makefile.am | 4 | ||||
| -rw-r--r-- | examples/SimpleVC.java | 10 | ||||
| -rw-r--r-- | examples/SimpleVCCompat.java | 4 | ||||
| -rw-r--r-- | src/bindings/Makefile.am | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/examples/Makefile.am b/examples/Makefile.am index 9f9404ce9..d765e4d7a 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -45,9 +45,9 @@ simple_vc_compat_c_LDADD = \ @builddir@/../src/bindings/compat/c/libcvc4bindings_c_compat.la SimpleVC.class: SimpleVC.java - $(AM_V_JAVAC)$(JAVAC) -classpath "@builddir@/../src/bindings/cvc4.jar" -d "@builddir@" $< + $(AM_V_JAVAC)$(JAVAC) -classpath "@builddir@/../src/bindings/CVC4.jar" -d "@builddir@" $< SimpleVCCompat.class: SimpleVCCompat.java - $(AM_V_JAVAC)$(JAVAC) -classpath "@builddir@/../src/bindings/compat/java/cvc4compat.jar" -d "@builddir@" $< + $(AM_V_JAVAC)$(JAVAC) -classpath "@builddir@/../src/bindings/compat/java/CVC4compat.jar" -d "@builddir@" $< EXTRA_DIST = \ SimpleVC.java \ diff --git a/examples/SimpleVC.java b/examples/SimpleVC.java index e6a667e16..8159cdc0e 100644 --- a/examples/SimpleVC.java +++ b/examples/SimpleVC.java @@ -19,8 +19,8 @@ ** following: ** ** java \ - ** -classpath path/to/cvc4.jar \ - ** -Djava.library.path=/dir/containing/libcvc4bindings_java.so \ + ** -classpath path/to/CVC4.jar \ + ** -Djava.library.path=/dir/containing/java/CVC4.so \ ** SimpleVC ** ** For example, if you are building CVC4 without specifying your own @@ -28,8 +28,8 @@ ** you can run this example (after building it with "make") like this: ** ** java \ - ** -classpath builds/examples:builds/src/bindings/cvc4.jar \ - ** -Djava.library.path=builds/src/bindings/.libs \ + ** -classpath builds/examples:builds/src/bindings/CVC4.jar \ + ** -Djava.library.path=builds/src/bindings/java/.libs \ ** SimpleVC **/ @@ -38,7 +38,7 @@ import edu.nyu.acsys.CVC4.Integer;// to override java.lang.Integer name lookup public class SimpleVC { public static void main(String[] args) { - System.loadLibrary("cvc4bindings_java"); + System.loadLibrary("CVC4"); ExprManager em = new ExprManager(); SmtEngine smt = new SmtEngine(em); diff --git a/examples/SimpleVCCompat.java b/examples/SimpleVCCompat.java index aa28a423b..fea4f3b7e 100644 --- a/examples/SimpleVCCompat.java +++ b/examples/SimpleVCCompat.java @@ -21,7 +21,7 @@ ** following: ** ** java \ - ** -classpath path/to/cvc4compat.jar \ + ** -classpath path/to/CVC4compat.jar \ ** -Djava.library.path=/dir/containing/libcvc4bindings_java_compat.so \ ** SimpleVCCompat ** @@ -30,7 +30,7 @@ ** you can run this example (after building it with "make") like this: ** ** java \ - ** -classpath builds/examples:builds/src/bindings/compat/java/cvc4compat.jar \ + ** -classpath builds/examples:builds/src/bindings/compat/java/CVC4compat.jar \ ** -Djava.library.path=builds/src/bindings/compat/java/.libs \ ** SimpleVCCompat **/ diff --git a/src/bindings/Makefile.am b/src/bindings/Makefile.am index bfc116fd6..5d372ce7d 100644 --- a/src/bindings/Makefile.am +++ b/src/bindings/Makefile.am @@ -56,7 +56,7 @@ rubylib_LTLIBRARIES = tcllib_LTLIBRARIES = if CVC4_LANGUAGE_BINDING_JAVA javalib_LTLIBRARIES += java/CVC4.la -javadata_DATA += cvc4.jar +javadata_DATA += CVC4.jar java_CVC4_la_LDFLAGS = \ -module \ -version-info $(LIBCVC4BINDINGS_VERSION) @@ -161,11 +161,11 @@ EXTRA_DIST = swig.h MOSTLYCLEANFILES = \ .swig_deps \ $(patsubst %,%.d,$(filter-out c c++,$(CVC4_LANGUAGE_BINDINGS))) \ - cvc4.jar + CVC4.jar java_CVC4_la-java.lo java.lo: java.cpp $(AM_V_CXX)$(LTCXXCOMPILE) -c $(JAVA_CPPFLAGS) -o $@ $< -cvc4.jar: java.cpp +CVC4.jar: java.cpp $(AM_V_GEN) \ (cd java; \ rm -fr classes; \ |