From ef6d97eae8ab9f22b0136f0088e59ed6b4c4d0a5 Mon Sep 17 00:00:00 2001
From: Greg Bolsinga <bolsinga@mac.com>
Date: Sat, 21 Dec 2024 22:16:52 -0800
Subject: [PATCH 1/3] Add PackageBuild.moduleName

---
 .../universal/packageBuildInfo.sh                        | 9 ++++++---
 Plugins/PackageBuildInfoPlugin/plugin.swift              | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Binaries/PackageBuildInfo.artifactbundle/universal/packageBuildInfo.sh b/Binaries/PackageBuildInfo.artifactbundle/universal/packageBuildInfo.sh
index e42af5d..1ad5b28 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 <git directory> <output file>"
+if [[ $# != 3 ]]; then
+    echo "USAGE: packageBuildInfo <git directory> <output file> <module name>"
     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  // Target 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..a8a432f 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]

From cc4881148693296487ee1d9af46f08c942390cb6 Mon Sep 17 00:00:00 2001
From: Greg Bolsinga <bolsinga@mac.com>
Date: Sat, 21 Dec 2024 22:19:00 -0800
Subject: [PATCH 2/3] fix comment

---
 .../universal/packageBuildInfo.sh                               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Binaries/PackageBuildInfo.artifactbundle/universal/packageBuildInfo.sh b/Binaries/PackageBuildInfo.artifactbundle/universal/packageBuildInfo.sh
index 1ad5b28..326c0c4 100755
--- a/Binaries/PackageBuildInfo.artifactbundle/universal/packageBuildInfo.sh
+++ b/Binaries/PackageBuildInfo.artifactbundle/universal/packageBuildInfo.sh
@@ -108,7 +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  // Target name
+    public let moduleName: String  // Module name
 
     public var commit: String {
         digest.reduce(\"\") { \$0 + String(format: \"%02x\", \$1) }

From 8557cae8f6e5f44d3e9463bda70dadc613161715 Mon Sep 17 00:00:00 2001
From: Greg Bolsinga <bolsinga@mac.com>
Date: Tue, 31 Dec 2024 10:30:44 -0800
Subject: [PATCH 3/3] quote the module name and fix XcodeProjectPlugin

---
 .../universal/packageBuildInfo.sh                               | 2 +-
 Plugins/PackageBuildInfoPlugin/plugin.swift                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Binaries/PackageBuildInfo.artifactbundle/universal/packageBuildInfo.sh b/Binaries/PackageBuildInfo.artifactbundle/universal/packageBuildInfo.sh
index 326c0c4..4b338c5 100755
--- a/Binaries/PackageBuildInfo.artifactbundle/universal/packageBuildInfo.sh
+++ b/Binaries/PackageBuildInfo.artifactbundle/universal/packageBuildInfo.sh
@@ -83,7 +83,7 @@ countSinceTag="0"
 tag="nil"
 digest=""
 digestS="[]"
-moduleName="$3"
+moduleName=\"$3\"
 
 TZO=$(date +%z)
 TZSIGN=${TZO:0:1}1
diff --git a/Plugins/PackageBuildInfoPlugin/plugin.swift b/Plugins/PackageBuildInfoPlugin/plugin.swift
index a8a432f..dc892a9 100644
--- a/Plugins/PackageBuildInfoPlugin/plugin.swift
+++ b/Plugins/PackageBuildInfoPlugin/plugin.swift
@@ -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]