go back to prebuilding on windows

migueldeicaza · Dec 19, 2024 · b24d11b · b24d11b
1 parent e9113d5
commit b24d11b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml
@@ -49,7 +49,9 @@ jobs:
         run: swift build --build-tests --quiet
       - name: Build Again
         if: always()
-        run: swift build --build-tests --verbose
+        run: |
+          dir .build\plugins\outputs\swiftgodot\SwiftGodot\destination\CodeGeneratorPlugin\GeneratedSources
+          swift build --build-tests --verbose
       - name: Run tests (XCTest)
         run: swift test --skip-build --no-parallel --disable-swift-testing
       - name: Run tests (Swift testing)

diff --git a/Plugins/CodeGeneratorPlugin/plugin.swift b/Plugins/CodeGeneratorPlugin/plugin.swift
@@ -34,19 +34,26 @@ import PackagePlugin
       }
       arguments.append(context.package.directoryURL.appending(path: "doc").path)
       arguments.append("--singlefile")
+      commands.append(
+        Command.prebuildCommand(
+          displayName: "Generating Swift API from \(api) to \(genSourcesDir)",
+          executable: generator,
+          arguments: arguments,
+          outputFilesDirectory: genSourcesDir
+        )
+      )
     #else
       outputFiles.append(contentsOf: knownBuiltin.map { genSourcesDir.appending(["generated-builtin", $0]) })
       outputFiles.append(contentsOf: known.map { genSourcesDir.appending(["generated", $0]) })
+      commands.append(
+        Command.buildCommand(
+          displayName: "Generating Swift API from \(api) to \(genSourcesDir)",
+          executable: generator,
+          arguments: arguments,
+          inputFiles: [api],
+          outputFiles: outputFiles))
     #endif
 
-    commands.append(
-      Command.buildCommand(
-        displayName: "Generating Swift API from \(api) to \(genSourcesDir)",
-        executable: generator,
-        arguments: arguments,
-        inputFiles: [api],
-        outputFiles: outputFiles))
-
     return commands
   }
 }