Merge pull request #79320 from hamishknight/excode

[build-script] Remove Xcode generation support

Author: hamishknight

CMakeLists.txt

@@ -1023,11 +1023,6 @@ set(SWIFT_GYB_FLAGS
 set(SWIFT_MODULE_CACHE_PATH
     "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/module-cache")
 
-# Xcode: use libc++ and c++11 using proper build settings.
-if(XCODE)
-  swift_common_xcode_cxx_config()
-endif()
-
 # Check what linux distribution is being used.
 # This can be used to determine the default linker to use.
 if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.22")

cmake/modules/AddSwift.cmake

@@ -1,6 +1,5 @@
 include(macCatalystUtils)
 include(SwiftList)
-include(SwiftXcodeSupport)
 include(SwiftWindowsSupport)
 include(SwiftAndroidSupport)
 include(SwiftCXXUtils)
@@ -689,24 +688,6 @@ function(add_swift_host_library name)
     list(APPEND ASHL_LLVM_LINK_COMPONENTS "demangle")
   endif()
 
-  if(XCODE)
-    get_filename_component(base_dir ${CMAKE_CURRENT_SOURCE_DIR} NAME)
-  
-    file(GLOB_RECURSE ASHL_HEADERS
-      ${SWIFT_SOURCE_DIR}/include/swift/${base_dir}/*.h
-      ${SWIFT_SOURCE_DIR}/include/swift/${base_dir}/*.def
-      ${CMAKE_CURRENT_SOURCE_DIR}/*.h
-      ${CMAKE_CURRENT_SOURCE_DIR}/*.def)
-    file(GLOB_RECURSE ASHL_TDS
-      ${SWIFT_SOURCE_DIR}/include/swift${base_dir}/*.td)
-
-    set_source_files_properties(${ASHL_HEADERS} ${ASHL_TDS} PROPERTIES
-      HEADER_FILE_ONLY true)
-    source_group("TableGen descriptions" FILES ${ASHL_TDS})
-
-    set(ASHL_SOURCES ${ASHL_SOURCES} ${ASHL_HEADERS} ${ASHL_TDS})
-  endif()
-
   if(ASHL_SHARED)
     set(libkind SHARED)
   elseif(ASHL_STATIC)

cmake/modules/SwiftSharedCMakeConfig.cmake

@@ -1,5 +1,4 @@
 include(CMakeParseArguments)
-include(SwiftXcodeSupport)
 
 include(CheckCXXCompilerFlag)
 
@@ -39,13 +38,8 @@ macro(swift_common_standalone_build_config_llvm product)
   mark_as_advanced(LLVM_ENABLE_ASSERTIONS)
 
   precondition(LLVM_TOOLS_BINARY_DIR)
-  escape_path_for_xcode("${LLVM_BUILD_TYPE}" "${LLVM_TOOLS_BINARY_DIR}" LLVM_TOOLS_BINARY_DIR)
-
   precondition_translate_flag(LLVM_BUILD_LIBRARY_DIR LLVM_LIBRARY_DIR)
-  escape_path_for_xcode("${LLVM_BUILD_TYPE}" "${LLVM_LIBRARY_DIR}" LLVM_LIBRARY_DIR)
-
   precondition(LLVM_LIBRARY_DIRS)
-  escape_path_for_xcode("${LLVM_BUILD_TYPE}" "${LLVM_LIBRARY_DIRS}" LLVM_LIBRARY_DIRS)
 
   # This could be computed using ${CMAKE_CFG_INTDIR} if we want to link Swift
   # against a matching LLVM build configuration.  However, we usually want to be
@@ -54,10 +48,6 @@ macro(swift_common_standalone_build_config_llvm product)
   set(LLVM_BINARY_OUTPUT_INTDIR "${LLVM_TOOLS_BINARY_DIR}")
   set(LLVM_LIBRARY_OUTPUT_INTDIR "${LLVM_LIBRARY_DIR}")
 
-  if(XCODE)
-    fix_imported_targets_for_xcode("${LLVM_EXPORTED_TARGETS}")
-  endif()
-
   if(NOT CMAKE_CROSSCOMPILING)
     set(${product}_NATIVE_LLVM_TOOLS_PATH "${LLVM_TOOLS_BINARY_DIR}")
   endif()
@@ -175,7 +165,6 @@ macro(swift_common_standalone_build_config_llvm product)
     "Version number that will be placed into the libclang library , in the form XX.YY")
 
   foreach(INCLUDE_DIR ${LLVM_INCLUDE_DIRS})
-    escape_path_for_xcode("${LLVM_BUILD_TYPE}" "${INCLUDE_DIR}" INCLUDE_DIR)
     include_directories(${INCLUDE_DIR})
   endforeach ()
 
@@ -184,9 +173,6 @@ macro(swift_common_standalone_build_config_llvm product)
   link_directories("${LLVM_LIBRARY_DIR}")
 
   set(LIT_ARGS_DEFAULT "-sv")
-  if(XCODE)
-    set(LIT_ARGS_DEFAULT "${LIT_ARGS_DEFAULT} --no-progress-bar")
-  endif()
   set(LLVM_LIT_ARGS "${LIT_ARGS_DEFAULT}" CACHE STRING "Default options for lit")
 
   set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
@@ -209,10 +195,6 @@ macro(swift_common_standalone_build_config_clang product)
     set(${product}_NATIVE_CLANG_TOOLS_PATH "${LLVM_TOOLS_BINARY_DIR}")
   endif()
 
-  if(XCODE)
-    fix_imported_targets_for_xcode("${CLANG_EXPORTED_TARGETS}")
-  endif()
-
   include_directories(${CLANG_INCLUDE_DIRS})
 endmacro()
 

cmake/modules/SwiftXcodeSupport.cmake

@@ -926,25 +926,6 @@ function(add_swift_target_library_single target name)
     endif()
   endif()
 
-  if(XCODE)
-    string(REGEX MATCHALL "/[^/]+" split_path ${CMAKE_CURRENT_SOURCE_DIR})
-    list(GET split_path -1 dir)
-    file(GLOB_RECURSE SWIFTLIB_SINGLE_HEADERS
-      ${SWIFT_SOURCE_DIR}/include/swift${dir}/*.h
-      ${SWIFT_SOURCE_DIR}/include/swift${dir}/*.def
-      ${CMAKE_CURRENT_SOURCE_DIR}/*.def)
-
-    file(GLOB_RECURSE SWIFTLIB_SINGLE_TDS
-      ${SWIFT_SOURCE_DIR}/include/swift${dir}/*.td)
-
-    set_source_files_properties(${SWIFTLIB_SINGLE_HEADERS} ${SWIFTLIB_SINGLE_TDS}
-      PROPERTIES
-      HEADER_FILE_ONLY true)
-    source_group("TableGen descriptions" FILES ${SWIFTLIB_SINGLE_TDS})
-
-    set(SWIFTLIB_SINGLE_SOURCES ${SWIFTLIB_SINGLE_SOURCES} ${SWIFTLIB_SINGLE_HEADERS} ${SWIFTLIB_SINGLE_TDS})
-  endif()
-
   # FIXME: swiftDarwin currently trips an assertion in SymbolGraphGen
   if (SWIFTLIB_IS_STDLIB AND SWIFT_STDLIB_BUILD_SYMBOL_GRAPHS AND NOT ${name} STREQUAL "swiftDarwin")
     list(APPEND SWIFTLIB_SINGLE_SWIFT_COMPILE_FLAGS "-Xfrontend;-emit-symbol-graph")
@@ -1122,14 +1103,6 @@ function(add_swift_target_library_single target name)
         $<TARGET_OBJECTS:${object_library}${VARIANT_SUFFIX}>)
   endforeach()
 
-  set(SWIFTLIB_SINGLE_XCODE_WORKAROUND_SOURCES)
-  if(XCODE)
-    set(SWIFTLIB_SINGLE_XCODE_WORKAROUND_SOURCES
-        # Note: the dummy.cpp source file provides no definitions. However,
-        # it forces Xcode to properly link the static library.
-        ${SWIFT_SOURCE_DIR}/cmake/dummy.cpp)
-  endif()
-
   set(INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS ${SWIFTLIB_INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS})
   if(libkind STREQUAL "SHARED")
     list(APPEND INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS
@@ -1148,8 +1121,7 @@ function(add_swift_target_library_single target name)
   add_library("${target}" ${libkind}
               ${SWIFTLIB_SINGLE_SOURCES}
               ${SWIFTLIB_SINGLE_EXTERNAL_SOURCES}
-              ${INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS}
-              ${SWIFTLIB_SINGLE_XCODE_WORKAROUND_SOURCES})
+              ${INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS})
   if (NOT SWIFTLIB_SINGLE_OBJECT_LIBRARY AND TARGET "${install_in_component}")
     add_dependencies("${install_in_component}" "${target}")
   endif()
@@ -1249,10 +1221,9 @@ function(add_swift_target_library_single target name)
 
   foreach(config ${CMAKE_CONFIGURATION_TYPES})
     string(TOUPPER ${config} config_upper)
-    escape_path_for_xcode("${config}" "${swiftlib_prefix}" config_lib_dir)
     set_target_properties(${target} PROPERTIES
-      LIBRARY_OUTPUT_DIRECTORY_${config_upper} ${config_lib_dir}/${output_sub_dir}
-      ARCHIVE_OUTPUT_DIRECTORY_${config_upper} ${config_lib_dir}/${output_sub_dir})
+      LIBRARY_OUTPUT_DIRECTORY_${config_upper} ${swiftlib_prefix}/${output_sub_dir}
+      ARCHIVE_OUTPUT_DIRECTORY_${config_upper} ${swiftlib_prefix}/${output_sub_dir})
   endforeach()
 
   if(SWIFTLIB_SINGLE_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)
@@ -1331,8 +1302,7 @@ function(add_swift_target_library_single target name)
       # library.
       add_library(${target_static} STATIC
         ${SWIFTLIB_SINGLE_SOURCES}
-        ${SWIFTLIB_INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS}
-        ${SWIFTLIB_SINGLE_XCODE_WORKAROUND_SOURCES})
+        ${SWIFTLIB_INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS})
 
       set_output_directory(${target_static}
         BINARY_DIR ${out_bin_dir}
@@ -1346,11 +1316,9 @@ function(add_swift_target_library_single target name)
 
       foreach(config ${CMAKE_CONFIGURATION_TYPES})
         string(TOUPPER ${config} config_upper)
-        escape_path_for_xcode(
-          "${config}" "${swift_lib_dir}" config_lib_dir)
         set_target_properties(${target_static} PROPERTIES
-          LIBRARY_OUTPUT_DIRECTORY_${config_upper} ${config_lib_dir}/${output_sub_dir}
-          ARCHIVE_OUTPUT_DIRECTORY_${config_upper} ${config_lib_dir}/${output_sub_dir})
+          LIBRARY_OUTPUT_DIRECTORY_${config_upper} ${swift_lib_dir}/${output_sub_dir}
+          ARCHIVE_OUTPUT_DIRECTORY_${config_upper} ${swift_lib_dir}/${output_sub_dir})
       endforeach()
 
       set_target_properties(${target_static} PROPERTIES

stdlib/cmake/modules/AddSwiftStdlib.cmake

@@ -986,37 +986,6 @@ function(_compile_swift_files
     # over '-I' in this case.
   endif()
 
-  if(XCODE)
-    # HACK: work around an issue with CMake Xcode generator and the Swift
-    # driver.
-    #
-    # The Swift driver does not update the mtime of the output files if the
-    # existing output files on disk are identical to the ones that are about
-    # to be written.  This behavior confuses the makefiles used in CMake Xcode
-    # projects: the makefiles will not consider everything up to date after
-    # invoking the compiler.  As a result, the standard library gets rebuilt
-    # multiple times during a single build.
-    #
-    # To work around this issue we touch the output files so that their mtime
-    # always gets updated.
-    set(command_touch_standard_outputs
-      COMMAND "${CMAKE_COMMAND}" -E touch ${standard_outputs})
-    set(command_touch_module_outputs
-      COMMAND "${CMAKE_COMMAND}" -E touch ${module_outputs})
-    set(command_touch_sib_outputs
-      COMMAND "${CMAKE_COMMAND}" -E touch ${sib_outputs})
-    set(command_touch_sibopt_outputs
-      COMMAND "${CMAKE_COMMAND}" -E touch ${sibopt_outputs})
-    set(command_touch_sibgen_outputs
-      COMMAND "${CMAKE_COMMAND}" -E touch ${sibgen_outputs})
-
-    # macCatalyst zippered outputs
-    if(maccatalyst_build_flavor STREQUAL "zippered")
-      set(command_touch_maccatalyst_module_outputs
-        COMMAND "${CMAKE_COMMAND}" -E touch ${maccatalyst_module_outputs})
-    endif()
-  endif()
-
   list(REMOVE_DUPLICATES dirs_to_create)
 
   # Then we can compile both the object files and the swiftmodule files

stdlib/cmake/modules/SwiftSource.cmake

@@ -121,13 +121,6 @@ if "@SWIFT_ENABLE_REFLECTION@" == "TRUE":
 if "@SWIFT_ENABLE_RUNTIME_FUNCTION_COUNTERS@" == "TRUE":
     config.available_features.add('runtime_function_counters')
 
-if "@CMAKE_GENERATOR@" == "Xcode":
-    xcode_bin_dir = os.path.join(config.llvm_obj_root, "@LLVM_BUILD_TYPE@",
-                                 'bin')
-    lit_config.note('Adding to path: ' + xcode_bin_dir)
-    config.environment['PATH'] = \
-      os.path.pathsep.join((xcode_bin_dir, config.environment['PATH']))
-
 config.available_features.add("CMAKE_GENERATOR=@CMAKE_GENERATOR@")
 
 if "@SWIFT_ENABLE_MACCATALYST@" == "TRUE":

test/lit.site.cfg.in

@@ -212,7 +212,7 @@ macro(add_sourcekit_library name)
   set(srcs ${SOURCEKITLIB_UNPARSED_ARGUMENTS})
 
   llvm_process_sources(srcs ${srcs})
-  if(MSVC_IDE OR XCODE)
+  if(MSVC_IDE)
     # Add public headers
     file(RELATIVE_PATH lib_path
       ${SOURCEKIT_SOURCE_DIR}/lib/
@@ -406,9 +406,9 @@ macro(add_sourcekit_framework name)
     endif()
   endforeach()
 
-  if(MSVC_IDE OR XCODE)
+  if(MSVC_IDE)
     set_source_files_properties(${headers} PROPERTIES HEADER_FILE_ONLY ON)
-  endif(MSVC_IDE OR XCODE)
+  endif(MSVC_IDE)
 
   if(LLVM_COMMON_DEPENDS)
     add_dependencies(${name} ${LLVM_COMMON_DEPENDS})