Changeset 88b5250f in OpenModelica

Timestamp:

2020-10-21T14:04:18+02:00 (4 years ago)

Author:

Mahder Gebremedhin <mahder.gebremedhin@…>

Children:

ea3c8823

Parents:

d0e20bb

git-author:

Mahder Gebremedhin <mahder.gebremedhin@…> (10/15/20 10:41:05)

git-committer:

Mahder Gebremedhin <mahder.gebremedhin@…> (10/21/20 14:04:18)

Message:

[cmake] Remove unnecessary package_list file.

• The list of MM filenames part of the compilation is now generated by cmake itself during build system generation. The file contains a list of just the filenames (no path, no extension) to be read by the simple dep_scanner executable.

• Add some comments to the CMakeLists file. There needs to be more. Maybe writing a whole standalone documentation can even be better as soon as this is stable.

Location:

OMCompiler/Compiler

Files:

• .cmake/package_list.txt (deleted)
• CMakeLists.txt (modified) (6 diffs)

OMCompiler/Compiler/CMakeLists.txt

@@ -30 +30 @@
 
 
-add_executable(dep_scanner ${CMAKE_CURRENT_SOURCE_DIR}/.cmake/dep_scanner.cpp)
-target_compile_features(dep_scanner PRIVATE cxx_std_11)
-
-
-
-
-
 
 macro(add_interface_check_step mo_source_file)
@@ -55 +48 @@
     )
 
-    set(OMC_MM_SOURCE_FILES ${OMC_MM_SOURCE_FILES} ${mo_source_file})
+    set(OMC_MM_SOURCE_FILE_NAMES ${OMC_MM_SOURCE_FILE_NAMES} ${file_name_no_ext})
 
     set(OMC_MM_INTERFACE_FILES ${OMC_MM_INTERFACE_FILES} ${CMAKE_CURRENT_BINARY_DIR}/${file_name_no_ext}.interface.mo)
@@ -124 +117 @@
 
 
+
+# A target to make sure all interfaces have been checked. Interfaces get rechecked if a MM source is
+# modified. If a source is modified and the interface has NOT actually changed then only the stamp files
+# are touched to signify time of check. If the interface has CHANGED then the interface file is also
+# updated which will cause regeneration of dependency information. See the section below.
 add_custom_target(INTERFACE_CHECK
                   DEPENDS ${OMC_MM_STAMP_FILES}
                   COMMENT "Checked interfaces of modified MetaModelica sources.")
 
+
+
+
+# Add a small dependency scanner program. This reads a list of list of dependencies and generates
+# a list of dependents for each entry.
+add_executable(dep_scanner ${CMAKE_CURRENT_SOURCE_DIR}/.cmake/dep_scanner.cpp)
+target_compile_features(dep_scanner PRIVATE cxx_std_11)
+
+# Write out a new line separated list of all MM source files to a list so that it can be easily
+# parsed by the small MetaModelica dependency scanner we have now. (c++ code)
+# The quote "" on ${OMC_MM_SOURCE_FILE_NAMES} is needed to get the ";"s in the list
+string (REPLACE ";" "\n" OMC_MM_SOURCE_FILE_NAMES_NEW_LINES "${OMC_MM_SOURCE_FILE_NAMES}")
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/mm_source_filenames_list.txt ${OMC_MM_SOURCE_FILE_NAMES_NEW_LINES})
+
+# Read the mm_source_filenames_list with the dep scanner. The dep scanner then reads <mm_source>.depends file for the
+# each mm_source in the list and generates the "reverse dependencies" (dependents) for each source in to <mm_source>.rev_deps.
+# This means all the files listed in .rev_deps need to be retranslated when <mm_source>.mo is modified.
 add_custom_command(
                 DEPENDS ${OMC_MM_INTERFACE_FILES}
-                COMMAND $<TARGET_FILE:dep_scanner> ${CMAKE_CURRENT_SOURCE_DIR}/.cmake/package_list.txt ${CMAKE_CURRENT_BINARY_DIR}
+                COMMAND $<TARGET_FILE:dep_scanner> ${CMAKE_CURRENT_BINARY_DIR}/mm_source_filenames_list.txt ${CMAKE_CURRENT_BINARY_DIR}
                 COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/dep_scan.stamp
                 OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dep_scan.stamp
@@ -139 +154 @@
 
 
+
+
+
 add_custom_target(DEPENDENCY_UPDATE
                   DEPENDS ${OMC_REV_DEP_STAMP_FILES}
@@ -147 +165 @@
 add_dependencies(DEPENDENCY_UPDATE DEPENDENCY_SCAN)
 
+
+
+
 add_library(OpenModelicaCompiler STATIC ${OMC_C_SOURCE_FILES} .cmake/omc_entry_point.c)
 target_compile_definitions(OpenModelicaCompiler PRIVATE ADD_METARECORD_DEFINITIONS=)
@@ -153 +174 @@
 
 
-include_regular_expression("^$")
 # There is a lonely omc_file.h in Util/. It belongs in runtime/. Remove this when it is moved.
 target_include_directories(OpenModelicaCompiler PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Util)
-
-# include_regular_expression("^.*$" "^$")