Check in Generated API.

elegantchaos · Nov 29, 2024 · 30a7121 · 30a7121
1 parent 7489ad5
commit 30a7121
Show file tree

Hide file tree

Showing 960 changed files with 501,229 additions and 1,037 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,8 @@
 # Godot 4+ specific ignores
 .godot/
 .DS_Store
-/.build
-/.index-build
+.build/
+.index-build/
 /Packages
 /*.xcodeproj
 xcuserdata/
@@ -17,6 +17,5 @@ build-docs.log
 \#*
 /libgodot.xcframework/
 Package.resolved
-/.vscode
+.vscode
 .swiftpm/xcode/xcshareddata/xcschemes
-GeneratedForDebug/
diff --git a/Generator/Generator/main.swift b/Generator/Generator/main.swift
@@ -27,13 +27,13 @@ var defaultExtensionApiJsonUrl: URL {
 
 var defaultGeneratorOutputlUrl: URL {
     rootUrl
-        .appendingPathComponent("GeneratedForDebug")
-        .appendingPathComponent("Sources")
+        .appending(path: "Sources")
+        .appending(path: "SwiftGodot")
+        .appending(path: "Generated")
 }
 
 var defaultDocRootUrl: URL {
     rootUrl
-        .appendingPathComponent("GeneratedForDebug")
         .appendingPathComponent("Docs")
 }
 
@@ -138,8 +138,8 @@ for mo in jsonApi.builtinClassMemberOffsets {
     }
 }
 
-let generatedBuiltinDir: String? = singleFile ? nil : (outputDir + "/generated-builtin/")
-let generatedDir: String? = singleFile ? nil : (outputDir + "/generated/")
+let generatedBuiltinDir: String? = singleFile ? nil : (outputDir + "/Builtin/")
+let generatedDir: String? = singleFile ? nil : (outputDir + "/Api/")
 
 if singleFile {
     try! FileManager.default.createDirectory(atPath: outputDir, withIntermediateDirectories: true)

diff --git a/Package.swift b/Package.swift
@@ -34,7 +34,6 @@ var products: [Product] = [
             "ExtensionApi",
             "ExtensionApiJson"
         ]),
-    .plugin(name: "CodeGeneratorPlugin", targets: ["CodeGeneratorPlugin"]),
     .plugin(name: "EntryPointGeneratorPlugin", targets: ["EntryPointGeneratorPlugin"])
 ]
 
@@ -93,14 +92,6 @@ var targets: [Target] = [
         ]
     ),
 
-    // This is a build-time plugin that invokes the generator and produces
-    // the bindings that are compiled into SwiftGodot
-        .plugin(
-            name: "CodeGeneratorPlugin",
-            capability: .buildTool(),
-            dependencies: ["Generator"]
-        ),
-
         .plugin(
             name: "EntryPointGeneratorPlugin",
             capability: .buildTool(),
@@ -112,8 +103,6 @@ var targets: [Target] = [
         name: "GDExtension"),
 ]
 
-var swiftGodotPlugins: [Target.PluginUsage] = ["CodeGeneratorPlugin"]
-
 // Macros aren't supported on Windows before 5.9.1
 #if !(os(Windows) && swift(<5.9.1))
 targets.append(contentsOf: [
@@ -133,7 +122,6 @@ targets.append(contentsOf: [
         exclude: ["SwiftSprite.gdextension", "README.md"]),
         //linkerSettings: linkerSettings),
 ])
-swiftGodotPlugins.append("SwiftGodotMacroLibrary")
 #endif
 
 // Macro tests don't work on Windows yet
@@ -214,7 +202,7 @@ targets.append(contentsOf: [
         swiftSettings: [
             .define("CUSTOM_BUILTIN_IMPLEMENTATIONS")
         ],
-        plugins: swiftGodotPlugins
+        plugins: ["SwiftGodotMacroLibrary"]
     ),
 
     // General purpose cross-platform tests