Skip to content

Commit e4743e1

Browse files
authored
Update AltSign to be a submodule.
1 parent 62a8542 commit e4743e1

2 files changed

Lines changed: 10 additions & 13 deletions

File tree

Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ APP := $(TMP)/Build/Products/Release-$(PLATFORM)
77
CERT_JSON_URL := https://backloop.dev/pack.json
88
WORKSPACE := NexStore.xcworkspace
99
SOURCE_PACKAGES := $(TMP)/SourcePackages
10+
ALT_SIGN_PATH := AltSign
1011
XCODEBUILD_OVERRIDES :=
1112

1213
ifdef BUILD_NUMBER
@@ -45,7 +46,7 @@ prepare_packages: deps
4546
-clonedSourcePackagesDirPath "$(SOURCE_PACKAGES)" \
4647
-skipPackagePluginValidation
4748

48-
ALT_SIGN_CHECKOUT="$(SOURCE_PACKAGES)/checkouts/AltSign"; \
49+
ALT_SIGN_CHECKOUT="$(ALT_SIGN_PATH)"; \
4950
if [ -f "$$ALT_SIGN_CHECKOUT/.gitmodules" ]; then \
5051
git -C "$$ALT_SIGN_CHECKOUT" submodule sync --recursive; \
5152
git -C "$$ALT_SIGN_CHECKOUT" submodule update --init --recursive; \
@@ -58,7 +59,7 @@ prepare_packages: deps
5859
ln -sf ../libcnary/include/$${header##*/} "$$ALT_SIGN_LIBPLIST_SRC_DIR/$${header##*/}"; \
5960
done; \
6061
fi; \
61-
ALT_SIGN_OPENSSL_XCFRAMEWORK="$$(find "$(SOURCE_PACKAGES)" \( -path "*/Dependencies/OpenSSL.xcframework" -o -path "*/OpenSSL.xcframework" \) -type d | head -n 1)"; \
62+
ALT_SIGN_OPENSSL_XCFRAMEWORK="$$(find "$(ALT_SIGN_PATH)" "$(SOURCE_PACKAGES)" \( -path "*/Dependencies/OpenSSL.xcframework" -o -path "*/OpenSSL.xcframework" \) -type d 2>/dev/null | head -n 1)"; \
6263
if [ -z "$$ALT_SIGN_OPENSSL_XCFRAMEWORK" ]; then \
6364
echo "Expected AltSign OpenSSL.xcframework after package resolution." >&2; \
6465
exit 1; \
@@ -77,7 +78,7 @@ prepare_packages: deps
7778
$(SCHEMES): prepare_packages
7879
# Zsign expects <openssl/...> headers; reuse AltSign's vendored XCFramework to avoid a second OpenSSL copy.
7980
set -e; \
80-
ALT_SIGN_OPENSSL_XCFRAMEWORK="$$(find "$(SOURCE_PACKAGES)" \( -path "*/Dependencies/OpenSSL.xcframework" -o -path "*/OpenSSL.xcframework" \) -type d | head -n 1)"; \
81+
ALT_SIGN_OPENSSL_XCFRAMEWORK="$$(find "$(ALT_SIGN_PATH)" "$(SOURCE_PACKAGES)" \( -path "*/Dependencies/OpenSSL.xcframework" -o -path "*/OpenSSL.xcframework" \) -type d 2>/dev/null | head -n 1)"; \
8182
if [ -z "$$ALT_SIGN_OPENSSL_XCFRAMEWORK" ]; then \
8283
echo "Expected AltSign OpenSSL.xcframework after package resolution." >&2; \
8384
exit 1; \

NexStore.xcodeproj/project.pbxproj

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@
192192
33693A062DC8BF5B00730215 /* XCLocalSwiftPackageReference "AltSourceKit" */,
193193
339776052DC9D05C00642FFB /* XCRemoteSwiftPackageReference "LicensePlist" */,
194194
3349E7652DEFB46F00E317ED /* XCLocalSwiftPackageReference "IDeviceKitten" */,
195-
33F1A0A22E17B001006C1001 /* XCRemoteSwiftPackageReference "AltSign" */,
195+
33F1A0A22E17B001006C1001 /* XCLocalSwiftPackageReference "AltSign" */,
196196
);
197197
preferredProjectObjectVersion = 77;
198198
productRefGroup = 3379C1BA2DA869A1004372DA /* Products */;
@@ -529,6 +529,10 @@
529529
isa = XCLocalSwiftPackageReference;
530530
relativePath = AltSourceKit;
531531
};
532+
33F1A0A22E17B001006C1001 /* XCLocalSwiftPackageReference "AltSign" */ = {
533+
isa = XCLocalSwiftPackageReference;
534+
relativePath = AltSign;
535+
};
532536
3371F5152DA91FDC00281AC6 /* XCLocalSwiftPackageReference "Zsign" */ = {
533537
isa = XCLocalSwiftPackageReference;
534538
relativePath = Zsign;
@@ -544,14 +548,6 @@
544548
version = 4.104.0;
545549
};
546550
};
547-
33F1A0A22E17B001006C1001 /* XCRemoteSwiftPackageReference "AltSign" */ = {
548-
isa = XCRemoteSwiftPackageReference;
549-
repositoryURL = "https://github.com/SideStore/AltSign";
550-
requirement = {
551-
branch = master;
552-
kind = branch;
553-
};
554-
};
555551
3346F8372DC6C68300C7D508 /* XCRemoteSwiftPackageReference "Nuke" */ = {
556552
isa = XCRemoteSwiftPackageReference;
557553
repositoryURL = "https://github.com/kean/Nuke";
@@ -594,7 +590,7 @@
594590
};
595591
33F1A0A02E17B001006C1001 /* AltSign-Dynamic */ = {
596592
isa = XCSwiftPackageProductDependency;
597-
package = 33F1A0A22E17B001006C1001 /* XCRemoteSwiftPackageReference "AltSign" */;
593+
package = 33F1A0A22E17B001006C1001 /* XCLocalSwiftPackageReference "AltSign" */;
598594
productName = "AltSign-Dynamic";
599595
};
600596
330F68FB2DBF7C8600D8C35D /* NimbleExtensions */ = {

0 commit comments

Comments
 (0)