- Adding modelica_java.jar to the repository (so JDK isn't required to compile OpenModelica)

- Adding c_runtime/java_interface to the default make system. (If no JDK is installed, modelica_java.jar is simply copied to /build/...)

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@4408 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: sjoelund

c_runtime/Makefile

@@ -60,6 +60,7 @@ install: libc_runtime.a libsim.a libf2c/libf2c.a
 	cp $(LIBS) $(builddir_lib)/
 	cp libf2c/libf2c.* $(builddir_lib)/
 	cp sendData/release/libsendData.a $(builddir_lib)/
+	make -C java_interface -f Makefile
 
 libsim.a : $(SIMOBJS)
 	$(AR) $@ $(SIMOBJS)

c_runtime/java_interface/Makefile

@@ -1,11 +1,13 @@
 include Makefile.common
 
-install: modelica_java.jar $(antlr)
-	cp -u $< $(antlr) ../../build/share/java
+install:
+	cp -u modelica_java.jar $(antlr) ../../build/share/java
+build: modelica_java.jar $(antlr) install
 modelica_java.jar: $(java_sources)
-	rm -rf bin-jar; mkdir bin-jar
+	@echo "* Compiling modelica_java.jar"
+	@rm -rf bin-jar; mkdir bin-jar
 	@"$(JAVAC)" -cp "$(antlr)" -d bin-jar $(java_sources)
-	$(JAR) cf $@ $(java_sources:src/%=-C src %) $(resources:src/%=-C src %) -C bin-jar . || (rm $@ && false)
+	@$(JAR) cf $@ $(java_sources:src/%=-C src %) $(resources:src/%=-C src %) -C bin-jar . || (rm $@ && false)
 test: $(java_sources)
 	rm -rf bin-test; mkdir bin-test
 	@"$(JAVAC)" -cp "$(antlr):$(junit)" -d bin-test $(java_sources) $(java_tests)

c_runtime/java_interface/Makefile.common

@@ -2,10 +2,19 @@ ifdef JAVA_HOME
 JAVAC=$(JAVA_HOME)/bin/javac
 JAVA=$(JAVA_HOME)/bin/java
 JAR=$(JAVA_HOME)/bin/jar
+TARGET=build
 else
+ifeq ($(shell javac -version 2>log.txt | echo "OK"),"OK")
 JAVAC=javac
 JAVA=java
 JAR=jar
+TARGET=build
+else
+JAVAC=javac
+JAVA=java
+JAR=jar
+TARGET=install
+endif
 endif
 
 antlr = antlr-3.1.3.jar
@@ -91,7 +100,12 @@ org.openmodelica.test.TestDefinitionsParser
 
 antlr_compile = @"$(JAVA)" -jar $(antlr) -fo src/org/openmodelica/corba/parser
 
-default: install
+default: showtarget $(TARGET)
+showtarget:
+ifeq ($(TARGET),install)
+	@echo "* No JDK (javac) detected. Using the previosuly compiles jar-file."
+	@echo "* To compile, set JAVA_HOME to a JDK or add javac to the PATH."
+endif
 
 %Lexer.java: %.g
 	$(antlr_compile) $<