Fixed Missing Architecture - Main Bundle

Lakr233 · Jan 12, 2022 · 5b3f596 · 5b3f596
1 parent f1121d9
commit 5b3f596
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 82 deletions.
diff --git a/Application/iridium.xcodeproj/project.pbxproj b/Application/iridium.xcodeproj/project.pbxproj
@@ -414,7 +414,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 7;
+				CURRENT_PROJECT_VERSION = 8;
 				DEVELOPMENT_TEAM = GXZ23M5TP2;
 				ENABLE_BITCODE = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -449,7 +449,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 7;
+				CURRENT_PROJECT_VERSION = 8;
 				DEVELOPMENT_TEAM = GXZ23M5TP2;
 				ENABLE_BITCODE = NO;
 				GENERATE_INFOPLIST_FILE = YES;

diff --git a/AuxiliaryAgent/build.sh b/AuxiliaryAgent/build.sh
@@ -30,10 +30,15 @@ xcodebuild \
     -scheme "$PROJECT_NAME" \
     -configuration $CONFIGURATION \
     -archivePath ./build.xcarchive \
-    -sdk iphoneos \
+    -destination "generic/platform=iOS" \
     -derivedDataPath ./ \
-    ENABLE_BITCODE=NO CODE_SIGNING_ALLOWED=NO \
-    clean archive | xcpretty
+    clean archive \
+    ARCHS="arm64 arm64e" ONLY_ACTIVE_ARCH="NO" \
+    CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGN_ENTITLEMENTS="" CODE_SIGNING_ALLOWED="NO" \
+    GCC_GENERATE_DEBUGGING_SYMBOLS=YES STRIP_INSTALLED_PRODUCT=NO \
+    ENABLE_BITCODE=NO \
+    COPY_PHASE_STRIP=NO UNSTRIPPED_PRODUCT=NO |
+    xcpretty
 
 # look for binary in archive dir and copy to build dir
 cp -f "./build.xcarchive/Products/Applications/$PROJECT_NAME.app/$PROJECT_NAME" "$PROJECT_NAME"

diff --git a/Foundation/AuxiliaryExecute/Sources/AuxiliaryExecute/AuxiliaryExecute+Async.swift b/Foundation/AuxiliaryExecute/Sources/AuxiliaryExecute/AuxiliaryExecute+Async.swift
diff --git a/Workflow/prepare.app.sh b/Workflow/prepare.app.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -ex
+set -e
 
 cd "$(dirname "$0")"
 cd ..
@@ -27,8 +27,10 @@ xcodebuild -workspace "$WORKING_LOCATION/App.xcworkspace" \
     -derivedDataPath "$WORKING_LOCATION/build/DerivedDataApp" \
     -destination 'generic/platform=iOS' \
     clean build \
+    ARCHS="arm64 arm64e" ONLY_ACTIVE_ARCH="NO" \
     CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGN_ENTITLEMENTS="" CODE_SIGNING_ALLOWED="NO" \
     GCC_GENERATE_DEBUGGING_SYMBOLS=YES STRIP_INSTALLED_PRODUCT=NO \
+    ENABLE_BITCODE=NO \
     COPY_PHASE_STRIP=NO UNSTRIPPED_PRODUCT=NO |
     xcpretty
 
@@ -76,8 +78,42 @@ cp -r "$WORKING_LOCATION/Workflow/DEBIAN" ./
 sed -i '' "s/@@VERSION@@/$CONTROL_VERSION.$BUILD_VERSION-REL-$TIMESTAMP/g" ./DEBIAN/control
 
 # fix permission
+cd "$WORKING_LOCATION/build/dpkg"
 chmod -R 0755 DEBIAN
 
+# verify every binary to have arm64 and arm64e
+echo ""
+echo "[*] Verifying binary architectures..."
+
+cd "$WORKING_LOCATION/build/dpkg"
+FILE_LIST=$(find . -type f)
+declare -a ARCH_LIST
+for FILE in $FILE_LIST; do
+    FILE_INFO=$(file "$FILE")
+    if [[ $FILE_INFO == *"Mach-O"* ]]; then
+        LIPO_INFO=$(lipo -info "$FILE")
+        if [[ $LIPO_INFO != *"arm64 arm64e"* ]]; then
+            echo "[E] invalid product"
+            echo "Please check the following line:"
+            echo "$LIPO_INFO"
+            exit 1
+        fi
+        ARCH_LIST+=("$LIPO_INFO")
+    fi
+done
+
+if [ ${#ARCH_LIST[@]} -eq 0 ]; then
+    echo "[E] Failed to load any mach objects"
+    exit 1
+fi
+echo "[*] Loaded ${#ARCH_LIST[@]} mach objects"
+for ARCH in "${ARCH_LIST[@]}"; do
+    echo "[*] $ARCH"
+done
+
+echo "[*] Packaging..."
+
+cd "$WORKING_LOCATION/build/dpkg"
 PKG_NAME="wiki.qaq.iridium.rel.ci.$TIMESTAMP.deb"
 dpkg-deb -b . "../$PKG_NAME"