-fixed compiling issues in SimulationRuntime/c/meta

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@10362 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Nov 9, 2011 · e0885ad · e0885ad
1 parent f9e871e
commit e0885ad
Show file tree

Hide file tree

Showing 23 changed files with 64 additions and 82 deletions.
diff --git a/SimulationRuntime/c/Makefile.common b/SimulationRuntime/c/Makefile.common
@@ -6,76 +6,49 @@ CPPFLAGS = -I. -Iinteractive/ -Imeta/ -I../
 FFLAGS  = -O -fexceptions
 # P.A: before, g77 had -O3 or -O2 but that caused a bug in DDASRT, giving infinite loop.
 
-LIBS = libsim.a libmath-support.a lib.a libutil.a libmeta.a libf2c.a libresult.a libModelicaExternalC.a 
+LIBS = libsim.a libsolver.a libmath-support.a libutil.a libmeta.a libf2c.a libresult.a libModelicaExternalC.a libsendData.a
 
-.PHONY : libsendData.a interactive/libinteractive.a ModelicaExternalC/libModelicaExternalC.a
+.PHONY : libsim.a libmath-support.a libsolver.a libutil.a libmeta.a libf2c.a libresult.a libModelicaExternalC.a libsendData.a clean
 
-all : install
+all : libSimulationRuntimeC.a
 
-simulation_result_plt.o : $(CONFIG_H)
 
-#recompile all if a header changes!
-$(SIM_OBJS) : $(HFILES)
-$(QSS_OBJS) : $(HFILES)
-
-# Commented out due to the script not running on all platform, and rarely changes
-#meta/meta_modelica_string_lit.h: meta/meta_modelica_gen_string_lit.sh
-#	sh $< h > $@.tmp
-#	mv $@.tmp $@
-#meta/meta_modelica_string_lit.c: meta/meta_modelica_gen_string_lit.sh
-#	sh $< > $@.tmp
-#	mv $@.tmp $@
-
-libSimulationRuntimeC.a : $(SIM_OBJS) $(HFILES)
-	$(AR) $@ $(SIM_OBJS)
+libSimulationRuntimeC.a : $(LIBS)
+	$(AR) $@ simulation/libsim.a simulation/math-support/libmath-support.a simulation/solver/libsolver.a simulation/results/libresult.a simulation/libf2c/libf2c.a util/libutil.a sendData/release/libsendData.a
 	ranlib $@
 
-libSimulationRuntimeQss.a : $(QSS_OBJS) $(HFILES)
-	$(AR) $@ $(QSS_OBJS)
-	ranlib $@	
+libmath-support.a: 
+	$(MAKE) -C simulation/math-support
 
-simulation_runtime_qss.o: simulation_runtime.cpp
-	$(CXX) $(CPPFLAGS) -c -o $@ simulation_runtime.cpp -D_OMC_QSS_LIB
+libsolver.a: 
+	$(MAKE) -C simulation/solver
 
-ModelicaExternalC/libModelicaExternalC.a: $(addprefix ModelicaExternalC/,ModelicaInternal.c ModelicaStrings.c ModelicaTablesImpl.c) $(HFILES)
-	$(MAKE) -C ModelicaExternalC -f $(EXTERNALCMAKEFILE)
+libresult.a: 
+	$(MAKE) -C simulation/results
 
-interactive/libinteractive.a : interactive/omi_Calculation.cpp interactive/omi_Control.cpp interactive/omi_ResultManager.cpp interactive/omi_ServiceInterface.cpp interactive/omi_Transfer.cpp interactive/socket.cpp interactive/thread.cpp
-	$(MAKE) -C interactive -f $(INTERACTIVEMAKEFILE)
-
-libf2c/libf2c.a :
-	cd libf2c && $(MAKE) -f $(LIBF2CMAKEFILE)
-	ranlib $@
+libf2c.a: 
+	$(MAKE) -C simulation/libf2c -f makefile.u
 
-meta/meta_modelica_catch.o : meta/meta_modelica_catch.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ -g $<
+libmeta.a: 
+	$(MAKE) -C meta
 
-# Requires IEEE floating-point precision
-simulation_input.o : simulation_input.cpp
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -mfpmath=sse -c -g $<
-simulation_events.o : simulation_events.cpp
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -mfpmath=sse -c -g $<
+libutil.a: 
+	$(MAKE) -C util
 
-install: libSimulationRuntimeC.a libSimulationRuntimeQss.a $(LIBF2C) interactive/libinteractive.a $(LIBSENDDATA) omdevinstall ModelicaExternalC/libModelicaExternalC.a
-	cp $(HFILES) $(builddir_inc)/
-	cp fmu_model_interface.c $(builddir_inc)/
-	cp $(LIBS) $(builddir_lib)/
-	test -z "$(LIBF2C)" || cp libf2c/libf2c.* $(builddir_lib)/
-	test -z "$(LIBSENDDATA)" || cp sendData/release/$(LIBSENDDATA) $(builddir_lib)/
-	cp interactive/libinteractive.a $(builddir_lib)/
-	@$(MAKE) -C java_interface -f $(JAVAMAKEFILE) && \
-	$(MAKE) -C java_interface -f $(JAVAMAKEFILE) install || \
-	$(MAKE) -C java_interface -f $(JAVAMAKEFILE) install-nomodelica
+libsim.a: 
+	$(MAKE) -C simulation 
 
-clean :
-	test -z "$(LIBF2C)" || $(MAKE) -C libf2c -f $(LIBF2CMAKEFILE) clean
-	$(MAKE) -C java_interface -f $(JAVAMAKEFILE) clean
-	$(MAKE) -C interactive -f $(INTERACTIVEMAKEFILE) clean
-	$(MAKE) -C ModelicaExternalC -f $(EXTERNALCMAKEFILE) clean
-	rm -f libSimulationRuntimeC.a libSimulationRuntimeQss.a
-	rm -f $(OBJS) $(SIM_OBJS) $(QSS_OBJS)
-	cd sendData && rm -fr release debug *sendData*.o *sendData*.a
-	rm -rf sendData/release sendData/debug
-	rm -f sendData.o sendData.a sendData/sendDataHumbug.o sendData/releasesendData.o sendData/Makefile solver_qss/*.o
 
+libModelicaExternalC.a: 
+	$(MAKE) -C ModelicaExternalC 
 
+clean:
+	$(MAKE) -C ModelicaExternalC clean
+	$(MAKE) -C simulation clean
+	$(MAKE) -C simulation/solver clean
+	$(MAKE) -C simulation/libf2c -f makefile.u clean
+	$(MAKE) -C simulation/math-support clean
+	$(MAKE) -C simulation/results clean
+	$(MAKE) -C meta clean
+	$(MAKE) -C util clean
+
diff --git a/SimulationRuntime/c/meta/meta_modelica.c b/SimulationRuntime/c/meta/meta_modelica.c
@@ -29,7 +29,8 @@
  *
  */
 
-#include "modelica.h"
+#include "openmodelica.h"
+#include "meta_modelica.h"
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/SimulationRuntime/c/meta/meta_modelica.h b/SimulationRuntime/c/meta/meta_modelica.h
@@ -43,6 +43,7 @@
 #include "meta_modelica_string_lit.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdarg.h>
 #include <string.h>
 #include <errno.h>
 

diff --git a/SimulationRuntime/c/meta/meta_modelica_builtin.c b/SimulationRuntime/c/meta/meta_modelica_builtin.c
@@ -31,6 +31,7 @@
 #define __OPENMODELICA__METAMODELICA
 
 #include "meta_modelica_builtin.h"
+#include "meta_modelica.h"
 #include <limits.h>
 #include <assert.h>
 #include <time.h>

diff --git a/SimulationRuntime/c/meta/meta_modelica_builtin.h b/SimulationRuntime/c/meta/meta_modelica_builtin.h
@@ -37,7 +37,7 @@
 #ifndef META_MODELICA_BUILTIN_H_
 #define META_MODELICA_BUILTIN_H_
 
-#include "modelica.h"
+#include "openmodelica.h"
 
 #if defined(__cplusplus)
 extern "C" {

diff --git a/SimulationRuntime/c/meta/meta_modelica_builtin_boxptr.h b/SimulationRuntime/c/meta/meta_modelica_builtin_boxptr.h
@@ -1,6 +1,9 @@
 /* Creates an implementation only if #define GEN_META_MODELICA_BUILTIN_BOXPTR is given.
  * Else, we only create a header.
  */
+#include "utility.h"
+#include "meta_modelica_real.h"
+#include "modelica_string.h"
 
 #if !defined(META_MODELICA_BUILTIN_BOXPTR__H) || defined(GEN_META_MODELICA_BUILTIN_BOXPTR)
 #define META_MODELICA_BUILTIN_BOXPTR__H

diff --git a/SimulationRuntime/c/meta/meta_modelica_gc.c b/SimulationRuntime/c/meta/meta_modelica_gc.c
@@ -40,7 +40,8 @@
  *
  */
 
-#include "modelica.h"
+#include "openmodelica.h"
+#include "meta_modelica.h"
 
 #if defined(_MMC_GC_)
 

diff --git a/SimulationRuntime/c/meta/meta_modelica_gc.h b/SimulationRuntime/c/meta/meta_modelica_gc.h
@@ -63,7 +63,7 @@
 #ifndef META_MODELICA_GC_H_
 #define META_MODELICA_GC_H_
 
-#include "modelica.h"
+#include "openmodelica.h"
 #include "meta_modelica_gc_settings.h"
 #include "meta_modelica_gc_stack.h"
 #include "meta_modelica_gc_list.h"

diff --git a/SimulationRuntime/c/meta/meta_modelica_gc_list.c b/SimulationRuntime/c/meta/meta_modelica_gc_list.c
@@ -29,8 +29,8 @@
  *
  */
 
-#include "modelica.h"
-
+#include "openmodelica.h"
+#include "meta_modelica.h"
 
 /* make an empty list */
 mmc_GC_free_list_type* list_create(size_t default_free_slots_size)

diff --git a/SimulationRuntime/c/meta/meta_modelica_gc_list.h b/SimulationRuntime/c/meta/meta_modelica_gc_list.h
@@ -36,7 +36,7 @@
 extern "C" {
 #endif
 
-#include "modelica.h"
+#include "openmodelica.h"
 
 /*
  * 

diff --git a/SimulationRuntime/c/meta/meta_modelica_gc_pages.c b/SimulationRuntime/c/meta/meta_modelica_gc_pages.c
@@ -29,7 +29,8 @@
  *
  */
 
-#include "modelica.h"
+#include "openmodelica.h"
+#include "meta_modelica.h"
 
 /* create the pages structure and allocate the default pages with default size */
 mmc_GC_pages_type pages_create(size_t default_pages_size, size_t default_page_size, size_t default_number_of_pages, size_t default_free_slots_size)

diff --git a/SimulationRuntime/c/meta/meta_modelica_gc_pages.h b/SimulationRuntime/c/meta/meta_modelica_gc_pages.h
@@ -32,7 +32,7 @@
 #ifndef META_MODELICA_GC_PAGES_H_
 #define META_MODELICA_GC_PAGES_H_
 
-#include "modelica.h"
+#include "openmodelica.h"
 
 #if defined(__cplusplus)
 extern "C" {

diff --git a/SimulationRuntime/c/meta/meta_modelica_gc_roots.c b/SimulationRuntime/c/meta/meta_modelica_gc_roots.c
@@ -37,7 +37,8 @@
  *
  */
 
-#include "modelica.h"
+#include "openmodelica.h"
+#include "meta_modelica.h"
 
 /* create the roots structure */
 mmc_GC_roots_type roots_create(size_t default_roots_size, size_t default_roots_mark_size)

diff --git a/SimulationRuntime/c/meta/meta_modelica_gc_roots.h b/SimulationRuntime/c/meta/meta_modelica_gc_roots.h
@@ -40,7 +40,7 @@
 #ifndef META_MODELICA_GC_ROOTS_H_
 #define META_MODELICA_GC_ROOTS_H_
 
-#include "modelica.h"
+#include "openmodelica.h"
 
 #if defined(__cplusplus)
 extern "C" {

diff --git a/SimulationRuntime/c/meta/meta_modelica_gc_settings.c b/SimulationRuntime/c/meta/meta_modelica_gc_settings.c
@@ -37,7 +37,8 @@
  *
  */
 
-#include "modelica.h"
+#include "openmodelica.h"
+#include "meta_modelica.h"
 
 mmc_GC_settings_type mmc_GC_settings_default = 
 {

diff --git a/SimulationRuntime/c/meta/meta_modelica_gc_settings.h b/SimulationRuntime/c/meta/meta_modelica_gc_settings.h
@@ -41,7 +41,7 @@
 #ifndef META_MODELICA_GC_SETTINGS_H_
 #define META_MODELICA_GC_SETTINGS_H_
 
-#include "modelica.h"
+#include "openmodelica.h"
 
 #if defined(__cplusplus)
 extern "C" {

diff --git a/SimulationRuntime/c/meta/meta_modelica_gc_stack.c b/SimulationRuntime/c/meta/meta_modelica_gc_stack.c
@@ -29,7 +29,8 @@
  *
  */
 
-#include "modelica.h"
+#include "openmodelica.h"
+#include "meta_modelica.h"
 
 /* make an empty stack */
 mmc_Stack_type* stack_create(size_t default_stack_size)

diff --git a/SimulationRuntime/c/meta/meta_modelica_gc_stack.h b/SimulationRuntime/c/meta/meta_modelica_gc_stack.h
@@ -32,7 +32,7 @@
 #ifndef META_MODELICA_GC_STACK_H_
 #define META_MODELICA_GC_STACK_H_
 
-#include "modelica.h"
+#include "openmodelica.h"
 
 #if defined(__cplusplus)
 extern "C" {

diff --git a/SimulationRuntime/c/meta/meta_modelica_gc_stats.c b/SimulationRuntime/c/meta/meta_modelica_gc_stats.c
@@ -37,7 +37,8 @@
  *
  */
 
-#include "modelica.h"
+#include "openmodelica.h"
+#include "meta_modelica.h"
 
 /* create the statistics structure */
 mmc_GC_stats_type stats_create(void)

diff --git a/SimulationRuntime/c/meta/meta_modelica_gc_stats.h b/SimulationRuntime/c/meta/meta_modelica_gc_stats.h
@@ -40,7 +40,7 @@
 #ifndef META_MODELICA_GC_STATS_H_
 #define META_MODELICA_GC_STATS_H_
 
-#include "modelica.h"
+#include "openmodelica.h"
 
 #if defined(__cplusplus)
 extern "C" {

diff --git a/...tionRuntime/c/meta/meta_modelica_real.cpp → ...lationRuntime/c/meta/meta_modelica_real.c b/...tionRuntime/c/meta/meta_modelica_real.cpp → ...lationRuntime/c/meta/meta_modelica_real.c
@@ -30,6 +30,7 @@
 
 #define __OPENMODELICA__METAMODELICA
 
+#include "meta_modelica.h"
 #include "meta_modelica_real.h"
 #include "meta_modelica_builtin.h"
 #include <limits.h>
@@ -45,8 +46,6 @@
 #define snprintf _snprintf
 #endif
 
-extern "C" {
-
 static const MMC_DEFSTRINGLIT(_OMC_LIT_NEG_INF,4,"-inf");
 static const MMC_DEFSTRINGLIT(_OMC_LIT_POS_INF,3,"inf");
 static const MMC_DEFSTRINGLIT(_OMC_LIT_NAN,3,"NaN");
@@ -60,7 +59,7 @@ modelica_string realString(modelica_real r)
    * Add safety margin in case some C runtime is trigger happy. */
   static char buffer[32];
   modelica_string res;
-  // fprintf(stderr, "\nrealString(%g)\n", r);
+  /* fprintf(stderr, "\nrealString(%g)\n", r); */
   if (isinf(r) && r < 0)
     res = MMC_REFSTRINGLIT(_OMC_LIT_NEG_INF);
   else if (isinf(r))
@@ -97,5 +96,3 @@ modelica_metatype boxptr_realMax(modelica_metatype a,modelica_metatype b)
 {
   return mmc_mk_rcon(fmax(mmc_unbox_real(a),mmc_unbox_real(b)));
 }
-
-}
diff --git a/SimulationRuntime/c/meta/meta_modelica_real.h b/SimulationRuntime/c/meta/meta_modelica_real.h
@@ -37,7 +37,7 @@
 #ifndef META_MODELICA_REAL_H_
 #define META_MODELICA_REAL_H_
 
-#include "modelica.h"
+#include "openmodelica.h"
 
 #if defined(__cplusplus)
 extern "C" {

diff --git a/SimulationRuntime/c/sendData/sendData.h b/SimulationRuntime/c/sendData/sendData.h
@@ -49,7 +49,7 @@ class QStringList;
 //Std headers
 #include <iostream>
 #include <cstdlib>
-#include "../simulation_varinfo.h"
+#include "../simulation/simulation_varinfo.h"
 
 class Connection
 {