From 79328cf746506c02a4a26f15724bf61e0954d22b Mon Sep 17 00:00:00 2001 From: Michael Housh Date: Tue, 14 Mar 2023 21:51:34 -0400 Subject: [PATCH] wip --- .../GenerateVersionBuildPlugin.swift | 2 +- Sources/git-version/BuildCommand.swift | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Plugins/GenerateVersionBuildPlugin/GenerateVersionBuildPlugin.swift b/Plugins/GenerateVersionBuildPlugin/GenerateVersionBuildPlugin.swift index 89b379e..0b63dde 100644 --- a/Plugins/GenerateVersionBuildPlugin/GenerateVersionBuildPlugin.swift +++ b/Plugins/GenerateVersionBuildPlugin/GenerateVersionBuildPlugin.swift @@ -22,7 +22,7 @@ struct GenerateVersionBuildPlugin: BuildToolPlugin { .buildCommand( displayName: "Build With Version", executable: tool.path, - arguments: ["build", "--git-directory", gitDirectoryPath.string, outputPath.string], + arguments: ["build", "--verbose", "--git-directory", gitDirectoryPath.string, outputPath.string], environment: [:], inputFiles: target.sourceFiles.map(\.path), outputFiles: [outputFile] diff --git a/Sources/git-version/BuildCommand.swift b/Sources/git-version/BuildCommand.swift index 5d1224c..e960dde 100644 --- a/Sources/git-version/BuildCommand.swift +++ b/Sources/git-version/BuildCommand.swift @@ -9,10 +9,7 @@ extension GitVersionCommand { abstract: "Used for the build with version plugin." ) -// @OptionGroup var shared: SharedOptions - - @Argument(help: "The output file path.") - var outputPath: String + @OptionGroup var shared: SharedOptions @Option( name: .customLong("git-directory"), @@ -32,8 +29,8 @@ extension GitVersionCommand { logger.info("Building with git-directory: \(gitDirectory)") - let fileUrl = URL(fileURLWithPath: outputPath) - .appendingPathComponent("Version.swift") + let fileUrl = URL(fileURLWithPath: shared.target) + .appendingPathComponent(shared.fileName) let fileString = fileUrl.fileString() logger.info("File Url: \(fileString)")