[build-script] Remove -X option for "edit-only" Xcode projects.

This has caused plenty of confusion and should no longer be necessary anyway.

Author: jrose-apple

CMakeLists.txt

@@ -211,10 +211,6 @@ if(SWIFT_SERIALIZE_STDLIB_UNITTEST AND SWIFT_STDLIB_ENABLE_RESILIENCE)
   set(SWIFT_SERIALIZE_STDLIB_UNITTEST FALSE)
 endif()
 
-option(SWIFT_XCODE_GENERATE_FOR_IDE_ONLY
-    "Generate an Xcode project suitable for IDE use, but which cannot build"
-    FALSE)
-
 #
 # End of user-configurable options.
 #

README.md

@@ -139,28 +139,20 @@ To find out more:
 Note: Arguments after "--" above are forwarded to `build-script-impl`, which is
 the ultimate shell script that invokes the actual build and test commands.
 
-A basic command to build Swift and run basic tests with Ninja:
+A basic command to build Swift with optimizations and run basic tests with
+Ninja:
 
-    utils/build-script -t
+    utils/build-script -r -t
 
 ## Developing Swift in Xcode
 
-The Xcode IDE can be used to edit the Swift source code, but it is not currently
-fully supported as a build environment for SDKs other than OS X. If you'd like
-to build for other SDKs but still use Xcode, once you've built Swift using Ninja
-or one of the other supported CMake generators, you can set up an IDE-only Xcode
-environment using the build-script's `-X` flag:
-
-    utils/build-script -X --skip-build -- --reconfigure
+`build-script` can also generate Xcode projects:
 
-The `--skip-build` flag tells `build-script` to only generate the project,
-not build it in its entirety. A bare minimum of LLVM tools will build in order
-to configure the Xcode projects.
+    utils/build-script -x
 
-The `--reconfigure` flag tells `build-script-impl` to run the CMake configuration
-step even if there is a cached configuration. As you develop in Xcode, you may
-need to rerun this from time to time to refresh your generated Xcode project,
-picking up new targets, file removals, or file additions.
+The Xcode IDE can be used to edit the Swift source code, but it is not currently
+fully supported as a build environment for SDKs other than OS X. If you need to
+work with other SDKs, you'll need to create a second build using Ninja.
 
 ## Testing Swift
 

cmake/modules/SwiftAddCustomCommandTarget.cmake

@@ -147,38 +147,16 @@ function(add_custom_command_target dependency_out_var_name)
       IMPLICIT_DEPENDS WORKING_DIRECTORY COMMENT VERBATIM APPEND)
     add_custom_command(${ACCT_COMMANDS} ${args})
 
-    # Skip generating the target if we are generating an Xcode project only
-    # for IDE use. The volume of dependencies here causes performance problems
-    # in Xcode that make it impractical to use.
-    if(NOT (SWIFT_XCODE_GENERATE_FOR_IDE_ONLY
-            AND "${ACCT_CUSTOM_TARGET_NAME}" STREQUAL ""))
-      _make_acct_argument_list(ALL WORKING_DIRECTORY SOURCES)
-      add_custom_target(
-          "${target_name}" ${args}
-          DEPENDS ${ACCT_OUTPUT}
-          COMMENT "${ACCT_OUTPUT}")
-      set_target_properties(
-          "${target_name}" PROPERTIES
-          FOLDER "add_custom_command_target artifacts")
-    endif()
+    _make_acct_argument_list(ALL WORKING_DIRECTORY SOURCES)
+    add_custom_target(
+        "${target_name}" ${args}
+        DEPENDS ${ACCT_OUTPUT}
+        COMMENT "${ACCT_OUTPUT}")
+    set_target_properties(
+        "${target_name}" PROPERTIES
+        FOLDER "add_custom_command_target artifacts")
   endif()
 
   # "Return" the name of the custom target
-  if(SWIFT_XCODE_GENERATE_FOR_IDE_ONLY
-     AND "${ACCT_CUSTOM_TARGET_NAME}" STREQUAL "")
-    set("${dependency_out_var_name}" xcode_generate_for_ide_only_dummy
-        PARENT_SCOPE)
-  else()
-    set("${dependency_out_var_name}" "${target_name}" PARENT_SCOPE)
-  endif()
+  set("${dependency_out_var_name}" "${target_name}" PARENT_SCOPE)
 endfunction()
-
-# A dummy target for XCODE_GENERATE_FOR_IDE_ONLY targets that stands in for
-# the targets we don't generate in that mode.
-if(SWIFT_XCODE_GENERATE_FOR_IDE_ONLY)
-  add_custom_command(OUTPUT xcode_generate_for_ide_only_dummy.txt
-      COMMAND echo "This Xcode project is configured for IDE use only and cannot build Swift."
-      COMMAND false)
-  add_custom_target(xcode_generate_for_ide_only_dummy ALL
-      DEPENDS xcode_generate_for_ide_only_dummy.txt)
-endif()

utils/build-script

@@ -240,12 +240,6 @@ To create Xcode projects that can build Swift, use '-x':
 
   [~/src/s]$ ./swift/utils/build-script -x -R
 
-The Xcode IDE may have performance issues with this configuration. To create
-slimmer Xcode projects that can edit Swift compiler source, but cannot build,
-use '-X' instead:
-
-  [~/src/s]$ ./swift/utils/build-script -X -R
-
 Preset mode in build-script
 ---------------------------
 
@@ -509,12 +503,6 @@ build the Debug variant of the Swift standard library and SDK overlay""",
         action="store_const",
         const="Xcode",
         dest="cmake_generator")
-    cmake_generator_group.add_argument(
-        "-X", "--xcode-ide-only",
-        help="use CMake's Xcode generator, with only IDE support (no build)",
-        action="store_const",
-        const="XcodeIDEOnly",
-        dest="cmake_generator")
     cmake_generator_group.add_argument(
         "-m", "--make",
         help="use CMake's Makefile generator (default is Ninja)",
@@ -836,12 +824,6 @@ the number of parallel build jobs to use""",
             "--export-compile-commands"
         ]
 
-    if args.cmake_generator == "XcodeIDEOnly":
-        args.cmake_generator = "Xcode"
-        build_script_impl_inferred_args += [
-            "--xcode-ide-only"
-        ]
-
     if not args.test:
         build_script_impl_inferred_args += [
             "--skip-test-cmark",

utils/build-script-impl

@@ -148,7 +148,6 @@ KNOWN_SETTINGS=(
     skip-test-benchmarks        ""               "set to skip running Swift Benchmark Suite"
     skip-test-optimized         ""               "set to skip testing the test suite in optimized mode"
     stress-test-sourcekit       ""               "set to run the stress-SourceKit target"
-    xcode-ide-only              ""               "set to configure Xcode project for IDE use only, not building"
     workspace                   "${HOME}/src"    "source directory containing llvm, clang, swift"
     enable-llvm-assertions      "1"              "set to enable llvm assertions"
     build-llvm                  "1"              "set to 1 to build LLVM and Clang"
@@ -1210,12 +1209,6 @@ case "${CMAKE_GENERATOR}" in
             "${COMMON_CMAKE_OPTIONS[@]}"
             -DCMAKE_CONFIGURATION_TYPES="Debug;Release;MinSizeRel;RelWithDebInfo"
         )
-        if [[ "${XCODE_IDE_ONLY}" ]]; then
-          COMMON_CMAKE_OPTIONS=(
-              "${COMMON_CMAKE_OPTIONS[@]}"
-              -DSWIFT_XCODE_GENERATE_FOR_IDE_ONLY=ON
-          )
-        fi
         ;;
 esac