Changeset 03ebe580 in OpenModelica

Timestamp:

2020-11-10T16:25:08+01:00 (4 years ago)

Author:

Mahder Gebremedhin <mahder.gebremedhin@…>

Children:

6714810

Parents:

47959554

git-author:

Mahder Gebremedhin <mahder.gebremedhin@…> (11/09/20 15:23:43)

git-committer:

Mahder Gebremedhin <mahder.gebremedhin@…> (11/10/20 16:25:08)

Message:

Use OpenModelicaBootstrappingHeader.h from tarball

• Use OpenModelicaBootstrappingHeader.h from tarball-include for now.

It would be nice if it is also added to source control just like the
C bootstrapping source files. Otherwise it might actually break.

If we add it to source control we can also remove the boot libraries
like omparse-boot, omcruntime-boot ....

File:

• OMCompiler/Compiler/boot/CMakeLists.txt (modified) (3 diffs)

OMCompiler/Compiler/boot/CMakeLists.txt

@@ -2 +2 @@
 project(bomc)
 
+# OpenModelicaBootstrappingHeader.h should probably be added to source control and
+# updated just like the boostrap-source c files. 
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tarball-include/OpenModelicaBootstrappingHeader.h 
+                ${CMAKE_CURRENT_SOURCE_DIR}/../OpenModelicaBootstrappingHeader.h)
 
 file(GLOB BOOTSTRAP_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/bootstrap-sources/build/*.c)
@@ -13 +17 @@
 target_include_directories(bomc PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../Util)
 
-target_link_libraries(bomc PRIVATE omc::parser-boot)
-target_link_libraries(bomc PRIVATE omc::compiler::runtime-boot)
-target_link_libraries(bomc PRIVATE omc::compiler::graphstream-boot)
-# target_link_libraries(bomc PRIVATE omc::simrt::runtime)
+target_link_libraries(bomc PRIVATE omc::parser)
+target_link_libraries(bomc PRIVATE omc::compiler::runtime)
+target_link_libraries(bomc PRIVATE omc::compiler::graphstream)
 target_link_libraries(bomc PRIVATE omc::3rd::modelica_external_c)
 target_link_libraries(bomc PRIVATE omc::3rd::modelica_io)
@@ -38 +41 @@
     COMMENT "Copying (NF/Meta/Modelica)Builtin.mo files for the bootstrapped omc.")
 
+
+# add_custom_command(
+#     TARGET bomc
+#     POST_BUILD
+
+#     DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../FrontEnd/Absyn.mo 
+#             ${CMAKE_CURRENT_SOURCE_DIR}/../Script/GlobalScript.mo 
+#             ${CMAKE_CURRENT_SOURCE_DIR}/../FrontEnd/Values.mo 
+#             ${CMAKE_CURRENT_SOURCE_DIR}/../Util/Error.mo 
+#             ${CMAKE_CURRENT_SOURCE_DIR}/../Util/Util.mo 
+#             ${CMAKE_CURRENT_SOURCE_DIR}/../Util/FMI.mo 
+#             ${CMAKE_CURRENT_SOURCE_DIR}/../GenerateOMCHeader.mos
+
+#     # The GenerateOMCHeader.mos script expects us to be in OMCompiler/Compiler folder.
+#     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../
+
+
+#     COMMAND $<TARGET_FILE:bomc> -g=MetaModelica ${CMAKE_CURRENT_SOURCE_DIR}/../GenerateOMCHeader.mos
+#     COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/../OpenModelicaBootstrappingHeader.h.new 
+#                                      ${CMAKE_CURRENT_SOURCE_DIR}/../OpenModelicaBootstrappingHeader.h
+
+#     BYPRODUCTS ${CMAKE_CURRENT_SOURCE_DIR}/../OpenModelicaBootstrappingHeader.h
+#     BYPRODUCTS ${CMAKE_CURRENT_SOURCE_DIR}/../OpenModelicaBootstrappingHeader.h.new
+#     COMMENT "Generating ${CMAKE_CURRENT_SOURCE_DIR}/../OpenModelicaBootstrappingHeader.h"
+# )