Skip to content

Revert "Revert "build: simplify version tracking logic"" #29583

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 1, 2020
+17 −41
Merged

Revert "Revert "build: simplify version tracking logic"" #29583

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 17 additions & 41 deletions lib/Basic/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,59 +11,32 @@ else()
set(UUID_INCLUDE "${UUID_INCLUDE_DIRS}")
endif()

# Figure out if we can track VC revisions.
# FIXME: Copied from Clang.
function(find_first_existing_file out_var)
foreach(file ${ARGN})
if(EXISTS "${file}")
set(${out_var} "${file}" PARENT_SCOPE)
return()
endif()
endforeach()
endfunction()
function(generate_revision_inc revision_inc_var name dir)
find_first_existing_vc_file("${dir}" ${name}_vc)

macro(find_first_existing_vc_file out_var path)
find_first_existing_file(${out_var}
"${path}/.git/logs/HEAD" # Git
"${path}/.svn/wc.db" # SVN 1.7
"${path}/.svn/entries" # SVN 1.6
)
endmacro()
# Create custom target to generate the VC revision include.
set(version_inc "${CMAKE_CURRENT_BINARY_DIR}/${name}Revision.inc")

set(generate_vcs_version_script "${LLVM_MAIN_SRC_DIR}/cmake/modules/GenerateVersionFromVCS.cmake")
set(generate_vcs_version_script "${LLVM_MAIN_SRC_DIR}/cmake/modules/GenerateVersionFromVCS.cmake")

function(generate_revision_inc revision_inc_var name dir)
find_first_existing_vc_file(dep_file "${dir}")
# Create custom target to generate the VC revision include.
set(revision_inc "${CMAKE_CURRENT_BINARY_DIR}/${name}Revision.inc")
string(TOUPPER ${name} upper_name)
if(DEFINED dep_file)
add_custom_command(OUTPUT "${revision_inc}"
DEPENDS "${dep_file}" "${generate_vcs_version_script}"
COMMAND
${CMAKE_COMMAND} "-DNAMES=${upper_name}"
"-D${upper_name}_SOURCE_DIR=${dir}"
"-DHEADER_FILE=${revision_inc}"
-P "${generate_vcs_version_script}")
else()
# Generate an empty Revision.inc file if we are not using git or SVN.
file(WRITE "${revision_inc}" "")
endif()
add_custom_command(OUTPUT "${version_inc}"
DEPENDS "${${name}_vc}" "${generate_vcs_version_script}"
COMMAND ${CMAKE_COMMAND} "-DNAMES=$<UPPER_CASE:${name}>"
"-D$<UPPER_CASE:${name}>_SOURCE_DIR=${dir}"
"-DHEADER_FILE=${version_inc}"
-P "${generate_vcs_version_script}")

# Mark the generated header as being generated.
set_source_files_properties("${revision_inc}"
set_source_files_properties("${version_inc}"
PROPERTIES GENERATED TRUE
HEADER_FILE_ONLY TRUE)
set(${revision_inc_var} ${revision_inc} PARENT_SCOPE)
set(${revision_inc_var} ${version_inc} PARENT_SCOPE)
endfunction()

generate_revision_inc(llvm_revision_inc LLVM "${LLVM_MAIN_SRC_DIR}")
generate_revision_inc(clang_revision_inc Clang "${CLANG_MAIN_SRC_DIR}")
generate_revision_inc(swift_revision_inc Swift "${SWIFT_SOURCE_DIR}")

set(version_inc_files
${llvm_revision_inc} ${clang_revision_inc} ${swift_revision_inc})

add_swift_host_library(swiftBasic STATIC
AnyValue.cpp
Cache.cpp
Expand Down Expand Up @@ -95,7 +68,10 @@ add_swift_host_library(swiftBasic STATIC
Unicode.cpp
UUID.cpp
Version.cpp
${version_inc_files}

${llvm_revision_inc}
${clang_revision_inc}
${swift_revision_inc}

# Platform-specific TaskQueue implementations
Unix/TaskQueue.inc
Expand Down