diff options
| author |   Maros Marsalek <mmarsale@cisco.com> | 2016-05-12 10:31:35 +0200 |
|---|---|---|
| committer | Maros Marsalek <mmarsale@cisco.com> | 2016-05-12 14:09:56 +0200 |
| commit | 0e0c99f8def7c426f1ef8884b9da29d9fdce6e0a (patch) | |
| tree | d6fe94e398c6214de8ace2e62629441f35175f1c | |
| parent | beabdf01613b64bc96887922cddafef45f81a142 (diff) | |
Generate jvpp sources in build-root
+ Fail build when JVpp does not compile
Change-Id: I4ad3ffb5d7ff6edaad89de66a9f0bd79a14fb690
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | vpp-api/java/Makefile.am | 34 |
2 files changed, 17 insertions, 22 deletions
diff --git a/.gitignore b/.gitignore index 9ef58df58c4..a104623c240 100644 --- a/.gitignore +++ b/.gitignore @@ -57,8 +57,3 @@ test-driver # cscope and ctags /cscope.* /tags - -# jvpp generated sources -/vpp-api/java/jvpp/gen/target -/vpp-api/java/jvpp/gen/*.pyc - diff --git a/vpp-api/java/Makefile.am b/vpp-api/java/Makefile.am index 8ad24e13239..29c4aabd12b 100644 --- a/vpp-api/java/Makefile.am +++ b/vpp-api/java/Makefile.am @@ -114,27 +114,27 @@ BUILT_SOURCES += jvpp/org_openvpp_jvpp_VppJNIConnection.h jvpp/jvpp.c jvpp/org_openvpp_jvpp_VppJNIConnection.h: $(prefix)/../vpp/api/vpe.api @echo " jVpp API"; \ - mkdir -p dto future callfacade callback @srcdir@/jvpp/gen/target/org/openvpp/jvpp; \ + cp -rf @srcdir@/jvpp/* -t jvpp/; \ + mkdir -p jvpp/gen/target/org/openvpp/jvpp; \ + cp -rf jvpp/org/openvpp/jvpp/* -t jvpp/gen/target/org/openvpp/jvpp/; \ $(CC) $(CPPFLAGS) -E -P -C -x c $< \ | vppapigen --input - --python defs_vpp_papi.py; \ - @srcdir@/jvpp/gen/jvpp_gen.py -i defs_vpp_papi.py; \ - cp -rf dto future callfacade callback *.java -t @srcdir@/jvpp/gen/target/org/openvpp/jvpp/; \ - cp -rf jvpp_gen.h -t @srcdir@/jvpp/gen/target; \ - rm -rf dto future callfacade callback *.java jvpp_gen.h; \ - $(JAVAC) -classpath . -d . @srcdir@/jvpp/org/openvpp/jvpp/*.java \ - @srcdir@/jvpp/org/openvpp/jvpp/dto/*.java \ - @srcdir@/jvpp/org/openvpp/jvpp/callback/*.java \ - @srcdir@/jvpp/org/openvpp/jvpp/future/*.java \ - @srcdir@/jvpp/org/openvpp/jvpp/test/*.java \ - @srcdir@/jvpp/gen/target/org/openvpp/jvpp/*.java \ - @srcdir@/jvpp/gen/target/org/openvpp/jvpp/dto/*.java \ - @srcdir@/jvpp/gen/target/org/openvpp/jvpp/callback/*.java \ - @srcdir@/jvpp/gen/target/org/openvpp/jvpp/callfacade/*.java \ - @srcdir@/jvpp/gen/target/org/openvpp/jvpp/future/*.java ; \ - $(JAVAH) -classpath . -d jvpp org.openvpp.jvpp.VppJNIConnection ; \ + mkdir -p dto future callfacade callback; \ + ./jvpp/gen/jvpp_gen.py -i defs_vpp_papi.py; \ + cp -rf dto future callfacade callback *.java -t jvpp/gen/target/org/openvpp/jvpp/; \ + cp -rf jvpp_gen.h -t jvpp/gen/target; \ + rm -rf dto future callfacade callback *.java jvpp_gen.h; \ + $(JAVAC) -classpath . -d . jvpp/gen/target/org/openvpp/jvpp/*.java \ + jvpp/gen/target/org/openvpp/jvpp/dto/*.java \ + jvpp/gen/target/org/openvpp/jvpp/callback/*.java \ + jvpp/gen/target/org/openvpp/jvpp/callfacade/*.java \ + jvpp/gen/target/org/openvpp/jvpp/future/*.java \ + jvpp/gen/target/org/openvpp/jvpp/test/*.java \ + || (echo "JVpp compilation failed: $$?"; exit 1); \ + $(JAVAH) -classpath . -d jvpp org.openvpp.jvpp.VppJNIConnection ; \ $(JAVAH) -classpath . -d jvpp org.openvpp.jvpp.JVppImpl ; $(jarfile_jvpp): libjvpp.la - cd .libs ; $(JAR) cf $(JARFLAGS) ../$@ libjvpp.so.0.0.0 ../$(packagedir_jvpp)/* ; cd .. + cd .libs ; $(JAR) cf $(JARFLAGS) ../$@ libjvpp.so.0.0.0 ../$(packagedir_jvpp)/* ; cd ..; all-local: $(jarfile) $(jarfile_jvpp) $(demo) |