D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-01-23 08:13:13 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not generate .di files for druntime modules.

Browse Source 
DI generation now actually strips function bodies.

Also, finally all the platform-specific modules are installed,
irrespective of the current OS.

GitHub: Fixes #296.
This commit is contained in:
David Nadlinger
2013-03-17 19:12:19 +01:00
parent 722c4b83ea
commit f6e1d32deb
3 changed files with 22 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ldc2.conf.in
View File

@@ -8,8 +8,7 @@ default:
// arguments before they are parsed.
switches = [
"-I@PROJECT_BINARY_DIR@/../import",
"-I@RUNTIME_DIR@/import",
"-I@RUNTIME_DIR@/src",
"-I@RUNTIME_DIR@/src", // Needed for gc.*/rt.* unit tests.
"-L-L@PROJECT_BINARY_DIR@/../lib@LIB_SUFFIX@", @MULTILIB_ADDITIONAL_PATH@
"-defaultlib=@RUNTIME_AIO@",
"-debuglib=@RUNTIME_AIO@-debug"

3
ldc2_phobos.conf.in
View File

@@ -8,8 +8,7 @@ default:
// arguments before they are parsed.
switches = [
"-I@CMAKE_BINARY_DIR@/import",
"-I@RUNTIME_DIR@/import",
"-I@RUNTIME_DIR@/src",
"-I@RUNTIME_DIR@/src", // Needed for gc.*/rt.* unit tests.
"-I@PHOBOS2_DIR@/",
"-L-L@PROJECT_BINARY_DIR@/../lib@LIB_SUFFIX@", @MULTILIB_ADDITIONAL_PATH@
"-defaultlib=phobos-ldc",

56
runtime/CMakeLists.txt
View File

@@ -110,7 +110,6 @@ elseif(WIN32)
list(REMOVE_ITEM DCRT_C ${RUNTIME_DC_DIR}/monitor.c)
endif()
list(APPEND CORE_D ${CORE_D_SYNC} ${CORE_D_SYS} ${CORE_D_STDC})
set(CORE_D_HEADERS ${CORE_D} ${CORE_D_UNIX} ${CORE_D_OSX} ${CORE_D_WIN})
list(APPEND CORE_D ${LDC_D} ${RUNTIME_DIR}/src/object_.d)
file(GLOB CORE_C ${RUNTIME_DIR}/src/core/stdc/*.c)
@@ -238,32 +237,6 @@ macro(dc input_d d_flags output_dir output_suffix outlist_o outlist_bc)
)
endmacro()
# Builds a .di "header" file for a given D module. The path of the output
# file is appended to outlist_header.
macro(dc_header input_d d_flags outlist_header)
file(RELATIVE_PATH output ${RUNTIME_DIR} ${input_d})
string(REGEX REPLACE "src/ldc" "src/core" output ${output})
string(REGEX REPLACE "^src/" "" di_output ${output})
# If a hand-written .di file exists along the source in src/, just copy
# it instead of running it through the compiler.
if(NOT EXISTS "${input_d}i")
set(out ${CMAKE_BINARY_DIR}/import/${di_output}i)
list(APPEND ${outlist_header} ${out})
add_custom_command(
OUTPUT ${out}
COMMAND ${LDC_LOC} ${DC_FLAGS} -c -I${RUNTIME_INCLUDE} -I${RUNTIME_GC_DIR} ${input_d} -Hf=${out} -o- ${d_flags}
WORKING_DIRECTORY ${PROJECT_PARENT_DIR}
DEPENDS ${LDC_LOC}
${input_d}
${LDC_IMPORTS}
${PROJECT_BINARY_DIR}/../bin/${LDC_EXE}.conf
)
endif()
endmacro()
# Builds a copy of druntime/Phobos from the source files gathered above. The
# names of the added library targets are appended to outlist_targets.
macro(build_runtime d_flags c_flags ld_flags lib_suffix path_suffix outlist_targets)
@@ -533,27 +506,38 @@ else()
build_runtime_variants("" "${RT_CLAGS}" "${LD_FLAGS}" "${LIB_SUFFIX}" LIBS_TO_INSTALL)
endif()
# Generate .di files.
set(runtime_headers)
foreach(f ${CORE_D_HEADERS})
dc_header(${f} "${D_FLAGS}" runtime_headers)
# Copy over druntime modules, preferring hand-written .di files.
set(DRUNTIME_IMPORT_DIR ${CMAKE_BINARY_DIR}/import)
set(DRUNTIME_PACKAGES core etc ldc)
set(druntime_modules)
foreach(p ${DRUNTIME_PACKAGES})
file(GLOB_RECURSE m ${RUNTIME_DIR}/src/${p}/*.d ${RUNTIME_DIR}/src/${p}/*.di)
list(APPEND druntime_modules ${m})
endforeach()
list(APPEND druntime_modules ${RUNTIME_DIR}/src/object.di)
foreach(f ${druntime_modules})
if (NOT EXISTS "${f}i")
file(RELATIVE_PATH relpath ${RUNTIME_DIR}/src ${f})
configure_file(${f} ${DRUNTIME_IMPORT_DIR}/${relpath} COPYONLY)
endif()
endforeach()
add_custom_target(generate-headers ALL DEPENDS ${runtime_headers})
#
# Install target.
#
install(DIRECTORY ${CMAKE_BINARY_DIR}/import/core DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.di")
install(FILES ${DRUNTIME_IMPORT_DIR}/object.di DESTINATION ${INCLUDE_INSTALL_DIR}/ldc)
foreach(p ${DRUNTIME_PACKAGES})
install(DIRECTORY ${DRUNTIME_IMPORT_DIR}/${p} DESTINATION ${INCLUDE_INSTALL_DIR})
endforeach()
if(PHOBOS2_DIR)
install(DIRECTORY ${PHOBOS2_DIR}/std DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.d")
install(DIRECTORY ${PHOBOS2_DIR}/etc DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.d")
install(FILES ${PHOBOS2_DIR}/crc32.d DESTINATION ${INCLUDE_INSTALL_DIR})
endif()
install(FILES ${RUNTIME_DIR}/src/object.di DESTINATION ${INCLUDE_INSTALL_DIR}/ldc)
install(DIRECTORY ${RUNTIME_DIR}/src/ldc DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.di")
install(DIRECTORY ${RUNTIME_DIR}/src/core DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.di")
install(FILES ${GCCBUILTINS} DESTINATION ${INCLUDE_INSTALL_DIR}/ldc)
foreach(libname ${LIBS_TO_INSTALL})