Skip to content

Add PackageBuild.moduleName #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bolsinga wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add PackageBuild.moduleName #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef6d97e
Add PackageBuild.moduleName
bolsinga Dec 22, 2024
cc48811
fix comment
bolsinga Dec 22, 2024
8557cae
quote the module name and fix XcodeProjectPlugin
bolsinga Dec 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions Binaries/PackageBuildInfo.artifactbundle/universal/packageBuildInfo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -83,6 +83,7 @@ countSinceTag="0"
tag="nil"
digest=""
digestS="[]"
moduleName=\"$3\"

TZO=$(date +%z)
TZSIGN=${TZO:0:1}1
Expand All @@ -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) }
Expand All @@ -119,5 +121,6 @@ public struct PackageBuild: Sendable {
tag: $tag,
countSinceTag: $countSinceTag,
branch: $branch,
digest: $digestS)
digest: $digestS,
moduleName: $moduleName)
}" >"$2"
4 changes: 2 additions & 2 deletions Plugins/PackageBuildInfoPlugin/plugin.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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]
Expand Down