Update CMake build and bootstrap script for PackageModelSyntax module

Author: DougGregor

Sources/Commands/CMakeLists.txt

@@ -56,6 +56,7 @@ target_link_libraries(Commands PUBLIC
   CoreCommands
   LLBuildManifest
   PackageGraph
+  PackageModelSyntax
   SourceControl
   TSCBasic
   TSCUtility

Sources/PackageModelSyntax/CMakeLists.txt

@@ -0,0 +1,32 @@
+# This source file is part of the Swift open source project
+#
+# Copyright (c) 2014 - 2024 Apple Inc. and the Swift project authors
+# Licensed under Apache License v2.0 with Runtime Library Exception
+#
+# See http://swift.org/LICENSE.txt for license information
+# See http://swift.org/CONTRIBUTORS.txt for Swift project authors
+
+add_library(PackageModelSyntax
+  AddPackageDependency.swift
+  ManifestEditError.swift
+  ManifestSyntaxRepresentable.swift
+  PackageDependency+Syntax.swift
+  SyntaxEditUtils.swift)
+target_link_libraries(PackageModelSyntax PUBLIC
+  Basics
+  PackageLoading
+  PackageModel
+
+  SwiftDiagnostics
+  SwiftParser
+  SwiftSyntax
+  SwiftSyntaxBuilder)
+# NOTE(compnerd) workaround for CMake not setting up include flags yet
+set_target_properties(PackageModelSyntax PROPERTIES
+  INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})
+
+install(TARGETS PackageModelSyntax
+  ARCHIVE DESTINATION lib
+  LIBRARY DESTINATION lib
+  RUNTIME DESTINATION bin)
+set_property(GLOBAL APPEND PROPERTY SwiftPM_EXPORTS PackageModelSyntax)

Utilities/bootstrap

@@ -198,6 +198,7 @@ def parse_global_args(args):
     args.source_dirs["swift-argument-parser"] = os.path.join(args.project_root, "..", "swift-argument-parser")
     args.source_dirs["swift-crypto"]          = os.path.join(args.project_root, "..", "swift-crypto")
     args.source_dirs["swift-driver"]          = os.path.join(args.project_root, "..", "swift-driver")
+    args.source_dirs["swift-syntax"]          = os.path.join(args.project_root, "..", "swift-syntax")
     args.source_dirs["swift-system"]          = os.path.join(args.project_root, "..", "swift-system")
     args.source_dirs["swift-collections"]     = os.path.join(args.project_root, "..", "swift-collections")
     args.source_dirs["swift-certificates"]    = os.path.join(args.project_root, "..", "swift-certificates")
@@ -625,6 +626,7 @@ def build_swiftpm_with_cmake(args):
         add_rpath_for_cmake_build(args, os.path.join(args.build_dirs["swift-argument-parser"], "lib"))
         add_rpath_for_cmake_build(args, os.path.join(args.build_dirs["swift-crypto"],          "lib"))
         add_rpath_for_cmake_build(args, os.path.join(args.build_dirs["swift-driver"],          "lib"))
+        add_rpath_for_cmake_build(args, os.path.join(args.build_dirs["swift-syntax"],          "lib"))
         add_rpath_for_cmake_build(args, os.path.join(args.build_dirs["swift-system"],          "lib"))
         add_rpath_for_cmake_build(args, os.path.join(args.build_dirs["swift-collections"],     "lib"))
         add_rpath_for_cmake_build(args, os.path.join(args.build_dirs["swift-asn1"],            "lib"))