- separate Simcode from BackEnd

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@22730 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Oct 13, 2014 · 4d06274 · 4d06274
1 parent 7754588
commit 4d06274
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 14 deletions.
diff --git a/Compiler/Makefile.common b/Compiler/Makefile.common
@@ -23,14 +23,15 @@ $(srcdir)/runtime/runtime.a \
 FRONTEND_DIR=$(srcdir)/FrontEnd
 FFRONTEND_DIR=$(srcdir)/FFrontEnd
 BACKEND_DIR=$(srcdir)/BackEnd
+SIMCODE_DIR=$(srcdir)/SimCode
 GLOBAL_DIR=$(srcdir)/Global
 TEMPLATE_DIR=$(srcdir)/Template
 SCRIPT_DIR=$(srcdir)/Script
 UTIL_DIR=$(srcdir)/Util
 MAIN_DIR=$(srcdir)/Main
-ALL_DIRS = $(FRONTEND_DIR) $(FFRONTEND_DIR) $(BACKEND_DIR) $(TEMPLATE_DIR) $(UTIL_DIR) $(SCRIPT_DIR) $(MAIN_DIR) $(GLOBAL_DIR)
-RML_INCLUDE_ALL_DIRS = -I$(FRONTEND_DIR) -I$(FFRONTEND_DIR) -I$(BACKEND_DIR) -I$(TEMPLATE_DIR) -I$(UTIL_DIR) -I$(SCRIPT_DIR) -I$(MAIN_DIR) -I$(GLOBAL_DIR)
-RMLC_INCLUDE_ALL_DIRS = -I$(FRONTEND_DIR),-I$(FFRONTEND_DIR),-I$(BACKEND_DIR),-I$(TEMPLATE_DIR),-I$(UTIL_DIR),-I$(SCRIPT_DIR),-I$(MAIN_DIR),-I$(GLOBAL_DIR)
+ALL_DIRS = $(FRONTEND_DIR) $(FFRONTEND_DIR) $(BACKEND_DIR) $(SIMCODE_DIR) $(TEMPLATE_DIR) $(UTIL_DIR) $(SCRIPT_DIR) $(MAIN_DIR) $(GLOBAL_DIR)
+RML_INCLUDE_ALL_DIRS = -I$(FRONTEND_DIR) -I$(FFRONTEND_DIR) -I$(BACKEND_DIR)  -I$(SIMCODE_DIR) -I$(TEMPLATE_DIR) -I$(UTIL_DIR) -I$(SCRIPT_DIR) -I$(MAIN_DIR) -I$(GLOBAL_DIR)
+RMLC_INCLUDE_ALL_DIRS = -I$(FRONTEND_DIR),-I$(FFRONTEND_DIR),-I$(BACKEND_DIR),-I$(SIMCODE_DIR),-I$(TEMPLATE_DIR),-I$(UTIL_DIR),-I$(SCRIPT_DIR),-I$(MAIN_DIR),-I$(GLOBAL_DIR)
 
 FRONTEND = \
 Absyn.mo \
@@ -167,8 +168,6 @@ HpcOmBenchmark.mo \
 HpcOmEqSystems.mo \
 HpcOmMemory.mo \
 HpcOmScheduler.mo \
-HpcOmSimCode.mo \
-HpcOmSimCodeMain.mo \
 HpcOmTaskGraph.mo \
 IndexReduction.mo \
 Initialization.mo \
@@ -179,15 +178,19 @@ OnRelaxation.mo \
 OpenTURNS.mo \
 RemoveSimpleEquations.mo \
 ResolveLoops.mo \
-SimCode.mo \
-SimCodeMain.mo \
-SimCodeUtil.mo \
 SynchronousFeatures.mo \
 Tearing.mo \
 Uncertainties.mo \
 UnitCheck.mo \
 XMLDump.mo
 
+SIMCODE = \
+HpcOmSimCode.mo \
+HpcOmSimCodeMain.mo \
+SimCode.mo \
+SimCodeMain.mo \
+SimCodeUtil.mo \
+
 GLOBAL = \
 Global.mo
 
@@ -290,7 +293,7 @@ FMIExt.mo \
 GraphStreamExt.mo \
 
 # all modules
-SRCMO   = $(FRONTEND) $(FFRONTEND) $(BACKEND) $(GLOBAL) $(TEMPLATE) $(UTIL) $(SCRIPT) $(MAIN)
+SRCMO   = $(FRONTEND) $(FFRONTEND) $(BACKEND) $(SIMCODE) $(GLOBAL) $(TEMPLATE) $(UTIL) $(SCRIPT) $(MAIN)
 ALLMO   = $(SRCMO) $(EXTERNAL)
 SRCC    = $(SRCMO:%.mo=%.c)
 SRCH    = $(SRCC:%.c=%.h)

diff --git a/Compiler/Makefile.compiler_subdirs.common b/Compiler/Makefile.compiler_subdirs.common
@@ -18,6 +18,7 @@ SRCHSRCDIR = $(SRCH:%.h=$(srcdir)/%.h)
 vpath %.mo $(FRONTEND_DIR)
 vpath %.mo $(FFRONTEND_DIR)
 vpath %.mo $(BACKEND_DIR)
+vpath %.mo $(SIMCODE_DIR)
 vpath %.mo $(GLOBAL_DIR)
 vpath %.mo $(TEMPLATE_DIR)
 vpath %.mo $(SCRIPT_DIR)

diff --git a/Compiler/BackEnd/HpcOmSimCode.mo → Compiler/SimCode/HpcOmSimCode.mo b/Compiler/BackEnd/HpcOmSimCode.mo → Compiler/SimCode/HpcOmSimCode.mo
diff --git a/Compiler/BackEnd/HpcOmSimCodeMain.mo → Compiler/SimCode/HpcOmSimCodeMain.mo b/Compiler/BackEnd/HpcOmSimCodeMain.mo → Compiler/SimCode/HpcOmSimCodeMain.mo
diff --git a/Compiler/BackEnd/SimCode.mo → Compiler/SimCode/SimCode.mo b/Compiler/BackEnd/SimCode.mo → Compiler/SimCode/SimCode.mo
diff --git a/Compiler/BackEnd/SimCodeMain.mo → Compiler/SimCode/SimCodeMain.mo b/Compiler/BackEnd/SimCodeMain.mo → Compiler/SimCode/SimCodeMain.mo
diff --git a/Compiler/BackEnd/SimCodeUtil.mo → Compiler/SimCode/SimCodeUtil.mo b/Compiler/BackEnd/SimCodeUtil.mo → Compiler/SimCode/SimCodeUtil.mo
diff --git a/Compiler/boot/LoadCompilerSources.mos b/Compiler/boot/LoadCompilerSources.mos
@@ -146,8 +146,6 @@ if true then /* Suppress output */
     "../BackEnd/HpcOmMemory.mo",
     "../BackEnd/HpcOmScheduler.mo",
     "../BackEnd/HpcOmSchedulerExt.mo",
-    "../BackEnd/HpcOmSimCode.mo",
-    "../BackEnd/HpcOmSimCodeMain.mo",
     "../BackEnd/HpcOmTaskGraph.mo",
     "../BackEnd/IndexReduction.mo",
     "../BackEnd/InlineArrayEquations.mo",
@@ -158,15 +156,19 @@ if true then /* Suppress output */
     "../BackEnd/OpenTURNS.mo",
     "../BackEnd/RemoveSimpleEquations.mo",
     "../BackEnd/ResolveLoops.mo",
-    "../BackEnd/SimCode.mo",
-    "../BackEnd/SimCodeMain.mo",
-    "../BackEnd/SimCodeUtil.mo",
     "../BackEnd/SynchronousFeatures.mo",
     "../BackEnd/Tearing.mo",
     "../BackEnd/Uncertainties.mo",
     "../BackEnd/UnitCheck.mo",
     "../BackEnd/XMLDump.mo",
 
+  // "SimCode";
+    "../SimCode/HpcOmSimCode.mo",
+    "../SimCode/HpcOmSimCodeMain.mo",
+    "../SimCode/SimCode.mo",
+    "../SimCode/SimCodeMain.mo",
+    "../SimCode/SimCodeUtil.mo",
+
   // "Script";
     "../Script/CevalScript.mo",
     "../Script/GlobalScript.mo",