- Don't generate extra libs. Just use the Compiler/runtime.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@12567 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Aug 17, 2012 · 94e408c · 94e408c
1 parent 6e6bffc
commit 94e408c
Show file tree

Hide file tree

Showing 15 changed files with 14 additions and 155 deletions.
diff --git a/Compiler/Makefile.in b/Compiler/Makefile.in
@@ -108,7 +108,6 @@ clean:
 		(cd $$d ; $(MAKE) clean) \
 	done
 	(cd omc_release; $(MAKE) clean)
-	(cd runtime/FMI; $(MAKE) clean)
 	-$(RM) -f $(SRCH)
 	-$(RM) -f $(builddir_bin)/$(PROG)$(EXEEXT)
 	-cd $(builddir_bin) && rm -f $(SCRIPT_FILES)

diff --git a/Compiler/Util/FMI.mo b/Compiler/Util/FMI.mo
@@ -37,7 +37,7 @@ public function importFMU
   input String inFileName;
   input String inWorkingDirectory;
   output Boolean outBool;
-  external "C" outBool=FMIImpl__importFMU(inFileName, inWorkingDirectory) annotation(Library = "fmiwrapper");
+  external "C" outBool=FMIImpl__importFMU(inFileName, inWorkingDirectory) annotation(Library = "omcruntime");
 end importFMU;
 
 end FMI;
diff --git a/Compiler/omc_debug/Makefile.in b/Compiler/omc_debug/Makefile.in
@@ -14,7 +14,6 @@ RMLHOME	= @rmlhome@
 RMLINC  = -I$(RMLHOME)/include/plain
 FMILIB = -L../../3rdParty/FMIL/install/lib -lfmilib
 
-
 USE_CORBA = @USE_CORBA@
 
 EXEEXT = @EXEEXT@

diff --git a/Compiler/omc_profiler/Makefile.in b/Compiler/omc_profiler/Makefile.in
@@ -14,7 +14,6 @@ RMLHOME	= @rmlhome@
 RMLINC  = -I$(RMLHOME)/include/plain
 FMILIB = -L../../3rdParty/FMIL/install/lib -lfmilib
 
-
 USE_CORBA = @USE_CORBA@
 
 EXEEXT = @EXEEXT@

diff --git a/Compiler/runtime/FMI/Makefile.common b/Compiler/runtime/FMI/Makefile.common
diff --git a/Compiler/runtime/FMI/Makefile.in b/Compiler/runtime/FMI/Makefile.in
diff --git a/Compiler/runtime/FMI/fmuModelica.in b/Compiler/runtime/FMI/fmuModelica.in
diff --git a/Compiler/runtime/FMI/FMIImpl.c → Compiler/runtime/FMIImpl.c b/Compiler/runtime/FMI/FMIImpl.c → Compiler/runtime/FMIImpl.c
diff --git a/Compiler/runtime/FMI/FMIWrapper.c → Compiler/runtime/FMIWrapper.c b/Compiler/runtime/FMI/FMIWrapper.c → Compiler/runtime/FMIWrapper.c
@@ -100,6 +100,7 @@ void* fmiImportInstance_OMC(char* workingDirectory)
   fmi_import_context_t *context;
   context = fmi_import_allocate_context(&callbacks);
   // parse the xml file
+  //void* fmu1 = malloc(sizeof(fmi1_import_t));
   fmi1_import_t *fmu;
   fmu = fmi1_import_parse_xml(context, workingDirectory);
   if(!fmu) {
@@ -118,11 +119,12 @@ void* fmiImportInstance_OMC(char* workingDirectory)
 
 void fmiImportFreeInstance_OMC(void* fmu)
 {
-  fmi1_import_t* fmu1 = (fmi1_import_t*)fmu;
+  fmi1_import_t *fmu1 = (fmi1_import_t*)fmu;
+  //fprintf(stderr, "Path is %s\n", ((fmi1_import_t*)fmu)->dirPath); fflush(NULL);
   fprintf(stderr, "0\n"); fflush(NULL);
-  fmi1_import_destroy_dllfmu((fmi1_import_t*)fmu);
+  fmi1_import_destroy_dllfmu(fmu1);
   fprintf(stderr, "1\n"); fflush(NULL);
-  fmi1_import_free((fmi1_import_t*)fmu);
+  fmi1_import_free(fmu1);
 }
 
 #ifdef __cplusplus

diff --git a/Compiler/runtime/FMI/FMI_rml.c → Compiler/runtime/FMI_rml.c b/Compiler/runtime/FMI/FMI_rml.c → Compiler/runtime/FMI_rml.c
diff --git a/Compiler/runtime/Makefile.common b/Compiler/runtime/Makefile.common
@@ -22,7 +22,7 @@ endif
 RML_COMPAT=$(top_builddir)/SimulationRuntime/c/meta/rml_compatibility.h
 
 SRC	= Print_rml.c System_rml.c Settings_rml.c \
-  SimulationResults_rml.c IOStreamExt_rml.c Database_rml.c Socket_rml.c Lapack_rml.c ModelicaExternalC_rml.c  matching.c matching_cheap.c
+  SimulationResults_rml.c IOStreamExt_rml.c Database_rml.c Socket_rml.c Lapack_rml.c ModelicaExternalC_rml.c  matching.c matching_cheap.c FMI_rml.c
 
 CPPSRC  = unitparser.cpp UnitParserExt_rml.cpp ptolemyio_rml.cpp \
   BackendDAEEXT_rml.cpp ErrorMessage.cpp Error_rml.cpp \
@@ -31,7 +31,7 @@ CPPSRC  = unitparser.cpp UnitParserExt_rml.cpp ptolemyio_rml.cpp \
 OBJ     = $(SRC:.c=.o) $(CPPSRC:.cpp=.o) $(CPPSRC:.cc=.o)
 
 OMC_OBJ = Error_omc.o Print_omc.o System_omc.o Settings_omc.o \
-  IOStreamExt_omc.o ErrorMessage.o systemimplmisc.o \
+  IOStreamExt_omc.o ErrorMessage.o FMI_rml.o systemimplmisc.o \
   UnitParserExt_omc.o unitparser.o BackendDAEEXT_omc.o Socket_omc.o matching.o matching_cheap.o \
   Database_omc.o Dynload_omc.o SimulationResults_omc.o ptolemyio_omc.o Lapack_omc.o $(OMCCORBASRC)
 
@@ -80,6 +80,7 @@ SimulationResults_omc.o : SimulationResults.c SimulationResultsCmp.c errorext.h
 ptolemyio_rml.o : ptolemyio.cpp errorext.h
 ptolemyio_omc.o : ptolemyio.cpp errorext.h $(RML_COMPAT)
 ErrorMessage.o : ErrorMessage.cpp ErrorMessage.hpp errorext.h
+FMI_rml.o : FMIImpl.c FMIWrapper.c
 
 clean:
 	$(RM) -rf *.a *.o omc_communication.cc omc_communication.h omc_communication-* 
diff --git a/Compiler/runtime/Makefile.in b/Compiler/runtime/Makefile.in
@@ -7,6 +7,7 @@
 USE_CORBA = @USE_CORBA@
 
 RMLINCLUDE = @rmlinc@
+FMIINCLUDE = ../../3rdParty/FMIL/install/include
 CFLAGS = @CFLAGS@ $(USE_CORBA)
 
 ifdef USE_CORBA
@@ -27,7 +28,7 @@ CXX	= @CXX@
 IDL	= @IDLCMD@
 IDLPYTHON = @IDLPYTHONCMD@
 CXXFLAGS = $(CFLAGS)
-CPPFLAGS = @CPPFLAGS@ -I$(RMLINCLUDE) -I$(top_builddir)/SimulationRuntime/c -I$(top_builddir)/SimulationRuntime/c/simulation/results -I$(top_builddir)/SimulationRuntime/c/util -I$(top_builddir)/SimulationRuntime/c/meta -I$(top_builddir)/SimulationRuntime/c/meta/gc -I$(srcdir) -I. $(CORBAINCL)
+CPPFLAGS = @CPPFLAGS@ -I$(RMLINCLUDE) -I$(top_builddir)/SimulationRuntime/c -I$(top_builddir)/SimulationRuntime/c/simulation/results -I$(top_builddir)/SimulationRuntime/c/util -I$(top_builddir)/SimulationRuntime/c/meta -I$(top_builddir)/SimulationRuntime/c/meta/gc -I$(srcdir) -I. $(CORBAINCL) -I$(FMIINCLUDE)
 
 include Makefile.common
 

diff --git a/Makefile.common b/Makefile.common
@@ -85,9 +85,6 @@ runtimeCPPinstall:
 runtimeCPPclean: 
 	$(MAKE) -C SimulationRuntime/cpp/ -f $(defaultMakefileTarget) clean
 
-fmiwrapper:
-	$(MAKE) -C Compiler/runtime/FMI -f $(defaultMakefileTarget)
-
 fmil:
 	test -d 3rdParty/FMIL
 	mkdir -p 3rdParty/FMIL/build

diff --git a/Makefile.in b/Makefile.in
@@ -26,10 +26,10 @@ settings:
 
 difftool: mkbuilddirs
 	$(MAKE) -C testsuite/difftool
-omc: difftool interactive docs fmi fmil fmiwrapper
+omc: difftool interactive docs fmi fmil
 	(cd Compiler && $(MAKE) -f Makefile release)
 
-omcd: difftool interactive docs fmi fmil fmiwrapper
+omcd: difftool interactive docs fmi fmil
 	(cd Compiler && $(MAKE) -f Makefile debug)
 
 qtclean-common:

diff --git a/configure.in b/configure.in
@@ -622,7 +622,7 @@ date=`date "+%Y-%m-%d %H:%M:%S"`
 
 GENERATED_AUTOCONF_FILES="Makefile \
 Compiler/Makefile Compiler/omc_release/Makefile Compiler/omc_debug/Makefile \
-Compiler/omc_profiler/Makefile Compiler/runtime/Makefile Compiler/runtime/FMI/Makefile \
+Compiler/omc_profiler/Makefile Compiler/runtime/Makefile \
 Compiler/modpar/Makefile \
 Compiler/runtime/config.unix.h \
 PythonInterface/Makefile \