]> rtime.felk.cvut.cz Git - orte.git/commitdiff
Fix the check for Java build
authorMichal Sojka <sojkam1@fel.cvut.cz>
Mon, 28 Oct 2013 20:39:55 +0000 (21:39 +0100)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Mon, 28 Oct 2013 20:46:51 +0000 (21:46 +0100)
Makefile.git

index f4f69d73354fe22143d12aecb7779d1c3ff5ea1d..738af0c862d9a716f3232fe67ecbc1e84536cdaf 100644 (file)
@@ -39,12 +39,14 @@ check-autotools.real:
        ../configure $(CONFIGURE_FLAGS)
        make
 
-check-java.real: JAVAC=$(shell readlink -f $(which javac))
+check-java.real: JAVAC=$(shell readlink -f $(shell which javac))
 check-java.real: JAVA_HOME=$(JAVAC:%/bin/javac=%)
 check-java.real:
+       test -d "$(JAVA_HOME)"
        ../configure --with-java=$(JAVA_HOME)
        $(MAKE)
-       false # Java is not compiled - either fix it or update README
+       ant -f ../orte/java
+       test -f ../orte/java/lib/orte.jar
 
 check-android:
        android update project -p orte/libaorte