diff --git a/Binaries/PackageBuildInfo.artifactbundle/universal/packageBuildInfo.sh b/Binaries/PackageBuildInfo.artifactbundle/universal/packageBuildInfo.sh index e42af5d..4b338c5 100755 --- a/Binaries/PackageBuildInfo.artifactbundle/universal/packageBuildInfo.sh +++ b/Binaries/PackageBuildInfo.artifactbundle/universal/packageBuildInfo.sh @@ -6,8 +6,8 @@ # # Copyright © 2024 Dmitriy Borovikov. All rights reserved. # -if [[ $# != 2 ]]; then - echo "USAGE: packageBuildInfo " +if [[ $# != 3 ]]; then + echo "USAGE: packageBuildInfo " exit 1 fi @@ -83,6 +83,7 @@ countSinceTag="0" tag="nil" digest="" digestS="[]" +moduleName=\"$3\" TZO=$(date +%z) TZSIGN=${TZO:0:1}1 @@ -107,6 +108,7 @@ public struct PackageBuild: Sendable { public let countSinceTag: Int // Commit count since tag public let branch: String? // Git branch name public let digest: [UInt8] // Latest commit sha1 digest (20 bytes) + public let moduleName: String // Module name public var commit: String { digest.reduce(\"\") { \$0 + String(format: \"%02x\", \$1) } @@ -119,5 +121,6 @@ public struct PackageBuild: Sendable { tag: $tag, countSinceTag: $countSinceTag, branch: $branch, - digest: $digestS) + digest: $digestS, + moduleName: $moduleName) }" >"$2" diff --git a/Plugins/PackageBuildInfoPlugin/plugin.swift b/Plugins/PackageBuildInfoPlugin/plugin.swift index fe712aa..dc892a9 100644 --- a/Plugins/PackageBuildInfoPlugin/plugin.swift +++ b/Plugins/PackageBuildInfoPlugin/plugin.swift @@ -17,7 +17,7 @@ struct PackageBuildInfoPlugin: BuildToolPlugin { "Generating \(outputFile.lastComponent) for \(target.directory)", executable: try context.tool(named: "PackageBuildInfo").path, - arguments: [ "\(target.directory)", "\(outputFile)" ], + arguments: [ "\(target.directory)", "\(outputFile)", target.moduleName ], outputFilesDirectory: context.pluginWorkDirectory ) return [command] @@ -34,7 +34,7 @@ extension PackageBuildInfoPlugin: XcodeBuildToolPlugin { "Generating \(outputFile.lastComponent) for \(context.xcodeProject.directory)", executable: try context.tool(named: "PackageBuildInfo").path, - arguments: [ "\(context.xcodeProject.directory)", "\(outputFile)" ], + arguments: [ "\(context.xcodeProject.directory)", "\(outputFile)", target.displayName ], outputFilesDirectory: context.pluginWorkDirectory ) return [command]