- Adding OMC_API-HowTo to install target.

- Updating java_interface makefiles (better clean-up and works without setting JAVA_HOME).
- Removing temporary antlr grammar files when configure script fails.
- Fixed doc install path for UNIX systems.
- Remove generated code when doing make clean in Compiler/runtime, Compiler/absyn_builder.
- Remove generated makefile in c_runtime/sendData.


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

Compiler/absyn_builder/Makefile.in

@@ -90,7 +90,7 @@ modelica_parserTokenTypes.txt : $(PARSE_HOME)/src/modelica_parserTokenTypes.txt
 clean:
 	-rm -f *.o *~ core *.core walker absyn_builder.a
 	-rm -f $(walkergen) modelica_parserTokenTypes.txt
-
+	-rm -f expandedexpression_parser.g modelica_expression_parser*
 reallyclean: clean
 
 parse.o : parse.cpp $(PARSE_HOME)/src/modelica_lexer.hpp $(PARSE_HOME)/src/modelica_parser.hpp \

Compiler/runtime/Makefile.in

@@ -49,4 +49,4 @@ omc_communication.h: omc_communication_impl.cpp corbaimpl.cpp
 dynload.o: systemimpl.h ../Absyn.h ../Values.h
 
 clean:
-	$(RM) -rf *.a *.o omc_communication.{cc,h} omc_communication-*
+	$(RM) -rf *.a *.o omc_communication.cc omc_communication.h omc_communication-*

Makefile.in

@@ -5,19 +5,22 @@ builddir_bin=$(top_builddir)/build/bin
 builddir_lib=$(top_builddir)/build/lib
 builddir_inc=$(top_builddir)/build/include
 builddir_doc=$(top_builddir)/build/doc
+builddir_java=$(top_builddir)/build/share/omc/java/
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 bindir = @bindir@
 libdir = @libdir@
 includedir = @includedir@
 datadir = @datadir@
+docdir = @docdir@
 
 INSTALL_BINDIR     = ${DESTDIR}${bindir}
 INSTALL_LIBDIR     = ${DESTDIR}${libdir}
 INSTALL_INCLUDEDIR = ${DESTDIR}${includedir}
 INSTALL_DATADIR    = ${DESTDIR}${datadir}
-INSTALL_DOCDIR     = ${INSTALL_DATADIR}/omc/doc
+INSTALL_DOCDIR     = ${DESTDIR}${docdir}
+INSTALL_JAVADIR    = ${INSTALL_DATADIR}/omc/java
 
 all : release qtclients mosh
 .PHONY : c_runtime omc omcd release debug qtclient mosh all mkbuilddirs test
@@ -27,6 +30,7 @@ mkbuilddirs:
 	mkdir -p $(builddir_lib)
 	mkdir -p $(builddir_inc)
 	mkdir -p $(builddir_doc)
+	mkdir -p $(builddir_java)
 	mkdir -p $(builddir_doc)/testmodels
 
 debug: omcd
@@ -38,13 +42,13 @@ c_runtime: mkbuilddirs
 
 omcd: c_runtime
 	(cd Compiler && $(MAKE) -f Makefile debug)
-	(cp -p doc/*.pdf $(builddir_doc)/)
+	(cp -p doc/*.pdf doc/OpenModelicaAPI-Howto/*.pdf $(builddir_doc)/)
 	(cp -p Examples/*.* $(builddir_doc)/testmodels/)
 
 
 omc: c_runtime
 	(cd Compiler && $(MAKE) -f Makefile release)
-	(cp doc/*.pdf $(builddir_doc)/)
+	(cp doc/*.pdf doc/ $(builddir_doc)/)
 	(cp -p Examples/*.* $(builddir_doc)/testmodels/)
 
 test:
@@ -76,6 +80,8 @@ distclean: clean
 	(cd flat_modelica_parser/src && $(MAKE) -f Makefile reallyclean)
 	rm -f Compiler/.depend
 	rm -f OMShell/Makefile OMNotebook/ext/Makefile OMNotebook/OMNotebookQT4/Makefile
+	rm -f Makefile Compiler/rml2sig/Makefile modelica_parser/test/parser/Makefile mosh/src/Makefile Compiler/Makefile Compiler/omc_release/Makefile Compiler/omc_debug/Makefile Compiler/omc_profiler/Makefile Compiler/absyn_builder/Makefile modelica_parser/test/lexer/Makefile Compiler/test_codegen/Makefile Compiler/runtime/Makefile modelica_parser/src/Makefile Compiler/modpar/Makefile flat_modelica_parser/src/Makefile
+	rm -f config.status config.log
 clean:
 	(cd c_runtime && $(MAKE) -f Makefile clean)
 	(cd Compiler/rml2sig && $(MAKE) -f Makefile clean)
@@ -102,6 +108,7 @@ clean:
 	(rm -f $(builddir_bin)/ext)
 	(rm -f $(builddir_bin)/*.xml)
 	rm -f build/include/*
+	rm -rf build/share
 
 ${INSTALL_BINDIR}:
 	mkdir -p ${INSTALL_BINDIR}
@@ -116,7 +123,10 @@ ${INSTALL_DOCDIR}:
 	mkdir -p ${INSTALL_DOCDIR}
 	mkdir -p ${INSTALL_DOCDIR}/testmodels
 
-install: ${INSTALL_BINDIR} ${INSTALL_LIBDIR} ${INSTALL_INCLUDEDIR} ${INSTALL_DOCDIR}
+${INSTALL_JAVADIR}:
+	mkdir -p ${INSTALL_JAVADIR}
+
+install: ${INSTALL_BINDIR} ${INSTALL_LIBDIR} ${INSTALL_INCLUDEDIR} ${INSTALL_DOCDIR} $(INSTALL_JAVADIR)
 	echo Installing OpenModelica...
 	echo Installing build/bin/* to ${INSTALL_BINDIR} ...
 	cp -p build/bin/* ${INSTALL_BINDIR}
@@ -126,6 +136,8 @@ install: ${INSTALL_BINDIR} ${INSTALL_LIBDIR} ${INSTALL_INCLUDEDIR} ${INSTALL_DOC
 	cp -p build/include/* ${INSTALL_INCLUDEDIR}
 	echo Installing build/doc/* to ${INSTALL_DOCDIR} ...
 	cp -Rp build/doc/* ${INSTALL_DOCDIR}
+	echo Installing build/share/omc/java/* to ${INSTALL_JAVADIR} ...
+	cp -Rp build/share/omc/java/* ${INSTALL_JAVADIR}
 
 
 .PRECIOUS: Makefile

c_runtime/Makefile.common

@@ -67,5 +67,5 @@ clean :
 	cd $(builddir_inc)/ && rm -f $(HFILES)
 	cd sendData && rm -fr release debug *sendData*.o *sendData*.a
 	rm -rf sendData/release sendData/debug
-	rm -f sendData.o sendData.a sendData/releasesendData.o
+	rm -f sendData.o sendData.a sendData/releasesendData.o sendData/Makefile
 

c_runtime/java_interface.c

@@ -263,9 +263,9 @@ JNIEnv* getJavaEnv()
   JNIEnv *env = NULL;
   jsize nVMs = 0;
   #if defined(__MINGW32__) || defined(_MSC_VER) /* Windows/MinGW */
-  const char* classpathFormatString = "-Djava.class.path=%s\\share\\java\\modelica_java.jar;%s\\share\\java\\antlr-3.1.3.jar;%s";
+  const char* classpathFormatString = "-Djava.class.path=%s\\share\\omc\\java\\modelica_java.jar;%s\\share\\omc\\java\\antlr-3.1.3.jar;%s";
   #else
-  const char* classpathFormatString = "-Djava.class.path=%s/share/java/modelica_java.jar:%s/share/java/antlr-3.1.3.jar:%s";
+  const char* classpathFormatString = "-Djava.class.path=%s/share/omc/java/modelica_java.jar:%s/share/omc/java/antlr-3.1.3.jar:%s";
   #endif
   char* openmodelicahome;
   char* classpathEnv;

c_runtime/java_interface/Makefile

@@ -1,7 +1,7 @@
 include Makefile.common
 
 install:
-	cp modelica_java.jar $(antlr) ../../build/share/java
+	cp modelica_java.jar $(antlr) ../../build/share/omc/java
 build: modelica_java.jar $(antlr) install
 modelica_java.jar: $(java_sources)
 	@echo "* Compiling modelica_java.jar"

c_runtime/java_interface/Makefile.common

@@ -4,23 +4,20 @@ 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
+TARGET=$(shell javac -version > log.txt 2>&1 && echo build || echo install)
 endif
 
 antlr = antlr-3.1.3.jar
 junit = junit-4.6.jar
 
+grammars = src/org/openmodelica/corba/parser/OMCorbaDefinitions.g
+
 java_sources = \
+$(grammars:%.g=%Lexer.java) \
+$(grammars:%.g=%Parser.java) \
 src/org/openmodelica/ModelicaArray.java \
 src/org/openmodelica/ModelicaAny.java \
 src/org/openmodelica/ModelicaFunctionReference.java \
@@ -45,13 +42,11 @@ src/org/openmodelica/corba/parser/ParseException.java \
 src/org/openmodelica/corba/parser/DefinitionsCreator.java \
 src/org/openmodelica/corba/parser/FunctionDefinition.java \
 src/org/openmodelica/corba/parser/JarCreator.java \
-src/org/openmodelica/corba/parser/OMCorbaDefinitionsLexer.java \
 src/org/openmodelica/corba/parser/RecordDefinition.java \
 src/org/openmodelica/corba/parser/PackageDefinition.java \
 src/org/openmodelica/corba/parser/SymbolTable.java \
 src/org/openmodelica/corba/parser/OMCStringParser.java \
 src/org/openmodelica/corba/parser/VariableDefinition.java \
-src/org/openmodelica/corba/parser/OMCorbaDefinitionsParser.java \
 src/org/openmodelica/corba/ConnectException.java \
 src/org/openmodelica/corba/CommunicationException.java \
 src/org/openmodelica/corba/OmcCommunicationHolder.java \
@@ -101,13 +96,14 @@ antlr_compile = @"$(JAVA)" -jar $(antlr) -fo src/org/openmodelica/corba/parser
 
 default: showtarget $(TARGET)
 showtarget:
+	@echo java_interface: target is $(TARGET)
 ifeq ($(TARGET),install)
 	@echo "* No JDK (javac) detected. Using the previosuly compiled jar-file."
 	@echo "* To compile, set JAVA_HOME to a JDK or add javac to the PATH."
 endif
 
 clean:
-	rm -rf bin-jar modelica_java.jar
+	rm -rf bin-jar modelica_java.jar log.txt $(grammars:%.g=%Lexer.java) $(grammars:%.g=%Parser.java) $(grammars:%.g=%.tokens)
 
 %Lexer.java: %.g
 	$(antlr_compile) $<

configure

@@ -3615,18 +3615,20 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for antlr.Tool support" >&5
 $as_echo_n "checking for antlr.Tool support... " >&6; }
-omc_antlr_jar=build/share/java/antlr-3.1.3.jar
+omc_antlr_jar=build/share/omc/java/antlr-3.1.3.jar
+mkdir -p build/share/omc/java
 cp c_runtime/java_interface/antlr-3.1.3.jar $omc_antlr_jar
 echo "" > $$grammar.g
 if java -cp $omc_antlr_jar antlr.Tool $$grammar.g ; then
+  rm -f $$grammar.g
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
+  rm -f $$grammar.g
   as_fn_error "no antlr.Tool support" "$LINENO" 5
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-rm -f $$grammar.g
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline include" >&5
 $as_echo_n "checking for readline include... " >&6; }

configure.in

@@ -84,16 +84,18 @@ else
 fi
 
 AC_MSG_CHECKING([for antlr.Tool support])
-omc_antlr_jar=build/share/java/antlr-3.1.3.jar
+omc_antlr_jar=build/share/omc/java/antlr-3.1.3.jar
+mkdir -p build/share/omc/java
 cp c_runtime/java_interface/antlr-3.1.3.jar $omc_antlr_jar
 echo "" > $$grammar.g
 if java -cp $omc_antlr_jar antlr.Tool $$grammar.g ; then
+  rm -f $$grammar.g
   AC_MSG_RESULT([yes])
 else
+  rm -f $$grammar.g
   AC_MSG_ERROR([no antlr.Tool support])
   AC_MSG_RESULT([no])
 fi
-rm -f $$grammar.g
 
 AC_MSG_CHECKING([for readline include])
 dnl First check in special place for pelab