From f305df0effd5823bf9ba0399c8c611cbbab6f9c3 Mon Sep 17 00:00:00 2001 From: Brendan Szymanski Date: Tue, 21 Jul 2026 18:51:15 -0400 Subject: [PATCH] Rename swift-gtk-gen to gobject-generator with generator binary --- Package.swift | 28 +++++++++---------- README.md | 7 ++--- .../CommandPlugin.swift | 18 ++++++------ .../Analysis.swift | 0 .../BindingPlan.swift | 0 .../CodeGen+Scaffolding.swift | 0 .../CodeGen.swift | 2 +- .../Config.swift | 0 .../IRModel.swift | 0 .../MultiPackageAnalysis.swift | 0 .../PlanRenderer.swift | 4 +-- .../Planner.swift | 0 .../TOMLReader.swift | 0 .../TypeMapper.swift | 0 .../TypeRegistry.swift | 0 .../XMLParser.swift | 0 .../{swift-gtk-gen => generator}/Main.swift | 8 +++--- .../CLITests.swift | 9 +++--- .../AnalysisTests.swift | 2 +- .../CallbackGenerationTests.swift | 2 +- .../ConfigFileTests.swift | 2 +- .../ConfigTests.swift | 2 +- .../FunctionGenerationTests.swift | 2 +- .../IRModelTests.swift | 2 +- .../InheritedMemberTests.swift | 2 +- .../InterfaceConformanceTests.swift | 2 +- .../InterfaceGenerationTests.swift | 2 +- .../InterfaceSignalGenerationTests.swift | 2 +- .../MonorepoConfigTests.swift | 2 +- .../MultiPackageAnalysisTests.swift | 2 +- .../NamingTests.swift | 2 +- .../ParserSemanticsTests.swift | 2 +- .../ParserTests.swift | 2 +- .../PropertyGenerationTests.swift | 2 +- .../RecordGenerationTests.swift | 2 +- .../RendererCallableTests.swift | 2 +- .../ScaffoldingTests.swift | 2 +- .../SignalGenerationTests.swift | 2 +- .../TOMLReaderTests.swift | 2 +- .../TypeMapperTests.swift | 2 +- .../TypeRegistryTests.swift | 2 +- .../RealGIRParsingTests.swift | 2 +- scripts/compile-gate.sh | 6 ++-- scripts/smoke-test.sh | 6 ++-- 44 files changed, 67 insertions(+), 69 deletions(-) rename Sources/{SwiftGtkGenCommandPlugin => GObjectGeneratorCommandPlugin}/CommandPlugin.swift (80%) rename Sources/{SwiftGtkGenCore => GObjectGeneratorCore}/Analysis.swift (100%) rename Sources/{SwiftGtkGenCore => GObjectGeneratorCore}/BindingPlan.swift (100%) rename Sources/{SwiftGtkGenCore => GObjectGeneratorCore}/CodeGen+Scaffolding.swift (100%) rename Sources/{SwiftGtkGenCore => GObjectGeneratorCore}/CodeGen.swift (93%) rename Sources/{SwiftGtkGenCore => GObjectGeneratorCore}/Config.swift (100%) rename Sources/{SwiftGtkGenCore => GObjectGeneratorCore}/IRModel.swift (100%) rename Sources/{SwiftGtkGenCore => GObjectGeneratorCore}/MultiPackageAnalysis.swift (100%) rename Sources/{SwiftGtkGenCore => GObjectGeneratorCore}/PlanRenderer.swift (99%) rename Sources/{SwiftGtkGenCore => GObjectGeneratorCore}/Planner.swift (100%) rename Sources/{SwiftGtkGenCore => GObjectGeneratorCore}/TOMLReader.swift (100%) rename Sources/{SwiftGtkGenCore => GObjectGeneratorCore}/TypeMapper.swift (100%) rename Sources/{SwiftGtkGenCore => GObjectGeneratorCore}/TypeRegistry.swift (100%) rename Sources/{SwiftGtkGenCore => GObjectGeneratorCore}/XMLParser.swift (100%) rename Sources/{swift-gtk-gen => generator}/Main.swift (97%) rename Tests/{SwiftGtkGenCLITests => GObjectGeneratorCLITests}/CLITests.swift (75%) rename Tests/{SwiftGtkGenCoreTests => GObjectGeneratorCoreTests}/AnalysisTests.swift (99%) rename Tests/{SwiftGtkGenCoreTests => GObjectGeneratorCoreTests}/CallbackGenerationTests.swift (99%) rename Tests/{SwiftGtkGenCoreTests => GObjectGeneratorCoreTests}/ConfigFileTests.swift (99%) rename Tests/{SwiftGtkGenCoreTests => GObjectGeneratorCoreTests}/ConfigTests.swift (98%) rename Tests/{SwiftGtkGenCoreTests => GObjectGeneratorCoreTests}/FunctionGenerationTests.swift (99%) rename Tests/{SwiftGtkGenCoreTests => GObjectGeneratorCoreTests}/IRModelTests.swift (99%) rename Tests/{SwiftGtkGenCoreTests => GObjectGeneratorCoreTests}/InheritedMemberTests.swift (99%) rename Tests/{SwiftGtkGenCoreTests => GObjectGeneratorCoreTests}/InterfaceConformanceTests.swift (99%) rename Tests/{SwiftGtkGenCoreTests => GObjectGeneratorCoreTests}/InterfaceGenerationTests.swift (98%) rename Tests/{SwiftGtkGenCoreTests => GObjectGeneratorCoreTests}/InterfaceSignalGenerationTests.swift (99%) rename Tests/{SwiftGtkGenCoreTests => GObjectGeneratorCoreTests}/MonorepoConfigTests.swift (98%) rename Tests/{SwiftGtkGenCoreTests => GObjectGeneratorCoreTests}/MultiPackageAnalysisTests.swift (99%) rename Tests/{SwiftGtkGenCoreTests => GObjectGeneratorCoreTests}/NamingTests.swift (99%) rename Tests/{SwiftGtkGenCoreTests => GObjectGeneratorCoreTests}/ParserSemanticsTests.swift (99%) rename Tests/{SwiftGtkGenCoreTests => GObjectGeneratorCoreTests}/ParserTests.swift (99%) rename Tests/{SwiftGtkGenCoreTests => GObjectGeneratorCoreTests}/PropertyGenerationTests.swift (99%) rename Tests/{SwiftGtkGenCoreTests => GObjectGeneratorCoreTests}/RecordGenerationTests.swift (99%) rename Tests/{SwiftGtkGenCoreTests => GObjectGeneratorCoreTests}/RendererCallableTests.swift (99%) rename Tests/{SwiftGtkGenCoreTests => GObjectGeneratorCoreTests}/ScaffoldingTests.swift (99%) rename Tests/{SwiftGtkGenCoreTests => GObjectGeneratorCoreTests}/SignalGenerationTests.swift (99%) rename Tests/{SwiftGtkGenCoreTests => GObjectGeneratorCoreTests}/TOMLReaderTests.swift (99%) rename Tests/{SwiftGtkGenCoreTests => GObjectGeneratorCoreTests}/TypeMapperTests.swift (99%) rename Tests/{SwiftGtkGenCoreTests => GObjectGeneratorCoreTests}/TypeRegistryTests.swift (99%) diff --git a/Package.swift b/Package.swift index 051fb89..9ec89a5 100644 --- a/Package.swift +++ b/Package.swift @@ -13,31 +13,31 @@ let pluginSettings: [SwiftSetting] = [ ] let package = Package( - name: "gir-generator", + name: "gobject-generator", platforms: [.macOS(.v14)], products: [ - .executable(name: "swift-gtk-gen", targets: ["swift-gtk-gen"]), - .plugin(name: "SwiftGtkGenCommandPlugin", targets: ["SwiftGtkGenCommandPlugin"]), + .executable(name: "generator", targets: ["generator"]), + .plugin(name: "GObjectGeneratorCommandPlugin", targets: ["GObjectGeneratorCommandPlugin"]), ], dependencies: [ .package(url: "https://github.com/swiftlang/swift-format.git", branch: "release/6.3") ], targets: [ .target( - name: "SwiftGtkGenCore", + name: "GObjectGeneratorCore", dependencies: [], swiftSettings: concurrencySettings ), .executableTarget( - name: "swift-gtk-gen", + name: "generator", dependencies: [ - "SwiftGtkGenCore", + "GObjectGeneratorCore", .product(name: "SwiftFormat", package: "swift-format"), ], swiftSettings: concurrencySettings ), .plugin( - name: "SwiftGtkGenCommandPlugin", + name: "GObjectGeneratorCommandPlugin", capability: .command( intent: .custom( verb: "generate-gir-bindings", @@ -45,22 +45,22 @@ let package = Package( ), permissions: [.writeToPackageDirectory(reason: "Write generated Swift files to source directory.")] ), - dependencies: ["swift-gtk-gen"], - path: "Sources/SwiftGtkGenCommandPlugin" + dependencies: ["generator"], + path: "Sources/GObjectGeneratorCommandPlugin" ), .testTarget( - name: "SwiftGtkGenCoreTests", - dependencies: ["SwiftGtkGenCore"], + name: "GObjectGeneratorCoreTests", + dependencies: ["GObjectGeneratorCore"], swiftSettings: concurrencySettings ), .testTarget( - name: "SwiftGtkGenCLITests", - dependencies: ["SwiftGtkGenCore"], + name: "GObjectGeneratorCLITests", + dependencies: ["GObjectGeneratorCore"], swiftSettings: concurrencySettings ), .testTarget( name: "IntegrationTests", - dependencies: ["SwiftGtkGenCore"], + dependencies: ["GObjectGeneratorCore"], swiftSettings: concurrencySettings ), ] diff --git a/README.md b/README.md index 031f1b8..107585c 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Reads GObject Introspection (`.gir`) XML files and produces low-level Swift wrap ## Usage ```bash -swift-gtk-gen --gir-file /usr/share/gir-1.0/Gtk-4.0.gir --output ./Gtk +generator --gir-file /usr/share/gir-1.0/Gtk-4.0.gir --output ./Gtk ``` Library name and version are derived automatically from the GIR file's `` element. Override via `config.toml` (see below). @@ -54,15 +54,14 @@ rename = "Alignment" ### Generate all types ```bash -swift-gtk-gen --gir-file Gtk-4.0.gir --output ./Gtk --generate-all +generator --gir-file Gtk-4.0.gir --output ./Gtk --generate-all ``` ### Generate specific types ```bash -swift-gtk-gen --gir-file Gtk-4.0.gir --output ./Gtk \ +generator --gir-file Gtk-4.0.gir --output ./Gtk \ --generate Gtk.Widget,Gtk.Window,Gtk.Button,Gtk.Align -``` ## Output Structure diff --git a/Sources/SwiftGtkGenCommandPlugin/CommandPlugin.swift b/Sources/GObjectGeneratorCommandPlugin/CommandPlugin.swift similarity index 80% rename from Sources/SwiftGtkGenCommandPlugin/CommandPlugin.swift rename to Sources/GObjectGeneratorCommandPlugin/CommandPlugin.swift index c622df8..e227e3a 100644 --- a/Sources/SwiftGtkGenCommandPlugin/CommandPlugin.swift +++ b/Sources/GObjectGeneratorCommandPlugin/CommandPlugin.swift @@ -4,13 +4,13 @@ import Foundation /// SwiftPM command plugin for manual GIR binding regeneration. /// /// Invoked via `swift package generate-gir-bindings`. Forwards all -/// user-provided arguments directly to the `swift-gtk-gen` monorepo CLI, +/// user-provided arguments directly to the `generator` monorepo CLI, /// defaulting `--output` to the package directory when the caller omits it. /// The generator itself decides what to plan, render, and write from the /// monorepo TOML config passed via `--monorepo-config`. @main -struct SwiftGtkGenCommandPlugin: CommandPlugin { - /// Runs `swift-gtk-gen` as a subprocess with the caller's arguments. +struct GObjectGeneratorCommandPlugin: CommandPlugin { + /// Runs `generator` as a subprocess with the caller's arguments. /// /// Stdout and stderr are piped through to the caller. Throws if the /// subprocess exits non-zero. @@ -25,7 +25,7 @@ struct SwiftGtkGenCommandPlugin: CommandPlugin { return } - let executable = try context.tool(named: "swift-gtk-gen") + let executable = try context.tool(named: "generator") var procArgs = arguments if !procArgs.contains("--output") { @@ -54,23 +54,23 @@ struct SwiftGtkGenCommandPlugin: CommandPlugin { } guard process.terminationStatus == 0 else { - throw SwiftGtkGenPluginError.generationFailed + throw GObjectGeneratorPluginError.generationFailed } } } /// Errors that can occur during command-plugin GIR generation. -enum SwiftGtkGenPluginError: Error { - /// The `swift-gtk-gen` subprocess exited non-zero. +enum GObjectGeneratorPluginError: Error { + /// The `generator` subprocess exited non-zero. case generationFailed } -extension SwiftGtkGenPluginError: CustomStringConvertible { +extension GObjectGeneratorPluginError: CustomStringConvertible { /// A human-readable description of the error. var description: String { switch self { case .generationFailed: - return "swift-gtk-gen generation failed; see output above for details." + return "gobject-generator generation failed; see output above for details." } } } diff --git a/Sources/SwiftGtkGenCore/Analysis.swift b/Sources/GObjectGeneratorCore/Analysis.swift similarity index 100% rename from Sources/SwiftGtkGenCore/Analysis.swift rename to Sources/GObjectGeneratorCore/Analysis.swift diff --git a/Sources/SwiftGtkGenCore/BindingPlan.swift b/Sources/GObjectGeneratorCore/BindingPlan.swift similarity index 100% rename from Sources/SwiftGtkGenCore/BindingPlan.swift rename to Sources/GObjectGeneratorCore/BindingPlan.swift diff --git a/Sources/SwiftGtkGenCore/CodeGen+Scaffolding.swift b/Sources/GObjectGeneratorCore/CodeGen+Scaffolding.swift similarity index 100% rename from Sources/SwiftGtkGenCore/CodeGen+Scaffolding.swift rename to Sources/GObjectGeneratorCore/CodeGen+Scaffolding.swift diff --git a/Sources/SwiftGtkGenCore/CodeGen.swift b/Sources/GObjectGeneratorCore/CodeGen.swift similarity index 93% rename from Sources/SwiftGtkGenCore/CodeGen.swift rename to Sources/GObjectGeneratorCore/CodeGen.swift index e1ace47..a80543a 100644 --- a/Sources/SwiftGtkGenCore/CodeGen.swift +++ b/Sources/GObjectGeneratorCore/CodeGen.swift @@ -12,7 +12,7 @@ public struct CodeGenerator { /// available through a single import of this module. static func generateReexportUmbrellas(analysis: MultiPackageAnalysis) -> [String: String] { var files: [String: String] = [:] - let header = "// Generated by SwiftGtkGen. DO NOT EDIT.\n\n" + let header = "// Generated by gobject-generator. DO NOT EDIT.\n\n" for (moduleName, transitive) in analysis.transitiveDependencies { guard !transitive.isEmpty else { continue } var content = header diff --git a/Sources/SwiftGtkGenCore/Config.swift b/Sources/GObjectGeneratorCore/Config.swift similarity index 100% rename from Sources/SwiftGtkGenCore/Config.swift rename to Sources/GObjectGeneratorCore/Config.swift diff --git a/Sources/SwiftGtkGenCore/IRModel.swift b/Sources/GObjectGeneratorCore/IRModel.swift similarity index 100% rename from Sources/SwiftGtkGenCore/IRModel.swift rename to Sources/GObjectGeneratorCore/IRModel.swift diff --git a/Sources/SwiftGtkGenCore/MultiPackageAnalysis.swift b/Sources/GObjectGeneratorCore/MultiPackageAnalysis.swift similarity index 100% rename from Sources/SwiftGtkGenCore/MultiPackageAnalysis.swift rename to Sources/GObjectGeneratorCore/MultiPackageAnalysis.swift diff --git a/Sources/SwiftGtkGenCore/PlanRenderer.swift b/Sources/GObjectGeneratorCore/PlanRenderer.swift similarity index 99% rename from Sources/SwiftGtkGenCore/PlanRenderer.swift rename to Sources/GObjectGeneratorCore/PlanRenderer.swift index 88e232d..6346f9b 100644 --- a/Sources/SwiftGtkGenCore/PlanRenderer.swift +++ b/Sources/GObjectGeneratorCore/PlanRenderer.swift @@ -35,7 +35,7 @@ public func renderModule(_ plan: ModulePlan) -> [String: String] { let depImports = plan.dependencyModules.map { "@_spi(SGTKInternal) import \($0)\n" }.joined() let header = """ - // Generated by SwiftGtkGen. DO NOT EDIT. + // Generated by gobject-generator. DO NOT EDIT. import C\(plan.module) \(depImports) @@ -305,7 +305,7 @@ private func renderSupport(moduleName: String, dependencyModules: [String] = [], let depImports = dependencyModules.map { "@_spi(SGTKInternal) import \($0)\n" }.joined() return """ - // Generated by SwiftGtkGen. DO NOT EDIT. + // Generated by gobject-generator. DO NOT EDIT. import C\(moduleName) \(depImports) diff --git a/Sources/SwiftGtkGenCore/Planner.swift b/Sources/GObjectGeneratorCore/Planner.swift similarity index 100% rename from Sources/SwiftGtkGenCore/Planner.swift rename to Sources/GObjectGeneratorCore/Planner.swift diff --git a/Sources/SwiftGtkGenCore/TOMLReader.swift b/Sources/GObjectGeneratorCore/TOMLReader.swift similarity index 100% rename from Sources/SwiftGtkGenCore/TOMLReader.swift rename to Sources/GObjectGeneratorCore/TOMLReader.swift diff --git a/Sources/SwiftGtkGenCore/TypeMapper.swift b/Sources/GObjectGeneratorCore/TypeMapper.swift similarity index 100% rename from Sources/SwiftGtkGenCore/TypeMapper.swift rename to Sources/GObjectGeneratorCore/TypeMapper.swift diff --git a/Sources/SwiftGtkGenCore/TypeRegistry.swift b/Sources/GObjectGeneratorCore/TypeRegistry.swift similarity index 100% rename from Sources/SwiftGtkGenCore/TypeRegistry.swift rename to Sources/GObjectGeneratorCore/TypeRegistry.swift diff --git a/Sources/SwiftGtkGenCore/XMLParser.swift b/Sources/GObjectGeneratorCore/XMLParser.swift similarity index 100% rename from Sources/SwiftGtkGenCore/XMLParser.swift rename to Sources/GObjectGeneratorCore/XMLParser.swift diff --git a/Sources/swift-gtk-gen/Main.swift b/Sources/generator/Main.swift similarity index 97% rename from Sources/swift-gtk-gen/Main.swift rename to Sources/generator/Main.swift index 2f57cf3..037b8c0 100644 --- a/Sources/swift-gtk-gen/Main.swift +++ b/Sources/generator/Main.swift @@ -1,6 +1,6 @@ import Foundation import SwiftFormat -import SwiftGtkGenCore +import GObjectGeneratorCore /// Command-line interface for the GIR-to-Swift binding generator. /// @@ -9,7 +9,7 @@ import SwiftGtkGenCore /// to the output directory. This is the subprocess entry point invoked by /// both the build tool plugin and the command plugin. @main -struct SwiftGtkGenCLI { +struct GeneratorCLI { /// Program entry point. Parses arguments, generates code, and writes output. static func main() { let args = parseArguments() @@ -20,7 +20,7 @@ struct SwiftGtkGenCLI { guard !args.monorepoConfigTOML.isEmpty else { print("Error: --monorepo-config is required") - print(" swift-gtk-gen --monorepo-config configs/tier1.toml --output /tmp/out") + print(" generator --monorepo-config configs/tier1.toml --output /tmp/out") exit(1) } @@ -160,7 +160,7 @@ struct SwiftGtkGenCLI { /// Prints usage information to stdout. static func printHelp() { - print("Usage: swift-gtk-gen --monorepo-config PATH [options]") + print("Usage: generator --monorepo-config PATH [options]") print(" --monorepo-config PATH Monorepo TOML config (required)") print(" --output DIR Output directory (default: .)") print(" --skip-report Write skip-reports/.json and coverage-summary.json") diff --git a/Tests/SwiftGtkGenCLITests/CLITests.swift b/Tests/GObjectGeneratorCLITests/CLITests.swift similarity index 75% rename from Tests/SwiftGtkGenCLITests/CLITests.swift rename to Tests/GObjectGeneratorCLITests/CLITests.swift index 986a62e..72b5819 100644 --- a/Tests/SwiftGtkGenCLITests/CLITests.swift +++ b/Tests/GObjectGeneratorCLITests/CLITests.swift @@ -16,16 +16,15 @@ func testCLIHelp() throws { private func findBinary() -> URL? { let candidates = [ - URL(fileURLWithPath: ".build/debug/swift-gtk-gen"), - URL(fileURLWithPath: "generator/.build/debug/swift-gtk-gen"), - URL(fileURLWithPath: ".build/release/swift-gtk-gen"), - URL(fileURLWithPath: "generator/.build/release/swift-gtk-gen"), + URL(fileURLWithPath: ".build/debug/generator"), + URL(fileURLWithPath: ".build/release/generator"), ] return candidates.first { FileManager.default.fileExists(atPath: $0.path) } } + private func failBinaryNotFound() -> URL { - Issue.record("swift-gtk-gen binary not found at any expected path") + Issue.record("generator binary not found at any expected path") return URL(fileURLWithPath: "/nonexistent") } diff --git a/Tests/SwiftGtkGenCoreTests/AnalysisTests.swift b/Tests/GObjectGeneratorCoreTests/AnalysisTests.swift similarity index 99% rename from Tests/SwiftGtkGenCoreTests/AnalysisTests.swift rename to Tests/GObjectGeneratorCoreTests/AnalysisTests.swift index c5cf457..3885d3a 100644 --- a/Tests/SwiftGtkGenCoreTests/AnalysisTests.swift +++ b/Tests/GObjectGeneratorCoreTests/AnalysisTests.swift @@ -1,5 +1,5 @@ import Testing -@testable import SwiftGtkGenCore +@testable import GObjectGeneratorCore @Test("Analysis resolves class hierarchy") func testClassHierarchy() { diff --git a/Tests/SwiftGtkGenCoreTests/CallbackGenerationTests.swift b/Tests/GObjectGeneratorCoreTests/CallbackGenerationTests.swift similarity index 99% rename from Tests/SwiftGtkGenCoreTests/CallbackGenerationTests.swift rename to Tests/GObjectGeneratorCoreTests/CallbackGenerationTests.swift index e6e2c4e..b2b44f1 100644 --- a/Tests/SwiftGtkGenCoreTests/CallbackGenerationTests.swift +++ b/Tests/GObjectGeneratorCoreTests/CallbackGenerationTests.swift @@ -16,7 +16,7 @@ import Testing -@testable import SwiftGtkGenCore +@testable import GObjectGeneratorCore @Suite("Callback generation") struct CallbackGenerationTests { diff --git a/Tests/SwiftGtkGenCoreTests/ConfigFileTests.swift b/Tests/GObjectGeneratorCoreTests/ConfigFileTests.swift similarity index 99% rename from Tests/SwiftGtkGenCoreTests/ConfigFileTests.swift rename to Tests/GObjectGeneratorCoreTests/ConfigFileTests.swift index ff5da25..d175f19 100644 --- a/Tests/SwiftGtkGenCoreTests/ConfigFileTests.swift +++ b/Tests/GObjectGeneratorCoreTests/ConfigFileTests.swift @@ -1,5 +1,5 @@ import Testing -@testable import SwiftGtkGenCore +@testable import GObjectGeneratorCore @Test("GenerationConfig can be built from TOML dictionary and GIR namespace") func testConfigFromTOML() throws { diff --git a/Tests/SwiftGtkGenCoreTests/ConfigTests.swift b/Tests/GObjectGeneratorCoreTests/ConfigTests.swift similarity index 98% rename from Tests/SwiftGtkGenCoreTests/ConfigTests.swift rename to Tests/GObjectGeneratorCoreTests/ConfigTests.swift index 58095bd..35f4c2d 100644 --- a/Tests/SwiftGtkGenCoreTests/ConfigTests.swift +++ b/Tests/GObjectGeneratorCoreTests/ConfigTests.swift @@ -1,5 +1,5 @@ import Testing -@testable import SwiftGtkGenCore +@testable import GObjectGeneratorCore @Test("Config builder creates valid configuration") func testConfigBuilder() { diff --git a/Tests/SwiftGtkGenCoreTests/FunctionGenerationTests.swift b/Tests/GObjectGeneratorCoreTests/FunctionGenerationTests.swift similarity index 99% rename from Tests/SwiftGtkGenCoreTests/FunctionGenerationTests.swift rename to Tests/GObjectGeneratorCoreTests/FunctionGenerationTests.swift index 81c7747..72bd970 100644 --- a/Tests/SwiftGtkGenCoreTests/FunctionGenerationTests.swift +++ b/Tests/GObjectGeneratorCoreTests/FunctionGenerationTests.swift @@ -8,7 +8,7 @@ import Testing -@testable import SwiftGtkGenCore +@testable import GObjectGeneratorCore @Suite("Function generation") struct FunctionGenerationTests { diff --git a/Tests/SwiftGtkGenCoreTests/IRModelTests.swift b/Tests/GObjectGeneratorCoreTests/IRModelTests.swift similarity index 99% rename from Tests/SwiftGtkGenCoreTests/IRModelTests.swift rename to Tests/GObjectGeneratorCoreTests/IRModelTests.swift index eac3a66..997b029 100644 --- a/Tests/SwiftGtkGenCoreTests/IRModelTests.swift +++ b/Tests/GObjectGeneratorCoreTests/IRModelTests.swift @@ -1,5 +1,5 @@ import Testing -import SwiftGtkGenCore +import GObjectGeneratorCore @Test("Namespace can hold types") func testNamespaceHoldsTypes() { diff --git a/Tests/SwiftGtkGenCoreTests/InheritedMemberTests.swift b/Tests/GObjectGeneratorCoreTests/InheritedMemberTests.swift similarity index 99% rename from Tests/SwiftGtkGenCoreTests/InheritedMemberTests.swift rename to Tests/GObjectGeneratorCoreTests/InheritedMemberTests.swift index 473e91f..6c258c3 100644 --- a/Tests/SwiftGtkGenCoreTests/InheritedMemberTests.swift +++ b/Tests/GObjectGeneratorCoreTests/InheritedMemberTests.swift @@ -11,7 +11,7 @@ import Foundation import Testing -@testable import SwiftGtkGenCore +@testable import GObjectGeneratorCore @Suite("Cross-module inherited-member dedup") struct InheritedMemberTests { diff --git a/Tests/SwiftGtkGenCoreTests/InterfaceConformanceTests.swift b/Tests/GObjectGeneratorCoreTests/InterfaceConformanceTests.swift similarity index 99% rename from Tests/SwiftGtkGenCoreTests/InterfaceConformanceTests.swift rename to Tests/GObjectGeneratorCoreTests/InterfaceConformanceTests.swift index 40aea6e..e1d5bff 100644 --- a/Tests/SwiftGtkGenCoreTests/InterfaceConformanceTests.swift +++ b/Tests/GObjectGeneratorCoreTests/InterfaceConformanceTests.swift @@ -8,7 +8,7 @@ import Testing -@testable import SwiftGtkGenCore +@testable import GObjectGeneratorCore @Suite("Interface conformance") struct InterfaceConformanceTests { diff --git a/Tests/SwiftGtkGenCoreTests/InterfaceGenerationTests.swift b/Tests/GObjectGeneratorCoreTests/InterfaceGenerationTests.swift similarity index 98% rename from Tests/SwiftGtkGenCoreTests/InterfaceGenerationTests.swift rename to Tests/GObjectGeneratorCoreTests/InterfaceGenerationTests.swift index 0946d61..c5b2ce8 100644 --- a/Tests/SwiftGtkGenCoreTests/InterfaceGenerationTests.swift +++ b/Tests/GObjectGeneratorCoreTests/InterfaceGenerationTests.swift @@ -9,7 +9,7 @@ import Testing -@testable import SwiftGtkGenCore +@testable import GObjectGeneratorCore @Suite("Interface generation") struct InterfaceGenerationTests { diff --git a/Tests/SwiftGtkGenCoreTests/InterfaceSignalGenerationTests.swift b/Tests/GObjectGeneratorCoreTests/InterfaceSignalGenerationTests.swift similarity index 99% rename from Tests/SwiftGtkGenCoreTests/InterfaceSignalGenerationTests.swift rename to Tests/GObjectGeneratorCoreTests/InterfaceSignalGenerationTests.swift index 4231303..40e72a6 100644 --- a/Tests/SwiftGtkGenCoreTests/InterfaceSignalGenerationTests.swift +++ b/Tests/GObjectGeneratorCoreTests/InterfaceSignalGenerationTests.swift @@ -9,7 +9,7 @@ import Testing -@testable import SwiftGtkGenCore +@testable import GObjectGeneratorCore @Suite("Interface signal generation") struct InterfaceSignalGenerationTests { diff --git a/Tests/SwiftGtkGenCoreTests/MonorepoConfigTests.swift b/Tests/GObjectGeneratorCoreTests/MonorepoConfigTests.swift similarity index 98% rename from Tests/SwiftGtkGenCoreTests/MonorepoConfigTests.swift rename to Tests/GObjectGeneratorCoreTests/MonorepoConfigTests.swift index 4b2ae07..8fa2541 100644 --- a/Tests/SwiftGtkGenCoreTests/MonorepoConfigTests.swift +++ b/Tests/GObjectGeneratorCoreTests/MonorepoConfigTests.swift @@ -1,6 +1,6 @@ import Foundation import Testing -@testable import SwiftGtkGenCore +@testable import GObjectGeneratorCore @Suite("MonorepoConfig") struct MonorepoConfigTests { diff --git a/Tests/SwiftGtkGenCoreTests/MultiPackageAnalysisTests.swift b/Tests/GObjectGeneratorCoreTests/MultiPackageAnalysisTests.swift similarity index 99% rename from Tests/SwiftGtkGenCoreTests/MultiPackageAnalysisTests.swift rename to Tests/GObjectGeneratorCoreTests/MultiPackageAnalysisTests.swift index f1547da..de7a76a 100644 --- a/Tests/SwiftGtkGenCoreTests/MultiPackageAnalysisTests.swift +++ b/Tests/GObjectGeneratorCoreTests/MultiPackageAnalysisTests.swift @@ -1,6 +1,6 @@ import Foundation import Testing -@testable import SwiftGtkGenCore +@testable import GObjectGeneratorCore @Suite("MultiPackageAnalyzer") struct MultiPackageAnalysisTests { diff --git a/Tests/SwiftGtkGenCoreTests/NamingTests.swift b/Tests/GObjectGeneratorCoreTests/NamingTests.swift similarity index 99% rename from Tests/SwiftGtkGenCoreTests/NamingTests.swift rename to Tests/GObjectGeneratorCoreTests/NamingTests.swift index 633e949..5be96e3 100644 --- a/Tests/SwiftGtkGenCoreTests/NamingTests.swift +++ b/Tests/GObjectGeneratorCoreTests/NamingTests.swift @@ -8,7 +8,7 @@ import Testing -@testable import SwiftGtkGenCore +@testable import GObjectGeneratorCore @Suite("Naming conventions") struct NamingTests { diff --git a/Tests/SwiftGtkGenCoreTests/ParserSemanticsTests.swift b/Tests/GObjectGeneratorCoreTests/ParserSemanticsTests.swift similarity index 99% rename from Tests/SwiftGtkGenCoreTests/ParserSemanticsTests.swift rename to Tests/GObjectGeneratorCoreTests/ParserSemanticsTests.swift index 80ab929..3d2a703 100644 --- a/Tests/SwiftGtkGenCoreTests/ParserSemanticsTests.swift +++ b/Tests/GObjectGeneratorCoreTests/ParserSemanticsTests.swift @@ -7,7 +7,7 @@ import Foundation import Testing -@testable import SwiftGtkGenCore +@testable import GObjectGeneratorCore /// Wraps GIR element markup in a minimal well-formed repository document. /// diff --git a/Tests/SwiftGtkGenCoreTests/ParserTests.swift b/Tests/GObjectGeneratorCoreTests/ParserTests.swift similarity index 99% rename from Tests/SwiftGtkGenCoreTests/ParserTests.swift rename to Tests/GObjectGeneratorCoreTests/ParserTests.swift index 7c73cff..903aea7 100644 --- a/Tests/SwiftGtkGenCoreTests/ParserTests.swift +++ b/Tests/GObjectGeneratorCoreTests/ParserTests.swift @@ -1,6 +1,6 @@ import Testing import Foundation -@testable import SwiftGtkGenCore +@testable import GObjectGeneratorCore @Test("Parser reads namespace from minimal GIR XML") func testParsesNamespace() throws { diff --git a/Tests/SwiftGtkGenCoreTests/PropertyGenerationTests.swift b/Tests/GObjectGeneratorCoreTests/PropertyGenerationTests.swift similarity index 99% rename from Tests/SwiftGtkGenCoreTests/PropertyGenerationTests.swift rename to Tests/GObjectGeneratorCoreTests/PropertyGenerationTests.swift index 54c84d4..b2c93f1 100644 --- a/Tests/SwiftGtkGenCoreTests/PropertyGenerationTests.swift +++ b/Tests/GObjectGeneratorCoreTests/PropertyGenerationTests.swift @@ -13,7 +13,7 @@ import Testing -@testable import SwiftGtkGenCore +@testable import GObjectGeneratorCore @Suite("Property generation") struct PropertyGenerationTests { diff --git a/Tests/SwiftGtkGenCoreTests/RecordGenerationTests.swift b/Tests/GObjectGeneratorCoreTests/RecordGenerationTests.swift similarity index 99% rename from Tests/SwiftGtkGenCoreTests/RecordGenerationTests.swift rename to Tests/GObjectGeneratorCoreTests/RecordGenerationTests.swift index f762358..b8501bf 100644 --- a/Tests/SwiftGtkGenCoreTests/RecordGenerationTests.swift +++ b/Tests/GObjectGeneratorCoreTests/RecordGenerationTests.swift @@ -8,7 +8,7 @@ import Testing -@testable import SwiftGtkGenCore +@testable import GObjectGeneratorCore @Suite("Record generation") struct RecordGenerationTests { diff --git a/Tests/SwiftGtkGenCoreTests/RendererCallableTests.swift b/Tests/GObjectGeneratorCoreTests/RendererCallableTests.swift similarity index 99% rename from Tests/SwiftGtkGenCoreTests/RendererCallableTests.swift rename to Tests/GObjectGeneratorCoreTests/RendererCallableTests.swift index aa710e7..45bc048 100644 --- a/Tests/SwiftGtkGenCoreTests/RendererCallableTests.swift +++ b/Tests/GObjectGeneratorCoreTests/RendererCallableTests.swift @@ -5,7 +5,7 @@ import Testing -@testable import SwiftGtkGenCore +@testable import GObjectGeneratorCore @Suite("Renderer callables") struct RendererCallableTests { diff --git a/Tests/SwiftGtkGenCoreTests/ScaffoldingTests.swift b/Tests/GObjectGeneratorCoreTests/ScaffoldingTests.swift similarity index 99% rename from Tests/SwiftGtkGenCoreTests/ScaffoldingTests.swift rename to Tests/GObjectGeneratorCoreTests/ScaffoldingTests.swift index be650c7..9b573df 100644 --- a/Tests/SwiftGtkGenCoreTests/ScaffoldingTests.swift +++ b/Tests/GObjectGeneratorCoreTests/ScaffoldingTests.swift @@ -1,5 +1,5 @@ import Testing -@testable import SwiftGtkGenCore +@testable import GObjectGeneratorCore @Test("generatePackageScaffolding produces Package.swift") func testPackageScaffolding() { diff --git a/Tests/SwiftGtkGenCoreTests/SignalGenerationTests.swift b/Tests/GObjectGeneratorCoreTests/SignalGenerationTests.swift similarity index 99% rename from Tests/SwiftGtkGenCoreTests/SignalGenerationTests.swift rename to Tests/GObjectGeneratorCoreTests/SignalGenerationTests.swift index f06b80f..5d34217 100644 --- a/Tests/SwiftGtkGenCoreTests/SignalGenerationTests.swift +++ b/Tests/GObjectGeneratorCoreTests/SignalGenerationTests.swift @@ -7,7 +7,7 @@ import Testing -@testable import SwiftGtkGenCore +@testable import GObjectGeneratorCore @Suite("Signal generation") struct SignalGenerationTests { diff --git a/Tests/SwiftGtkGenCoreTests/TOMLReaderTests.swift b/Tests/GObjectGeneratorCoreTests/TOMLReaderTests.swift similarity index 99% rename from Tests/SwiftGtkGenCoreTests/TOMLReaderTests.swift rename to Tests/GObjectGeneratorCoreTests/TOMLReaderTests.swift index 6fabbdf..b455e06 100644 --- a/Tests/SwiftGtkGenCoreTests/TOMLReaderTests.swift +++ b/Tests/GObjectGeneratorCoreTests/TOMLReaderTests.swift @@ -1,5 +1,5 @@ import Testing -@testable import SwiftGtkGenCore +@testable import GObjectGeneratorCore @Test("TOML reader parses simple key-value pairs") func testSimpleKeyValue() throws { diff --git a/Tests/SwiftGtkGenCoreTests/TypeMapperTests.swift b/Tests/GObjectGeneratorCoreTests/TypeMapperTests.swift similarity index 99% rename from Tests/SwiftGtkGenCoreTests/TypeMapperTests.swift rename to Tests/GObjectGeneratorCoreTests/TypeMapperTests.swift index 9427e30..03d808b 100644 --- a/Tests/SwiftGtkGenCoreTests/TypeMapperTests.swift +++ b/Tests/GObjectGeneratorCoreTests/TypeMapperTests.swift @@ -6,7 +6,7 @@ import Testing -@testable import SwiftGtkGenCore +@testable import GObjectGeneratorCore @Suite("TypeMapper") struct TypeMapperTests { diff --git a/Tests/SwiftGtkGenCoreTests/TypeRegistryTests.swift b/Tests/GObjectGeneratorCoreTests/TypeRegistryTests.swift similarity index 99% rename from Tests/SwiftGtkGenCoreTests/TypeRegistryTests.swift rename to Tests/GObjectGeneratorCoreTests/TypeRegistryTests.swift index 6442fa4..92a3d1f 100644 --- a/Tests/SwiftGtkGenCoreTests/TypeRegistryTests.swift +++ b/Tests/GObjectGeneratorCoreTests/TypeRegistryTests.swift @@ -7,7 +7,7 @@ import Testing -@testable import SwiftGtkGenCore +@testable import GObjectGeneratorCore @Suite("TypeRegistry") struct TypeRegistryTests { diff --git a/Tests/IntegrationTests/RealGIRParsingTests.swift b/Tests/IntegrationTests/RealGIRParsingTests.swift index 943f642..ddd7bef 100644 --- a/Tests/IntegrationTests/RealGIRParsingTests.swift +++ b/Tests/IntegrationTests/RealGIRParsingTests.swift @@ -7,7 +7,7 @@ import Foundation import Testing -@testable import SwiftGtkGenCore +@testable import GObjectGeneratorCore @Suite("Real GIR parsing") struct RealGIRParsingTests { diff --git a/scripts/compile-gate.sh b/scripts/compile-gate.sh index 19feee1..2721b22 100755 --- a/scripts/compile-gate.sh +++ b/scripts/compile-gate.sh @@ -14,13 +14,13 @@ # --fresh remove the tier's output directory before generating (use when # the generated file set shrinks and stale files would linger) # -# Output goes to ${TMPDIR:-/tmp}/swift-gtk-gen-gate/tier-N; a stable path so +# Output goes to ${TMPDIR:-/tmp}/gobject-generator-gate/tier-N; a stable path so # incremental swift builds stay fast between runs. set -euo pipefail ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" -GATE_ROOT="${TMPDIR:-/tmp}/swift-gtk-gen-gate" +GATE_ROOT="${TMPDIR:-/tmp}/gobject-generator-gate" TIER_ARG="${1:-}" FRESH=0 @@ -39,7 +39,7 @@ fi echo "==> Building generator" swift build --package-path "$ROOT" -BIN="$(swift build --package-path "$ROOT" --show-bin-path)/swift-gtk-gen" +BIN="$(swift build --package-path "$ROOT" --show-bin-path)/generator" FAILED=0 diff --git a/scripts/smoke-test.sh b/scripts/smoke-test.sh index eaea64f..f49001a 100755 --- a/scripts/smoke-test.sh +++ b/scripts/smoke-test.sh @@ -12,7 +12,7 @@ # tier 1..6 (default 1). tier1 = GLib+GObject, tier2 = +GModule+Gio, … # --fresh wipe the tier's output directory before generating # -# Output goes to ${TMPDIR:-/tmp}/swift-gtk-gen-smoke/tier- (a stable path so +# Output goes to ${TMPDIR:-/tmp}/gobject-generator-smoke/tier- (a stable path so # incremental swift builds stay fast between runs). set -euo pipefail @@ -30,7 +30,7 @@ for arg in "$@"; do done CONFIG="$ROOT/configs/tier${TIER}.toml" -OUT="${TMPDIR:-/tmp}/swift-gtk-gen-smoke/tier-${TIER}" +OUT="${TMPDIR:-/tmp}/gobject-generator-smoke/tier-${TIER}" if [[ ! -f "$CONFIG" ]]; then echo "!! missing $CONFIG" >&2 @@ -42,7 +42,7 @@ mkdir -p "$OUT" echo "==> Building generator" swift build --package-path "$ROOT" -BIN="$(swift build --package-path "$ROOT" --show-bin-path)/swift-gtk-gen" +BIN="$(swift build --package-path "$ROOT" --show-bin-path)/generator" echo "==> Generating tier $TIER bindings (with SmokeTests target) into $OUT" "$BIN" --monorepo-config "$CONFIG" --output "$OUT" --smoke-target >"$OUT/generate.log" 2>&1