Moved the location of java_interface

The files are not really part of the C runtime, and were thus moved.
OpenModelica · Sep 29, 2015 · 116b7c7 · 116b7c7
1 parent c71d1ae
commit 116b7c7
Show file tree

Hide file tree

Showing 72 changed files with 8 additions and 4 deletions.
diff --git a/SimulationRuntime/c/Makefile.common b/SimulationRuntime/c/Makefile.common
@@ -224,11 +224,15 @@ install: bootstrap-dependencies $(LIBSIMULATION) $(LIBFMIRUNTIME) $(ALL_OBJS)
 	cp -p ../fmi/export/fmi2/*.h \
 	   ../fmi/export/fmi2/fmu2_model_interface.c $(builddir_inc)/c/fmi2
 	# copy java interface stuff
-	@$(MAKE) -C util/java_interface -f $(LIBMAKEFILE) && \
-	$(MAKE) -C util/java_interface -f $(LIBMAKEFILE) install || \
-	$(MAKE) -C util/java_interface -f $(LIBMAKEFILE) install-nomodelica
+	@$(MAKE) -C ../java_interface -f $(LIBMAKEFILE) && \
+	$(MAKE) -C ../java_interface -f $(LIBMAKEFILE) install || \
+	$(MAKE) -C ../java_interface -f $(LIBMAKEFILE) install-nomodelica
 
 clean:
 	rm -f $(ALL_PATHS_CLEAN_OBJS) fmi/*.o *.a *.so optimization/*/*.o
 	(! test -f $(EXTERNALCBUILDDIR)/Makefile) || make -C $(EXTERNALCBUILDDIR) clean
 	(! test -f $(EXTERNALCBUILDDIR)/Makefile) || make -C $(EXTERNALCBUILDDIR) distclean
+
+sourcedist:
+	mkdir -p $(builddir_inc)/cruntime/
+	cp -a $(ALL_OBJS:%.o=%.c*) $(builddir_inc)/cruntime/
diff --git a/SimulationRuntime/c/simulation/solver/solver_main.c b/SimulationRuntime/c/simulation/solver/solver_main.c
diff --git a/...ionRuntime/c/util/java_interface/.project → SimulationRuntime/java_interface/.project b/...ionRuntime/c/util/java_interface/.project → SimulationRuntime/java_interface/.project
diff --git a/...ime/c/util/java_interface/Makefile.common → ...ionRuntime/java_interface/Makefile.common b/...ime/c/util/java_interface/Makefile.common → ...ionRuntime/java_interface/Makefile.common
diff --git a/...Runtime/c/util/java_interface/Makefile.in → SimulationRuntime/java_interface/Makefile.in b/...Runtime/c/util/java_interface/Makefile.in → SimulationRuntime/java_interface/Makefile.in
diff --git a/.../util/java_interface/Makefile.omdev.mingw → ...ntime/java_interface/Makefile.omdev.mingw b/.../util/java_interface/Makefile.omdev.mingw → ...ntime/java_interface/Makefile.omdev.mingw
diff --git a/...e/c/util/java_interface/antlr_license.txt → ...nRuntime/java_interface/antlr_license.txt b/...e/c/util/java_interface/antlr_license.txt → ...nRuntime/java_interface/antlr_license.txt
diff --git a/...src/org/openmodelica/ComplexTypeSpec.java → ...src/org/openmodelica/ComplexTypeSpec.java b/...src/org/openmodelica/ComplexTypeSpec.java → ...src/org/openmodelica/ComplexTypeSpec.java
diff --git a/...src/org/openmodelica/IModelicaRecord.java → ...src/org/openmodelica/IModelicaRecord.java b/...src/org/openmodelica/IModelicaRecord.java → ...src/org/openmodelica/IModelicaRecord.java
diff --git a/...ace/src/org/openmodelica/ModelicaAny.java → ...ace/src/org/openmodelica/ModelicaAny.java b/...ace/src/org/openmodelica/ModelicaAny.java → ...ace/src/org/openmodelica/ModelicaAny.java
diff --git a/...e/src/org/openmodelica/ModelicaArray.java → ...e/src/org/openmodelica/ModelicaArray.java b/...e/src/org/openmodelica/ModelicaArray.java → ...e/src/org/openmodelica/ModelicaArray.java
diff --git a/...c/org/openmodelica/ModelicaBaseArray.java → ...c/org/openmodelica/ModelicaBaseArray.java b/...c/org/openmodelica/ModelicaBaseArray.java → ...c/org/openmodelica/ModelicaBaseArray.java
diff --git a/...src/org/openmodelica/ModelicaBoolean.java → ...src/org/openmodelica/ModelicaBoolean.java b/...src/org/openmodelica/ModelicaBoolean.java → ...src/org/openmodelica/ModelicaBoolean.java
diff --git a/...rc/org/openmodelica/ModelicaFunction.java → ...rc/org/openmodelica/ModelicaFunction.java b/...rc/org/openmodelica/ModelicaFunction.java → ...rc/org/openmodelica/ModelicaFunction.java
diff --git a/...enmodelica/ModelicaFunctionReference.java → ...enmodelica/ModelicaFunctionReference.java b/...enmodelica/ModelicaFunctionReference.java → ...enmodelica/ModelicaFunctionReference.java
diff --git a/.../src/org/openmodelica/ModelicaHelper.java → .../src/org/openmodelica/ModelicaHelper.java b/.../src/org/openmodelica/ModelicaHelper.java → .../src/org/openmodelica/ModelicaHelper.java
diff --git a/...src/org/openmodelica/ModelicaInteger.java → ...src/org/openmodelica/ModelicaInteger.java b/...src/org/openmodelica/ModelicaInteger.java → ...src/org/openmodelica/ModelicaInteger.java
diff --git a/.../src/org/openmodelica/ModelicaObject.java → .../src/org/openmodelica/ModelicaObject.java b/.../src/org/openmodelica/ModelicaObject.java → .../src/org/openmodelica/ModelicaObject.java
diff --git a/...openmodelica/ModelicaObjectException.java → ...openmodelica/ModelicaObjectException.java b/...openmodelica/ModelicaObjectException.java → ...openmodelica/ModelicaObjectException.java
diff --git a/.../src/org/openmodelica/ModelicaOption.java → .../src/org/openmodelica/ModelicaOption.java b/.../src/org/openmodelica/ModelicaOption.java → .../src/org/openmodelica/ModelicaOption.java
diff --git a/...ce/src/org/openmodelica/ModelicaReal.java → ...ce/src/org/openmodelica/ModelicaReal.java b/...ce/src/org/openmodelica/ModelicaReal.java → ...ce/src/org/openmodelica/ModelicaReal.java
diff --git a/.../src/org/openmodelica/ModelicaRecord.java → .../src/org/openmodelica/ModelicaRecord.java b/.../src/org/openmodelica/ModelicaRecord.java → .../src/org/openmodelica/ModelicaRecord.java
diff --git a/...openmodelica/ModelicaRecordException.java → ...openmodelica/ModelicaRecordException.java b/...openmodelica/ModelicaRecordException.java → ...openmodelica/ModelicaRecordException.java
diff --git a/.../src/org/openmodelica/ModelicaString.java → .../src/org/openmodelica/ModelicaString.java b/.../src/org/openmodelica/ModelicaString.java → .../src/org/openmodelica/ModelicaString.java
diff --git a/...e/src/org/openmodelica/ModelicaTuple.java → ...e/src/org/openmodelica/ModelicaTuple.java b/...e/src/org/openmodelica/ModelicaTuple.java → ...e/src/org/openmodelica/ModelicaTuple.java
diff --git a/...ce/src/org/openmodelica/ModelicaVoid.java → ...ce/src/org/openmodelica/ModelicaVoid.java b/...ce/src/org/openmodelica/ModelicaVoid.java → ...ce/src/org/openmodelica/ModelicaVoid.java
diff --git a/...c/org/openmodelica/OMCModelicaRecord.java → ...c/org/openmodelica/OMCModelicaRecord.java b/...c/org/openmodelica/OMCModelicaRecord.java → ...c/org/openmodelica/OMCModelicaRecord.java
diff --git a/.../src/org/openmodelica/SimpleTypeSpec.java → .../src/org/openmodelica/SimpleTypeSpec.java b/.../src/org/openmodelica/SimpleTypeSpec.java → .../src/org/openmodelica/SimpleTypeSpec.java
diff --git a/...erface/src/org/openmodelica/TypeSpec.java → ...erface/src/org/openmodelica/TypeSpec.java b/...erface/src/org/openmodelica/TypeSpec.java → ...erface/src/org/openmodelica/TypeSpec.java
diff --git a/...odelica/corba/CommunicationException.java → ...odelica/corba/CommunicationException.java b/...odelica/corba/CommunicationException.java → ...odelica/corba/CommunicationException.java
diff --git a/...openmodelica/corba/CompilerException.java → ...openmodelica/corba/CompilerException.java b/...openmodelica/corba/CompilerException.java → ...openmodelica/corba/CompilerException.java
diff --git a/.../openmodelica/corba/ConnectException.java → .../openmodelica/corba/ConnectException.java b/.../openmodelica/corba/ConnectException.java → .../openmodelica/corba/ConnectException.java
diff --git a/...g/openmodelica/corba/InvocationError.java → ...g/openmodelica/corba/InvocationError.java b/...g/openmodelica/corba/InvocationError.java → ...g/openmodelica/corba/InvocationError.java
diff --git a/.../openmodelica/corba/JreSocketFactory.java → .../openmodelica/corba/JreSocketFactory.java b/.../openmodelica/corba/JreSocketFactory.java → .../openmodelica/corba/JreSocketFactory.java
diff --git a/.../src/org/openmodelica/corba/OMCProxy.java → .../src/org/openmodelica/corba/OMCProxy.java b/.../src/org/openmodelica/corba/OMCProxy.java → .../src/org/openmodelica/corba/OMCProxy.java
diff --git a/.../openmodelica/corba/OmcCommunication.java → .../openmodelica/corba/OmcCommunication.java b/.../openmodelica/corba/OmcCommunication.java → .../openmodelica/corba/OmcCommunication.java
diff --git a/...odelica/corba/OmcCommunicationHelper.java → ...odelica/corba/OmcCommunicationHelper.java b/...odelica/corba/OmcCommunicationHelper.java → ...odelica/corba/OmcCommunicationHelper.java
diff --git a/...odelica/corba/OmcCommunicationHolder.java → ...odelica/corba/OmcCommunicationHolder.java b/...odelica/corba/OmcCommunicationHolder.java → ...odelica/corba/OmcCommunicationHolder.java
diff --git a/...ica/corba/OmcCommunicationOperations.java → ...ica/corba/OmcCommunicationOperations.java b/...ica/corba/OmcCommunicationOperations.java → ...ica/corba/OmcCommunicationOperations.java
diff --git a/...nmodelica/corba/OmcCommunicationStub.java → ...nmodelica/corba/OmcCommunicationStub.java b/...nmodelica/corba/OmcCommunicationStub.java → ...nmodelica/corba/OmcCommunicationStub.java
diff --git a/...ce/src/org/openmodelica/corba/Result.java → ...ce/src/org/openmodelica/corba/Result.java b/...ce/src/org/openmodelica/corba/Result.java → ...ce/src/org/openmodelica/corba/Result.java
diff --git a/...rc/org/openmodelica/corba/SmartProxy.java → ...rc/org/openmodelica/corba/SmartProxy.java b/...rc/org/openmodelica/corba/SmartProxy.java → ...rc/org/openmodelica/corba/SmartProxy.java
diff --git a/...a/corba/parser/ComplexTypeDefinition.java → ...a/corba/parser/ComplexTypeDefinition.java b/...a/corba/parser/ComplexTypeDefinition.java → ...a/corba/parser/ComplexTypeDefinition.java
diff --git a/...lica/corba/parser/DefinitionsCreator.java → ...lica/corba/parser/DefinitionsCreator.java b/...lica/corba/parser/DefinitionsCreator.java → ...lica/corba/parser/DefinitionsCreator.java
diff --git a/...lica/corba/parser/FunctionDefinition.java → ...lica/corba/parser/FunctionDefinition.java b/...lica/corba/parser/FunctionDefinition.java → ...lica/corba/parser/FunctionDefinition.java
diff --git a/...openmodelica/corba/parser/JarCreator.java → ...openmodelica/corba/parser/JarCreator.java b/...openmodelica/corba/parser/JarCreator.java → ...openmodelica/corba/parser/JarCreator.java
diff --git a/.../corba/parser/JavaDefinitions/function.st → .../corba/parser/JavaDefinitions/function.st b/.../corba/parser/JavaDefinitions/function.st → .../corba/parser/JavaDefinitions/function.st
diff --git a/...ca/corba/parser/JavaDefinitions/header.st → ...ca/corba/parser/JavaDefinitions/header.st b/...ca/corba/parser/JavaDefinitions/header.st → ...ca/corba/parser/JavaDefinitions/header.st
diff --git a/.../corba/parser/JavaDefinitions/myFQName.st → .../corba/parser/JavaDefinitions/myFQName.st b/.../corba/parser/JavaDefinitions/myFQName.st → .../corba/parser/JavaDefinitions/myFQName.st
diff --git a/...ca/corba/parser/JavaDefinitions/record.st → ...ca/corba/parser/JavaDefinitions/record.st b/...ca/corba/parser/JavaDefinitions/record.st → ...ca/corba/parser/JavaDefinitions/record.st
diff --git a/...corba/parser/JavaDefinitions/uniontype.st → ...corba/parser/JavaDefinitions/uniontype.st b/...corba/parser/JavaDefinitions/uniontype.st → ...corba/parser/JavaDefinitions/uniontype.st
diff --git a/...odelica/corba/parser/OMCStringParser.java → ...odelica/corba/parser/OMCStringParser.java b/...odelica/corba/parser/OMCStringParser.java → ...odelica/corba/parser/OMCStringParser.java
diff --git a/...odelica/corba/parser/OMCorbaDefinitions.g → ...odelica/corba/parser/OMCorbaDefinitions.g b/...odelica/corba/parser/OMCorbaDefinitions.g → ...odelica/corba/parser/OMCorbaDefinitions.g
diff --git a/...elica/corba/parser/PackageDefinition.java → ...elica/corba/parser/PackageDefinition.java b/...elica/corba/parser/PackageDefinition.java → ...elica/corba/parser/PackageDefinition.java
diff --git a/...modelica/corba/parser/ParseException.java → ...modelica/corba/parser/ParseException.java b/...modelica/corba/parser/ParseException.java → ...modelica/corba/parser/ParseException.java
diff --git a/...delica/corba/parser/RecordDefinition.java → ...delica/corba/parser/RecordDefinition.java b/...delica/corba/parser/RecordDefinition.java → ...delica/corba/parser/RecordDefinition.java
diff --git a/...penmodelica/corba/parser/SymbolTable.java → ...penmodelica/corba/parser/SymbolTable.java b/...penmodelica/corba/parser/SymbolTable.java → ...penmodelica/corba/parser/SymbolTable.java
diff --git a/...ica/corba/parser/UniontypeDefinition.java → ...ica/corba/parser/UniontypeDefinition.java b/...ica/corba/parser/UniontypeDefinition.java → ...ica/corba/parser/UniontypeDefinition.java
diff --git a/...lica/corba/parser/VariableDefinition.java → ...lica/corba/parser/VariableDefinition.java b/...lica/corba/parser/VariableDefinition.java → ...lica/corba/parser/VariableDefinition.java
diff --git a/.../org/openmodelica/test/ABC_CONTAINER.java → .../org/openmodelica/test/ABC_CONTAINER.java b/.../org/openmodelica/test/ABC_CONTAINER.java → .../org/openmodelica/test/ABC_CONTAINER.java
diff --git a/...ace/src/org/openmodelica/test/ABC_UT.java → ...ace/src/org/openmodelica/test/ABC_UT.java b/...ace/src/org/openmodelica/test/ABC_UT.java → ...ace/src/org/openmodelica/test/ABC_UT.java
diff --git a/...nmodelica/test/TestDefinitionsParser.java → ...nmodelica/test/TestDefinitionsParser.java b/...nmodelica/test/TestDefinitionsParser.java → ...nmodelica/test/TestDefinitionsParser.java
diff --git a/...rc/org/openmodelica/test/TestObjects.java → ...rc/org/openmodelica/test/TestObjects.java b/...rc/org/openmodelica/test/TestObjects.java → ...rc/org/openmodelica/test/TestObjects.java
diff --git a/...src/org/openmodelica/test/TestParser.java → ...src/org/openmodelica/test/TestParser.java b/...src/org/openmodelica/test/TestParser.java → ...src/org/openmodelica/test/TestParser.java
diff --git a/...src/org/openmodelica/test/TestRecord.java → ...src/org/openmodelica/test/TestRecord.java b/...src/org/openmodelica/test/TestRecord.java → ...src/org/openmodelica/test/TestRecord.java
diff --git a/...org/openmodelica/test/TestSmartProxy.java → ...org/openmodelica/test/TestSmartProxy.java b/...org/openmodelica/test/TestSmartProxy.java → ...org/openmodelica/test/TestSmartProxy.java
diff --git a/...erface/src/org/openmodelica/test/abc.java → ...erface/src/org/openmodelica/test/abc.java b/...erface/src/org/openmodelica/test/abc.java → ...erface/src/org/openmodelica/test/abc.java
diff --git a/...ava_interface/test_files/meta_modelica.mo → ...ava_interface/test_files/meta_modelica.mo b/...ava_interface/test_files/meta_modelica.mo → ...ava_interface/test_files/meta_modelica.mo
diff --git a/...va_interface/test_files/meta_modelica.mos → ...va_interface/test_files/meta_modelica.mos b/...va_interface/test_files/meta_modelica.mos → ...va_interface/test_files/meta_modelica.mos
diff --git a/.../util/java_interface/test_files/simple.mo → ...ntime/java_interface/test_files/simple.mo b/.../util/java_interface/test_files/simple.mo → ...ntime/java_interface/test_files/simple.mo
diff --git a/...util/java_interface/test_files/simple.mos → ...time/java_interface/test_files/simple.mos b/...util/java_interface/test_files/simple.mos → ...time/java_interface/test_files/simple.mos
diff --git a/configure.ac b/configure.ac
@@ -801,7 +801,7 @@ Compiler/runtime/config.unix.h \
 Parser/Makefile \
 SimulationRuntime/cpp/Makefile.env \
 SimulationRuntime/c/Makefile \
-SimulationRuntime/c/util/java_interface/Makefile \
+SimulationRuntime/java_interface/Makefile \
 SimulationRuntime/ParModelica/Makefile \
 SimulationRuntime/ParModelica/auto/Makefile \
 SimulationRuntime/ParModelica/explicit/openclrt/Makefile \