Skip to content

Commit f7072ec

Browse files
authored
Make sure event generation is incremental (#48903)
1 parent ea2d78a commit f7072ec

File tree

3 files changed

+16
-6
lines changed

3 files changed

+16
-6
lines changed

eng/native/functions.cmake

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -468,9 +468,12 @@ function(generate_module_index Target ModuleIndexFile)
468468
set(scriptExt ".sh")
469469
endif()
470470

471+
set(index_timestamp ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${Target}_index.timestamp)
472+
471473
add_custom_command(
472-
OUTPUT ${ModuleIndexFile}
474+
OUTPUT ${index_timestamp}
473475
COMMAND ${CLR_ENG_NATIVE_DIR}/genmoduleindex${scriptExt} $<TARGET_FILE:${Target}> ${ModuleIndexFile}
476+
COMMAND ${CMAKE_COMMAND} -E touch ${index_timestamp}
474477
DEPENDS ${Target}
475478
COMMENT "Generating ${Target} module index file -> ${ModuleIndexFile}"
476479
)
@@ -482,7 +485,7 @@ function(generate_module_index Target ModuleIndexFile)
482485

483486
add_custom_target(
484487
${Target}_module_index_header
485-
DEPENDS ${ModuleIndexFile}
488+
DEPENDS ${index_timestamp}
486489
)
487490
endfunction(generate_module_index)
488491

src/coreclr/vm/eventing/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,17 @@ endif()
2424

2525
set(GENEVENTING_SCRIPT ${CLR_DIR}/scripts/genEventing.py)
2626

27-
add_custom_target(eventing_headers
28-
${PYTHON_EXECUTABLE} ${GENEVENTING_SCRIPT} --man ${EVENT_MANIFEST} --inc ${GENERATED_INCLUDE_DIR} --dummy ${GENERATED_INCLUDE_DIR}/etmdummy.h ${NONEXTERN_ARG} ${NOXPLATHEADER_ARG}
27+
add_custom_command(
28+
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/eventing_headers.timestamp
29+
COMMAND ${PYTHON_EXECUTABLE} ${GENEVENTING_SCRIPT} --man ${EVENT_MANIFEST} --inc ${GENERATED_INCLUDE_DIR} --dummy ${GENERATED_INCLUDE_DIR}/etmdummy.h ${NONEXTERN_ARG} ${NOXPLATHEADER_ARG}
30+
COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/eventing_headers.timestamp
2931
DEPENDS ${EVENT_MANIFEST} ${GENEVENTING_SCRIPT}
3032
VERBATIM
3133
)
3234

3335
set_source_files_properties(${EventingHeaders} PROPERTIES GENERATED TRUE)
3436

37+
add_custom_target(eventing_headers DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/eventing_headers.timestamp)
3538
add_dependencies(eventing_headers eventprovider)
3639

3740
add_subdirectory(eventpipe)

src/coreclr/vm/eventing/EtwProvider/CMakeLists.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ set (ETW_PROVIDER_OUTPUTS
1313

1414
set_source_files_properties(${ETW_PROVIDER_OUTPUTS} PROPERTIES GENERATED TRUE)
1515

16-
add_custom_target(eventprovider
17-
${PYTHON_EXECUTABLE} ${ETW_PROVIDER_SCRIPT} --man ${EVENT_MANIFEST} --exc ${EVENT_EXCLUSIONS} --intermediate ${GENERATED_INCLUDE_DIR}
16+
add_custom_command(
17+
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/eventprovider.timestamp
18+
COMMAND ${PYTHON_EXECUTABLE} ${ETW_PROVIDER_SCRIPT} --man ${EVENT_MANIFEST} --exc ${EVENT_EXCLUSIONS} --intermediate ${GENERATED_INCLUDE_DIR}
19+
COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/eventprovider.timestamp
1820
DEPENDS ${EVENT_MANIFEST} ${EVENT_EXCLUSIONS} ${ETW_PROVIDER_SCRIPT})
21+
22+
add_custom_target(eventprovider DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/eventprovider.timestamp)

0 commit comments

Comments
 (0)