Skip to content

[Platform] Simplify glibc.modulemap generation #2311

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 2 commits into from
Apr 26, 2016
Merged

[Platform] Simplify glibc.modulemap generation #2311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65bd53c
[CMakeLists] Factored out cmake function that does single gyb processing
rintaro Apr 26, 2016
458e689
[Platform] Simplify glibc.modulemap generation
rintaro Apr 25, 2016
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
98 changes: 73 additions & 25 deletions cmake/modules/SwiftHandleGybSources.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,74 @@
include(SwiftAddCustomCommandTarget)
include(SwiftSetIfArchBitness)

# Create a target to process single gyb source with the 'gyb' tool.
#
# handle_gyb_source_single(
# dependency_out_var_name
# SOURCE src_gyb
# OUTPUT output
# [FLAGS [flags ...]])
# [DEPENDS [depends ...]]
# [COMMENT comment])
#
# dependency_out_var_name
# The name of a variable, to be set in the parent scope to be the target
# target that invoke gyb.
#
# src_gyb
# .gyb suffixed source file
#
# output
# Output filename to be generated
#
# flags ...
# gyb flags in addition to ${SWIFT_GYB_FLAGS}.
#
# depends ...
# gyb flags in addition to 'src_gyb' and sources of gyb itself.
#
# comment
# Additional comment.
function(handle_gyb_source_single dependency_out_var_name)
set(options)
set(single_value_args SOURCE OUTPUT COMMENT)
set(multi_value_args FLAGS DEPENDS)
cmake_parse_arguments(
GYB_SINGLE # prefix
"${options}" "${single_value_args}" "${multi_value_args}" ${ARGN})

set(gyb_flags
"--test" # Run gyb's self-tests whenever we use it. They're cheap
# enough and it keeps us honest.
${SWIFT_GYB_FLAGS}
${GYB_SINGLE_FLAGS})

set(gyb_tool "${SWIFT_SOURCE_DIR}/utils/gyb")
set(gyb_tool_source "${gyb_tool}" "${gyb_tool}.py")

get_filename_component(dir "${GYB_SINGLE_OUTPUT}" DIRECTORY)
get_filename_component(basename "${GYB_SINGLE_OUTPUT}" NAME)
add_custom_command_target(
dependency_target
COMMAND
"${CMAKE_COMMAND}" -E make_directory "${dir}"
COMMAND
"${gyb_tool}" "${gyb_flags}"
-o "${GYB_SINGLE_OUTPUT}.tmp" "${GYB_SINGLE_SOURCE}"
COMMAND
"${CMAKE_COMMAND}" -E copy_if_different
"${GYB_SINGLE_OUTPUT}.tmp" "${GYB_SINGLE_OUTPUT}"
COMMAND
"${CMAKE_COMMAND}" -E remove "${GYB_SINGLE_OUTPUT}.tmp"
OUTPUT "${GYB_SINGLE_OUTPUT}"
DEPENDS "${gyb_tool_source}" "${GYB_SINGLE_DEPENDS}" "${GYB_SINGLE_SOURCE}"
COMMENT "Generating ${basename} from ${GYB_SINGLE_SOURCE} ${GYB_SINGLE_COMMENT}"
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
SOURCES "${GYB_SINGLE_SOURCE}"
IDEMPOTENT)
set("${dependency_out_var_name}" "${dependency_target}" PARENT_SCOPE)
endfunction()

# Create a target to process .gyb files with the 'gyb' tool.
#
# handle_gyb_sources(
Expand Down Expand Up @@ -32,16 +100,8 @@ function(handle_gyb_sources dependency_out_var_name sources_var_name arch)
set(extra_gyb_flags "-DCMAKE_SIZEOF_VOID_P=${ptr_size}")
endif()

set(gyb_flags
"--test" # Run gyb's self-tests whenever we use it. They're cheap
# enough and it keeps us honest.
${SWIFT_GYB_FLAGS}
${extra_gyb_flags})

set(dependency_targets)
set(de_gybbed_sources)
set(gyb_tool "${SWIFT_SOURCE_DIR}/utils/gyb")
set(gyb_tool_source "${gyb_tool}" "${gyb_tool}.py")
set(gyb_extra_sources
"${SWIFT_SOURCE_DIR}/utils/GYBUnicodeDataUtils.py"
"${SWIFT_SOURCE_DIR}/utils/SwiftIntTypes.py"
Expand All @@ -59,27 +119,15 @@ function(handle_gyb_sources dependency_out_var_name sources_var_name arch)
endif()
set(output_file_name "${dir}/${src_sans_gyb}")
list(APPEND de_gybbed_sources "${output_file_name}")
string(MD5 output_file_name_hash "${output_file_name}")
add_custom_command_target(
dependency_target
COMMAND
"${CMAKE_COMMAND}" -E make_directory "${dir}"
COMMAND
"${gyb_tool}" "${gyb_flags}" -o "${output_file_name}.tmp" "${src}"
COMMAND
"${CMAKE_COMMAND}" -E copy_if_different "${output_file_name}.tmp" "${output_file_name}"
COMMAND
"${CMAKE_COMMAND}" -E remove "${output_file_name}.tmp"
handle_gyb_source_single(dependency_target
SOURCE "${src}"
OUTPUT "${output_file_name}"
DEPENDS "${gyb_tool_source}" "${src}" "${gyb_extra_sources}"
COMMENT "Generating ${src_sans_gyb} from ${src} with ptr size = ${ptr_size}"
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
SOURCES "${src}"
IDEMPOTENT)
FLAGS ${extra_gyb_flags}
DEPENDS "${gyb_extra_sources}"
COMMENT "with ptr size = ${ptr_size}")
list(APPEND dependency_targets "${dependency_target}")
endif()
endforeach()
set("${dependency_out_var_name}" "${dependency_targets}" PARENT_SCOPE)
set("${sources_var_name}" "${de_gybbed_sources}" PARENT_SCOPE)
endfunction()

43 changes: 13 additions & 30 deletions stdlib/public/Platform/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,42 +55,25 @@ foreach(sdk ${SWIFT_SDKS})
endif()
endif()

set(glibc_modulemap_source "glibc.modulemap.gyb")
set(glibc_modulemap_out "${module_dir}/glibc.modulemap")

# Configure the module map based on the target. Each platform needs to
# reference different headers, based on what's available in their glibc.
set(glibc_modulemap_gyb_source "glibc.modulemap.in.gyb")
set(glibc_modulemap_gyb_configured
"${CMAKE_CURRENT_BINARY_DIR}/${arch_subdir}/glibc.modulemap.gyb")
configure_file(
${glibc_modulemap_gyb_source}
${glibc_modulemap_gyb_configured}
@ONLY)

set(gyb_tool "${SWIFT_SOURCE_DIR}/utils/gyb")
set(glibc_modulemap_configured
"${CMAKE_CURRENT_BINARY_DIR}/${arch_subdir}/glibc.modulemap")
add_custom_command_target(glibc_modulemap_target
# We can't use handle_gyb_sources() here because we need to ensure
# gyb is invoked before we copy glibc.modulemap into the module dir.
# FIXME: Instead of using a combination of configure_file() and gyb,
# we should use just gyb--it'd be simpler.
COMMAND
${gyb_tool} "-DCMAKE_SDK=${sdk}" -o ${glibc_modulemap_configured} ${glibc_modulemap_gyb_configured}
COMMAND
${CMAKE_COMMAND} -E make_directory ${module_dir}
COMMAND
${CMAKE_COMMAND} -E copy_if_different
${glibc_modulemap_configured}
"${module_dir}/glibc.modulemap"
OUTPUT "${module_dir}/glibc.modulemap"
DEPENDS ${glibc_modulemap_configured}
COMMENT "Copying Glibc module to ${module_dir}")
handle_gyb_source_single(glibc_modulemap_target
SOURCE "${glibc_modulemap_source}"
OUTPUT "${glibc_modulemap_out}"
FLAGS
"-DCMAKE_SDK=${sdk}"
"-DGLIBC_INCLUDE_PATH=${GLIBC_INCLUDE_PATH}"
"-DGLIBC_ARCH_INCLUDE_PATH=${GLIBC_ARCH_INCLUDE_PATH}")

swift_install_in_component(stdlib
FILES "${module_dir}/glibc.modulemap"
swift_install_in_component(sdk-overlay
FILES "${glibc_modulemap_out}"
DESTINATION "lib/swift/${arch_subdir}")

list(APPEND glibc_modulemap_target_list ${glibc_modulemap_target})
endforeach()
endif()
endforeach()
add_custom_target(glibc_modulemap ALL DEPENDS ${glibc_modulemap_target_list})
add_custom_target(glibc_modulemap DEPENDS ${glibc_modulemap_target_list})
Loading