TGFS
/
TGC-ISS
14
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cleanup descriptions

This commit is contained in:
Eyck Jentzsch 2021-11-15 09:31:17 +01:00
parent 4b0c42c1bf
commit f13ac8e652
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -109,7 +109,11 @@ if (ENABLE_CLANG_TIDY)
endif() endif()
include(CodeGen) include(CodeGen)
gen_coredsl(${CORE_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/tgfs/gen_input/${CORE_NAME}.core_desc interp) if(NOT CORE_DSL_INPUT_DIR)
set(CORE_DSL_INPUT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/tgfs/gen_input)
endif()
gen_coredsl(${CORE_NAME} ${CORE_DSL_INPUT_DIR}/${CORE_NAME}.core_desc interp)
add_subdirectory(dbt-core) add_subdirectory(dbt-core)
add_subdirectory(scc) add_subdirectory(scc)

5
cmake/CodeGen.cmake
View File

@ -56,7 +56,6 @@ set(JAVA_OPTS --add-modules ALL-SYSTEM --add-opens=java.base/java.io=ALL-UNNAMED
--add-opens=java.rmi/java.rmi.server=ALL-UNNAMED --add-opens=java.sql/java.sql=ALL-UNNAMED) --add-opens=java.rmi/java.rmi.server=ALL-UNNAMED --add-opens=java.sql/java.sql=ALL-UNNAMED)
set(GENERATOR java ${JAVA_OPTS} -jar ${GENERATOR_JAR}) set(GENERATOR java ${JAVA_OPTS} -jar ${GENERATOR_JAR})
set(INPUT_DIR ${DBT_CORE_TGC_DIR}/gen_input)
set(REPO_DIR ${DBT_CORE_TGC_DIR}/gen_input/CoreDSL-Instruction-Set-Description) set(REPO_DIR ${DBT_CORE_TGC_DIR}/gen_input/CoreDSL-Instruction-Set-Description)
set(TMPL_DIR ${DBT_CORE_TGC_DIR}/gen_input/templates/) set(TMPL_DIR ${DBT_CORE_TGC_DIR}/gen_input/templates/)
@ -90,7 +89,7 @@ if(ENABLE_CODEGEN AND EXISTS ${GENERATOR_JAR})
#) #)
if(NOT DEFINED ENV{CI}) if(NOT DEFINED ENV{CI})
add_custom_target(${CORE_NAME}_cpp add_custom_target(${CORE_NAME}_cpp
COMMAND ${GENERATOR} -b ${BE_UPPER} -c ${CORE_NAME} -r ${REPO_DIR} ${${CORE_NAME}_MAPPING} ${INPUT_FILE} COMMAND ${GENERATOR} -b ${BE_UPPER} -c ${CORE_NAME} ${${CORE_NAME}_MAPPING} ${INPUT_FILE}
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
COMMENT "Generating ISS sources" COMMENT "Generating ISS sources"
BYPRODUCTS ${${CORE_NAME}_OUTPUT_FILES} BYPRODUCTS ${${CORE_NAME}_OUTPUT_FILES}
@ -98,7 +97,7 @@ if(ENABLE_CODEGEN AND EXISTS ${GENERATOR_JAR})
) )
endif() endif()
execute_process( execute_process(
COMMAND ${GENERATOR} -b ${BE_UPPER} -c ${CORE_NAME} -r ${REPO_DIR} ${${CORE_NAME}_MAPPING} ${INPUT_FILE} COMMAND ${GENERATOR} -b ${BE_UPPER} -c ${CORE_NAME} ${${CORE_NAME}_MAPPING} ${INPUT_FILE}
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
RESULT_VARIABLE return_code) RESULT_VARIABLE return_code)
endmacro() endmacro()

2
coredsl

@ -1 +1 @@
Subproject commit 4510843fed824b9a71e9bc5c185a4d26064c2043 Subproject commit 35db59f6db28f20a5504b95cb39b6bca6f8a8991

2
tgfs

@ -1 +1 @@
Subproject commit d47375a70ea353ac164b0323f435ea3a017bee1f Subproject commit 965929d1eb29167f1e7f5a03791d9ffc8d8be423