diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml index 08d47507..1973681b 100644 --- a/.github/workflows/beta.yml +++ b/.github/workflows/beta.yml @@ -1,16 +1,12 @@ name: Beta SideStore build on: push: - branches: - - develop + tags: + - '[0-9]+.[0-9]+.[0-9]+-beta.[0-9]+' # example: 1.0.0-beta.1 jobs: build: name: Build and upload SideStore Beta - if: startsWith(github.event.head_commit.message, '[beta]') - concurrency: - group: ${{ github.ref }} - cancel-in-progress: true strategy: fail-fast: false matrix: @@ -25,63 +21,18 @@ jobs: with: submodules: recursive - # - name: Cache rust cargo - # id: cache-rust-cargo - # uses: actions/cache@v3 - # env: - # cache-name: cache-rust-cargo - # with: - # path: ~/.cargo - # key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} - # restore-keys: | - # ${{ runner.os }}-build-${{ env.cache-name }}- - # ${{ runner.os }}-build- - # ${{ runner.os }}- - - # - name: Cache rust minimuxer - # id: cache-rust-minimuxer - # uses: actions/cache@v3 - # env: - # cache-name: cache-rust-minimuxer - # with: - # path: ./Dependencies/minimuxer/target - # key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} - # restore-keys: | - # ${{ runner.os }}-build-${{ env.cache-name }}- - # ${{ runner.os }}-build- - # ${{ runner.os }}- - - # - name: Cache rust em_proxy - # id: cache-rust-em_proxy - # uses: actions/cache@v3 - # env: - # cache-name: cache-rust-em_proxy - # with: - # path: ./Dependencies/em_proxy/target - # key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} - # restore-keys: | - # ${{ runner.os }}-build-${{ env.cache-name }}- - # ${{ runner.os }}-build- - # ${{ runner.os }}- - - name: Install dependencies run: brew install ldid - - name: Install rustup - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true - target: aarch64-apple-ios + - name: Change version to tag + run: sed -e '/MARKETING_VERSION = .*/s/= .*/= ${{ github.ref_name }}/' -i '' Build.xcconfig - # - name: Create emotional damage - # run: cd Dependencies/em_proxy && cargo build --release --target aarch64-apple-ios + - name: Get version + id: version + run: echo "version=$(grep MARKETING_VERSION Build.xcconfig | sed -e "s/MARKETING_VERSION = //g")" >> $GITHUB_OUTPUT - # - name: Build minimuxer - # run: cd Dependencies/minimuxer && cargo build --release --target aarch64-apple-ios - - - name: Add beta suffix to version - run: sed -e '/MARKETING_VERSION = .*/s/$/-beta.${{ github.run_number }}/' -i '' Build.xcconfig + - name: Echo version + run: echo "${{ steps.version.outputs.version }}" - name: Setup Xcode uses: maxim-lobanov/setup-xcode@v1.4.1 @@ -89,39 +40,25 @@ jobs: xcode-version: ${{ matrix.version }} - name: Build SideStore - run: | - xcodebuild -project AltStore.xcodeproj \ - -scheme AltStore \ - -sdk iphoneos \ - archive -archivePath ./archive \ - CODE_SIGNING_REQUIRED=NO \ - AD_HOC_CODE_SIGNING_ALLOWED=YES \ - CODE_SIGNING_ALLOWED=NO \ - DEVELOPMENT_TEAM=XYZ0123456 \ - ORG_IDENTIFIER=com.SideStore \ - | xcpretty && exit ${PIPESTATUS[0]} + run: make build | xcpretty && exit ${PIPESTATUS[0]} - name: Fakesign app - run: | - rm -rf archive.xcarchive/Products/Applications/SideStore.app/Frameworks/AltStoreCore.framework/Frameworks/ - ldid -SAltStore/Resources/tempEnt.plist archive.xcarchive/Products/Applications/SideStore.app/SideStore + run: make fakesign - name: Convert to IPA - run: | - mkdir Payload - mkdir Payload/SideStore.app - cp -R archive.xcarchive/Products/Applications/SideStore.app/ Payload/SideStore.app/ - zip -r SideStore.ipa Payload + run: make ipa - - name: Upload Artifact + - name: Upload SideStore.ipa Artifact uses: actions/upload-artifact@v3.1.0 with: - name: SideStore.ipa + name: SideStore-${{ steps.version.outputs.version }}.ipa path: SideStore.ipa - - name: Get version - id: version - run: echo "version=$(grep MARKETING_VERSION Build.xcconfig | sed -e "s/MARKETING_VERSION = //g")" >> $GITHUB_OUTPUT + - name: Upload *.dSYM Artifact + uses: actions/upload-artifact@v3.1.0 + with: + name: SideStore-dSYM + path: ./*.dSYM/ - name: Get current date id: date @@ -131,22 +68,22 @@ jobs: id: date_altstore run: echo "date=$(date -u +'%Y-%m-%d')" >> $GITHUB_OUTPUT - - name: Upload to beta release - uses: IsaacShelton/update-existing-release@v1.3.1 + - name: Upload to new beta release + uses: softprops/action-gh-release@v1 with: token: ${{ secrets.GITHUB_TOKEN }} - release: "Beta" - tag: "beta" + name: ${{ steps.version.outputs.version }} + tag_name: ${{ github.ref_name }} + draft: true prerelease: true files: SideStore.ipa body: | - This is an ⚠️ **EXPERIMENTAL** ⚠️ beta build for commit [${{ github.sha }}](https://github.com/${{ github.repository }}/commit/${{ github.sha }}). + + Beta builds are hand-picked builds from development commits that will allow you to try out new features earlier than normal. However, **they might contain bugs and other issues. Use at your own risk!** + + ## Changelog - Beta builds are hand-picked builds from development commits that will allow you to try out new features earlier than normal, but with a lower chance of bugs than if you used nightly builds. However, since these changes are newer and less tested, they still have a good chance of bugs, so **use at your own risk**. - - If you want to be on the bleeding edge and use the latest development builds, you can look at [SideStore Nightly](https://github.com/${{ github.repository }}/releases/tag/nightly). **Please be aware that these builds have a much higher chance of bugs than beta or stable**. - - If you use the `SideStore (Beta)` app, it will use the latest beta build (make sure to update it in "My Apps"). + - TODO ## Build Info diff --git a/.github/workflows/increase-nightly-build-num.sh b/.github/workflows/increase-nightly-build-num.sh new file mode 100644 index 00000000..4d152d07 --- /dev/null +++ b/.github/workflows/increase-nightly-build-num.sh @@ -0,0 +1,28 @@ +#!/usr/bin/env bash + +# Ensure we are in root directory +cd "$(dirname "$0")/../.." + +DATE=`date -u +'%Y.%m.%d'` +BUILD_NUM=1 + +write() { + sed -e "/MARKETING_VERSION = .*/s/$/-nightly.$DATE.$BUILD_NUM+$(git rev-parse --short HEAD)/" -i '' Build.xcconfig + echo "$DATE,$BUILD_NUM" > .nightly-build-num +} + +if [ ! -f ".nightly-build-num" ]; then + write + exit 0 +fi + +LAST_DATE=`cat .nightly-build-num | perl -n -e '/([^,]*),([^ ]*)$/ && print $1'` +LAST_BUILD_NUM=`cat .nightly-build-num | perl -n -e '/([^,]*),([^ ]*)$/ && print $2'` + +if [[ "$DATE" != "$LAST_DATE" ]]; then + write +else + BUILD_NUM=`expr $LAST_BUILD_NUM + 1` + write +fi + diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 2f8d62ba..96acefed 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -24,63 +24,24 @@ jobs: with: submodules: recursive - # - name: Cache rust cargo - # id: cache-rust-cargo - # uses: actions/cache@v3 - # env: - # cache-name: cache-rust-cargo - # with: - # path: ~/.cargo - # key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} - # restore-keys: | - # ${{ runner.os }}-build-${{ env.cache-name }}- - # ${{ runner.os }}-build- - # ${{ runner.os }}- - - # - name: Cache rust minimuxer - # id: cache-rust-minimuxer - # uses: actions/cache@v3 - # env: - # cache-name: cache-rust-minimuxer - # with: - # path: ./Dependencies/minimuxer/target - # key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} - # restore-keys: | - # ${{ runner.os }}-build-${{ env.cache-name }}- - # ${{ runner.os }}-build- - # ${{ runner.os }}- - - # - name: Cache rust em_proxy - # id: cache-rust-em_proxy - # uses: actions/cache@v3 - # env: - # cache-name: cache-rust-em_proxy - # with: - # path: ./Dependencies/em_proxy/target - # key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} - # restore-keys: | - # ${{ runner.os }}-build-${{ env.cache-name }}- - # ${{ runner.os }}-build- - # ${{ runner.os }}- - - name: Install dependencies run: brew install ldid - - name: Install rustup - uses: actions-rs/toolchain@v1 + - name: Cache .nightly-build-num + uses: actions/cache@v3 with: - toolchain: stable - override: true - target: aarch64-apple-ios + path: .nightly-build-num + key: nightly-build-num - # - name: Create emotional damage - # run: cd Dependencies/em_proxy && cargo build --release --target aarch64-apple-ios + - name: Increase nightly build number and set as version + run: bash .github/workflows/increase-nightly-build-num.sh - # - name: Build minimuxer - # run: cd Dependencies/minimuxer && cargo build --release --target aarch64-apple-ios + - name: Get version + id: version + run: echo "version=$(grep MARKETING_VERSION Build.xcconfig | sed -e "s/MARKETING_VERSION = //g")" >> $GITHUB_OUTPUT - - name: Add nightly suffix to version - run: sed -e '/MARKETING_VERSION = .*/s/$/-nightly.${{ github.run_number }}/' -i '' Build.xcconfig + - name: Echo version + run: echo "${{ steps.version.outputs.version }}" - name: Setup Xcode uses: maxim-lobanov/setup-xcode@v1.4.1 @@ -88,39 +49,25 @@ jobs: xcode-version: ${{ matrix.version }} - name: Build SideStore - run: | - xcodebuild -project AltStore.xcodeproj \ - -scheme AltStore \ - -sdk iphoneos \ - archive -archivePath ./archive \ - CODE_SIGNING_REQUIRED=NO \ - AD_HOC_CODE_SIGNING_ALLOWED=YES \ - CODE_SIGNING_ALLOWED=NO \ - DEVELOPMENT_TEAM=XYZ0123456 \ - ORG_IDENTIFIER=com.SideStore \ - | xcpretty && exit ${PIPESTATUS[0]} + run: make build | xcpretty && exit ${PIPESTATUS[0]} - name: Fakesign app - run: | - rm -rf archive.xcarchive/Products/Applications/SideStore.app/Frameworks/AltStoreCore.framework/Frameworks/ - ldid -SAltStore/Resources/tempEnt.plist archive.xcarchive/Products/Applications/SideStore.app/SideStore + run: make fakesign - name: Convert to IPA - run: | - mkdir Payload - mkdir Payload/SideStore.app - cp -R archive.xcarchive/Products/Applications/SideStore.app/ Payload/SideStore.app/ - zip -r SideStore.ipa Payload + run: make ipa - - name: Upload Artifact + - name: Upload SideStore.ipa Artifact uses: actions/upload-artifact@v3.1.0 with: - name: SideStore.ipa + name: SideStore-${{ steps.version.outputs.version }}.ipa path: SideStore.ipa - - name: Get version - id: version - run: echo "version=$(grep MARKETING_VERSION Build.xcconfig | sed -e "s/MARKETING_VERSION = //g")" >> $GITHUB_OUTPUT + - name: Upload *.dSYM Artifact + uses: actions/upload-artifact@v3.1.0 + with: + name: SideStore-dSYM + path: ./*.dSYM/ - name: Get current date id: date @@ -141,11 +88,9 @@ jobs: body: | This is an ⚠️ **EXPERIMENTAL** ⚠️ nightly build for commit [${{ github.sha }}](https://github.com/${{ github.repository }}/commit/${{ github.sha }}). - Nightly builds are built from the most recent commit which means you'll be able to try out new features very early. However, since these changes are much newer and less tested, they have a much higher chance of bugs, so **use at your own risk**. + Nightly builds are **extremely experimental builds only meant to be used by developers and alpha testers. They often contain bugs and experimental features. Use at your own risk!** - If you want to try out new features early but want a lower chance of bugs, you can look at [SideStore Beta](https://github.com/${{ github.repository }}/releases/tag/beta). - - If you use the `SideStore (Nightly)` app, it will use the latest nightly build (make sure to update it in "My Apps"). + If you want to try out new features early but want a lower chance of bugs, you can look at [SideStore Beta](https://github.com/${{ github.repository }}/releases?q=beta). ## Build Info @@ -153,3 +98,6 @@ jobs: Built at (UTC date): `${{ steps.date_altstore.outputs.date }}` Commit SHA: `${{ github.sha }}` Version: `${{ steps.version.outputs.version }}` + + - name: Reset cache for apps.sidestore.io/nightly + run: sleep 10 && curl https://apps.sidestore.io/reset-cache/nightly/${{ secrets.SIDESOURCE_KEY }} diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 74f32311..7e3df0eb 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -19,63 +19,20 @@ jobs: with: submodules: recursive - # - name: Cache rust cargo - # id: cache-rust-cargo - # uses: actions/cache@v3 - # env: - # cache-name: cache-rust-cargo - # with: - # path: ~/.cargo - # key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} - # restore-keys: | - # ${{ runner.os }}-build-${{ env.cache-name }}- - # ${{ runner.os }}-build- - # ${{ runner.os }}- - - # - name: Cache rust minimuxer - # id: cache-rust-minimuxer - # uses: actions/cache@v3 - # env: - # cache-name: cache-rust-minimuxer - # with: - # path: ./Dependencies/minimuxer/target - # key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} - # restore-keys: | - # ${{ runner.os }}-build-${{ env.cache-name }}- - # ${{ runner.os }}-build- - # ${{ runner.os }}- - - # - name: Cache rust em_proxy - # id: cache-rust-em_proxy - # uses: actions/cache@v3 - # env: - # cache-name: cache-rust-em_proxy - # with: - # path: ./Dependencies/em_proxy/target - # key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} - # restore-keys: | - # ${{ runner.os }}-build-${{ env.cache-name }}- - # ${{ runner.os }}-build- - # ${{ runner.os }}- - - name: Install dependencies run: brew install ldid - - name: Install rustup - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true - target: aarch64-apple-ios - - # - name: Create emotional damage - # run: cd Dependencies/em_proxy && cargo build --release --target aarch64-apple-ios - - # - name: Build minimuxer - # run: cd Dependencies/minimuxer && cargo build --release --target aarch64-apple-ios - - name: Add PR suffix to version - run: sed -e '/MARKETING_VERSION = .*/s/$/-pr.${{ github.event.pull_request.number }}/' -i '' Build.xcconfig + run: sed -e "/MARKETING_VERSION = .*/s/\$/-pr.${{ github.event.pull_request.number }}+$(git rev-parse --short ${COMMIT:-HEAD})/" -i '' Build.xcconfig + env: + COMMIT: ${{ github.event.pull_request.head.sha }} + + - name: Get version + id: version + run: echo "version=$(grep MARKETING_VERSION Build.xcconfig | sed -e "s/MARKETING_VERSION = //g")" >> $GITHUB_OUTPUT + + - name: Echo version + run: echo "${{ steps.version.outputs.version }}" - name: Setup Xcode uses: maxim-lobanov/setup-xcode@v1.4.1 @@ -83,32 +40,22 @@ jobs: xcode-version: ${{ matrix.version }} - name: Build SideStore - run: | - xcodebuild -project AltStore.xcodeproj \ - -scheme AltStore \ - -sdk iphoneos \ - archive -archivePath ./archive \ - CODE_SIGNING_REQUIRED=NO \ - AD_HOC_CODE_SIGNING_ALLOWED=YES \ - CODE_SIGNING_ALLOWED=NO \ - DEVELOPMENT_TEAM=XYZ0123456 \ - ORG_IDENTIFIER=com.SideStore \ - | xcpretty && exit ${PIPESTATUS[0]} + run: make build | xcpretty && exit ${PIPESTATUS[0]} - name: Fakesign app - run: | - rm -rf archive.xcarchive/Products/Applications/SideStore.app/Frameworks/AltStoreCore.framework/Frameworks/ - ldid -SAltStore/Resources/tempEnt.plist archive.xcarchive/Products/Applications/SideStore.app/SideStore + run: make fakesign - name: Convert to IPA - run: | - mkdir Payload - mkdir Payload/SideStore.app - cp -R archive.xcarchive/Products/Applications/SideStore.app/ Payload/SideStore.app/ - zip -r SideStore.ipa Payload + run: make ipa - - name: Upload Artifact + - name: Upload SideStore.ipa Artifact uses: actions/upload-artifact@v3.1.0 with: - name: SideStore.ipa + name: SideStore-${{ steps.version.outputs.version }}.ipa path: SideStore.ipa + + - name: Upload *.dSYM Artifact + uses: actions/upload-artifact@v3.1.0 + with: + name: SideStore-dSYM + path: ./*.dSYM/ diff --git a/.github/workflows/stable.yml b/.github/workflows/stable.yml index a49bfa42..06a759ae 100644 --- a/.github/workflows/stable.yml +++ b/.github/workflows/stable.yml @@ -2,7 +2,7 @@ name: Stable SideStore build on: push: tags: - - '[0-9]+.[0-9]+.[0-9]+*' + - '[0-9]+.[0-9]+.[0-9]+' # example: 1.0.0 jobs: build: @@ -21,60 +21,18 @@ jobs: with: submodules: recursive - # - name: Cache rust cargo - # id: cache-rust-cargo - # uses: actions/cache@v3 - # env: - # cache-name: cache-rust-cargo - # with: - # path: ~/.cargo - # key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} - # restore-keys: | - # ${{ runner.os }}-build-${{ env.cache-name }}- - # ${{ runner.os }}-build- - # ${{ runner.os }}- - - # - name: Cache rust minimuxer - # id: cache-rust-minimuxer - # uses: actions/cache@v3 - # env: - # cache-name: cache-rust-minimuxer - # with: - # path: ./Dependencies/minimuxer/target - # key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} - # restore-keys: | - # ${{ runner.os }}-build-${{ env.cache-name }}- - # ${{ runner.os }}-build- - # ${{ runner.os }}- - - # - name: Cache rust em_proxy - # id: cache-rust-em_proxy - # uses: actions/cache@v3 - # env: - # cache-name: cache-rust-em_proxy - # with: - # path: ./Dependencies/em_proxy/target - # key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} - # restore-keys: | - # ${{ runner.os }}-build-${{ env.cache-name }}- - # ${{ runner.os }}-build- - # ${{ runner.os }}- - - name: Install dependencies run: brew install ldid - - name: Install rustup - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true - target: aarch64-apple-ios + - name: Change version to tag + run: sed -e '/MARKETING_VERSION = .*/s/= .*/= ${{ github.ref_name }}/' -i '' Build.xcconfig - # - name: Create emotional damage - # run: cd Dependencies/em_proxy && cargo build --release --target aarch64-apple-ios + - name: Get version + id: version + run: echo "version=$(grep MARKETING_VERSION Build.xcconfig | sed -e "s/MARKETING_VERSION = //g")" >> $GITHUB_OUTPUT - # - name: Build minimuxer - # run: cd Dependencies/minimuxer && cargo build --release --target aarch64-apple-ios + - name: Echo version + run: echo "${{ steps.version.outputs.version }}" - name: Setup Xcode uses: maxim-lobanov/setup-xcode@v1.4.1 @@ -82,39 +40,25 @@ jobs: xcode-version: ${{ matrix.version }} - name: Build SideStore - run: | - xcodebuild -project AltStore.xcodeproj \ - -scheme AltStore \ - -sdk iphoneos \ - archive -archivePath ./archive \ - CODE_SIGNING_REQUIRED=NO \ - AD_HOC_CODE_SIGNING_ALLOWED=YES \ - CODE_SIGNING_ALLOWED=NO \ - DEVELOPMENT_TEAM=XYZ0123456 \ - ORG_IDENTIFIER=com.SideStore \ - | xcpretty && exit ${PIPESTATUS[0]} + run: make build | xcpretty && exit ${PIPESTATUS[0]} - name: Fakesign app - run: | - rm -rf archive.xcarchive/Products/Applications/SideStore.app/Frameworks/AltStoreCore.framework/Frameworks/ - ldid -SAltStore/Resources/tempEnt.plist archive.xcarchive/Products/Applications/SideStore.app/SideStore + run: make fakesign - name: Convert to IPA - run: | - mkdir Payload - mkdir Payload/SideStore.app - cp -R archive.xcarchive/Products/Applications/SideStore.app/ Payload/SideStore.app/ - zip -r SideStore.ipa Payload + run: make ipa - - name: Upload Artifact + - name: Upload SideStore.ipa Artifact uses: actions/upload-artifact@v3.1.0 with: - name: SideStore.ipa + name: SideStore-${{ steps.version.outputs.version }}.ipa path: SideStore.ipa - - name: Get version - id: version - run: echo "version=$(grep MARKETING_VERSION Build.xcconfig | sed -e "s/MARKETING_VERSION = //g")" >> $GITHUB_OUTPUT + - name: Upload *.dSYM Artifact + uses: actions/upload-artifact@v3.1.0 + with: + name: SideStore-dSYM + path: ./*.dSYM/ - name: Get current date id: date @@ -129,10 +73,11 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} name: ${{ steps.version.outputs.version }} - tag_name: ${{ github.ref }} + tag_name: ${{ github.ref_name }} draft: true files: SideStore.ipa body: | + ## Changelog - TODO diff --git a/.gitignore b/.gitignore index d750188a..9e0fcf89 100644 --- a/.gitignore +++ b/.gitignore @@ -33,4 +33,14 @@ xcuserdata /.vscode ## AppCode specific -.idea/ \ No newline at end of file +.idea/ + +Payload/ +SideStore.ipa +*.dSYM + +Dependencies/.*-prebuilt-fetch-* +Dependencies/minimuxer/* +Dependencies/em_proxy/* +!Dependencies/**/.gitkeep +.nightly-build-num diff --git a/.gitmodules b/.gitmodules index c40a8c62..4ca1ebdb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,15 +13,9 @@ [submodule "Dependencies/MarkdownAttributedString"] path = Dependencies/MarkdownAttributedString url = https://github.com/chockenberry/MarkdownAttributedString.git -[submodule "Dependencies/em_proxy"] - path = Dependencies/em_proxy - url = https://github.com/jkcoxson/em_proxy [submodule "Dependencies/libimobiledevice-glue"] path = Dependencies/libimobiledevice-glue url = https://github.com/libimobiledevice/libimobiledevice-glue -[submodule "Dependencies/minimuxer"] - path = Dependencies/minimuxer - url = https://github.com/SideStore/minimuxer [submodule "Dependencies/libfragmentzip"] path = Dependencies/libfragmentzip url = https://github.com/SideStore/libfragmentzip.git diff --git a/AltStore.xcconfig b/AltStore.xcconfig index b2085eae..3366003e 100644 --- a/AltStore.xcconfig +++ b/AltStore.xcconfig @@ -1,3 +1,3 @@ #include "Build.xcconfig" -PRODUCT_BUNDLE_IDENTIFIER = $(ORG_PREFIX).$(PRODUCT_NAME) +PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_BUNDLE_IDENTIFIER) diff --git a/AltStore.xcodeproj/project.pbxproj b/AltStore.xcodeproj/project.pbxproj index eddae504..2c261805 100644 --- a/AltStore.xcodeproj/project.pbxproj +++ b/AltStore.xcodeproj/project.pbxproj @@ -11,12 +11,10 @@ 19104D952909BAEA00C49C7B /* libimobiledevice.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BF45872B2298D31600BD7491 /* libimobiledevice.a */; }; 19104DB52909C06D00C49C7B /* EmotionalDamage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19104DB42909C06D00C49C7B /* EmotionalDamage.swift */; }; 19104DBC2909C4E500C49C7B /* libEmotionalDamage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 19104DB22909C06C00C49C7B /* libEmotionalDamage.a */; }; - 191E5FAE290A5D92001A3B7C /* minimuxer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191E5FAD290A5D92001A3B7C /* minimuxer.swift */; }; 191E5FB4290A5DA0001A3B7C /* libminimuxer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 191E5FAB290A5D92001A3B7C /* libminimuxer.a */; }; 191E5FDC290AFA5C001A3B7C /* OpenSSL in Frameworks */ = {isa = PBXBuildFile; productRef = 191E5FDB290AFA5C001A3B7C /* OpenSSL */; }; 191E607D290B2EA5001A3B7C /* jsmn.c in Sources */ = {isa = PBXBuildFile; fileRef = 191E5FD0290A651D001A3B7C /* jsmn.c */; }; 191E607E290B2EA7001A3B7C /* jplist.c in Sources */ = {isa = PBXBuildFile; fileRef = 191E5FCF290A651D001A3B7C /* jplist.c */; }; - 191E6087290C7B50001A3B7C /* libminimuxer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 191E5FB5290A5E1F001A3B7C /* libminimuxer.a */; }; 1920B04F2924AC8300744F60 /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 1920B04E2924AC8300744F60 /* Settings.bundle */; }; 19B9B7452845E6DF0076EF69 /* SelectTeamViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19B9B7442845E6DF0076EF69 /* SelectTeamViewController.swift */; }; 1F07F550295455A300F7BE95 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 1F07F552295455A300F7BE95 /* Localizable.strings */; }; @@ -84,6 +82,9 @@ 4879A95F2861046500FC1BBD /* AltSign in Frameworks */ = {isa = PBXBuildFile; productRef = 4879A95E2861046500FC1BBD /* AltSign */; }; 4879A9622861049C00FC1BBD /* OpenSSL in Frameworks */ = {isa = PBXBuildFile; productRef = 4879A9612861049C00FC1BBD /* OpenSSL */; }; 99C4EF4D2979132100CB538D /* SemanticVersion in Frameworks */ = {isa = PBXBuildFile; productRef = 99C4EF4C2979132100CB538D /* SemanticVersion */; }; + 99F87D0529D8B4E200B40039 /* minimuxer-helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9961EC2D29BE9F2E00AF2C6F /* minimuxer-helpers.swift */; }; + 99F87D1829D8E4C900B40039 /* SwiftBridgeCore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99F87D1629D8E4C900B40039 /* SwiftBridgeCore.swift */; }; + 99F87D1929D8E4C900B40039 /* minimuxer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99F87D1729D8E4C900B40039 /* minimuxer.swift */; }; B3146ED2284F581E00BBC3FD /* Roxas.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B3146ECD284F580500BBC3FD /* Roxas.framework */; }; B3146ED3284F581E00BBC3FD /* Roxas.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B3146ECD284F580500BBC3FD /* Roxas.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; B33FFBA8295F8E98002259E6 /* libfragmentzip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B343F894295F7F9B002B1159 /* libfragmentzip.a */; }; @@ -563,16 +564,12 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 19104DA92909BC7100C49C7B /* em_proxy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = em_proxy.h; sourceTree = ""; }; 19104DB22909C06C00C49C7B /* libEmotionalDamage.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libEmotionalDamage.a; sourceTree = BUILT_PRODUCTS_DIR; }; 19104DB42909C06D00C49C7B /* EmotionalDamage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmotionalDamage.swift; sourceTree = ""; }; 191E5FAB290A5D92001A3B7C /* libminimuxer.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libminimuxer.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 191E5FAD290A5D92001A3B7C /* minimuxer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = minimuxer.swift; sourceTree = ""; }; - 191E5FB5290A5E1F001A3B7C /* libminimuxer.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libminimuxer.a; path = "Dependencies/minimuxer/target/aarch64-apple-ios/debug/libminimuxer.a"; sourceTree = ""; }; 191E5FCF290A651D001A3B7C /* jplist.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jplist.c; path = Dependencies/libplist/src/jplist.c; sourceTree = SOURCE_ROOT; }; 191E5FD0290A651D001A3B7C /* jsmn.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jsmn.c; path = Dependencies/libplist/src/jsmn.c; sourceTree = SOURCE_ROOT; }; 191E5FD1290A651D001A3B7C /* jsmn.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jsmn.h; path = Dependencies/libplist/src/jsmn.h; sourceTree = SOURCE_ROOT; }; - 191E5FD7290A6EFB001A3B7C /* minimuxer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = minimuxer.h; path = ../Dependencies/minimuxer/minimuxer.h; sourceTree = ""; }; 1920B04E2924AC8300744F60 /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = ""; }; 19B9B7442845E6DF0076EF69 /* SelectTeamViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectTeamViewController.swift; sourceTree = ""; }; 1F07F551295455A300F7BE95 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = ""; }; @@ -633,6 +630,9 @@ 1FB96FF2292D0539007E68D1 /* PillButtonProgressViewStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PillButtonProgressViewStyle.swift; sourceTree = ""; }; 1FFA56C1299994390011B6F5 /* OutputCapturer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OutputCapturer.swift; sourceTree = ""; }; 1FFEF103298552DB0098374C /* AppVersionHistoryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppVersionHistoryView.swift; sourceTree = ""; }; + 9961EC2D29BE9F2E00AF2C6F /* minimuxer-helpers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "minimuxer-helpers.swift"; path = "Dependencies/minimuxer/minimuxer-helpers.swift"; sourceTree = SOURCE_ROOT; }; + 99F87D1629D8E4C900B40039 /* SwiftBridgeCore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SwiftBridgeCore.swift; path = Dependencies/minimuxer/SwiftBridgeCore.swift; sourceTree = SOURCE_ROOT; }; + 99F87D1729D8E4C900B40039 /* minimuxer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = minimuxer.swift; path = Dependencies/minimuxer/minimuxer.swift; sourceTree = SOURCE_ROOT; }; B3146EC6284F580500BBC3FD /* Roxas.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Roxas.xcodeproj; path = Dependencies/Roxas/Roxas.xcodeproj; sourceTree = ""; }; B33FFBA9295F8F78002259E6 /* preboard.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = preboard.c; path = src/preboard.c; sourceTree = ""; }; B33FFBAB295F8F98002259E6 /* companion_proxy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = companion_proxy.c; path = src/companion_proxy.c; sourceTree = ""; }; @@ -1038,7 +1038,6 @@ buildActionMask = 2147483647; files = ( B33FFBA8295F8E98002259E6 /* libfragmentzip.a in Frameworks */, - 191E6087290C7B50001A3B7C /* libminimuxer.a in Frameworks */, 191E5FB4290A5DA0001A3B7C /* libminimuxer.a in Frameworks */, 19104DBC2909C4E500C49C7B /* libEmotionalDamage.a in Frameworks */, 1F1295812989B51F0048FCB9 /* ExpandableText in Frameworks */, @@ -1065,7 +1064,6 @@ isa = PBXGroup; children = ( B343F84D295F6323002B1159 /* em_proxy.xcodeproj */, - 19104DA92909BC7100C49C7B /* em_proxy.h */, 19104DB42909C06D00C49C7B /* EmotionalDamage.swift */, ); path = EmotionalDamage; @@ -1074,9 +1072,9 @@ 191E5FAC290A5D92001A3B7C /* minimuxer */ = { isa = PBXGroup; children = ( + 9961EC2D29BE9F2E00AF2C6F /* minimuxer-helpers.swift */, + 99F87D1429D8E3F100B40039 /* Generated */, B343F847295F6321002B1159 /* minimuxer.xcodeproj */, - 191E5FD7290A6EFB001A3B7C /* minimuxer.h */, - 191E5FAD290A5D92001A3B7C /* minimuxer.swift */, ); path = minimuxer; sourceTree = ""; @@ -1270,6 +1268,13 @@ 1F0DD8442936B3FE007608A4 /* FilledButtonStyle.swift */, ); path = Styles; + 99F87D1429D8E3F100B40039 /* Generated */ = { + isa = PBXGroup; + children = ( + 99F87D1629D8E4C900B40039 /* SwiftBridgeCore.swift */, + 99F87D1729D8E4C900B40039 /* minimuxer.swift */, + ); + name = Generated; sourceTree = ""; }; B3146EC7284F580500BBC3FD /* Products */ = { @@ -1879,7 +1884,6 @@ isa = PBXGroup; children = ( B343F86C295F759E002B1159 /* libresolv.tbd */, - 191E5FB5290A5E1F001A3B7C /* libminimuxer.a */, B39575F4284F29E20080B4FF /* Roxas.framework */, D533E8B62727841800A9B5DD /* libAppleArchive.tbd */, BF580497246A3D19008AE704 /* UIKit.framework */, @@ -2082,13 +2086,6 @@ /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ - 191E5FD4290A6EE0001A3B7C /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; BF4587272298D31600BD7491 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -2169,7 +2166,6 @@ isa = PBXNativeTarget; buildConfigurationList = 191E5FAF290A5D92001A3B7C /* Build configuration list for PBXNativeTarget "minimuxer" */; buildPhases = ( - 191E5FD4290A6EE0001A3B7C /* Headers */, 191E5FA7290A5D92001A3B7C /* Sources */, 191E5FA8290A5D92001A3B7C /* Frameworks */, ); @@ -2286,6 +2282,7 @@ isa = PBXNativeTarget; buildConfigurationList = BFD2477E2284B9A700981D42 /* Build configuration list for PBXNativeTarget "SideStore" */; buildPhases = ( + 99F87D0629D8B51400B40039 /* ShellScript */, BFD247662284B9A500981D42 /* Sources */, BFD247672284B9A500981D42 /* Frameworks */, BFD247682284B9A500981D42 /* Resources */, @@ -2547,6 +2544,27 @@ }; /* End PBXResourcesBuildPhase section */ +/* Begin PBXShellScriptBuildPhase section */ + 99F87D0629D8B51400B40039 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + outputFileListPaths = ( + ); + outputPaths = ( + "./Dependencies/minimuxer/minimuxer-helpers.swift", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "bash ./Dependencies/fetch-prebuilt.sh minimuxer\n"; + }; +/* End PBXShellScriptBuildPhase section */ + /* Begin PBXSourcesBuildPhase section */ 19104DAE2909C06C00C49C7B /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -2560,7 +2578,8 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 191E5FAE290A5D92001A3B7C /* minimuxer.swift in Sources */, + 99F87D1929D8E4C900B40039 /* minimuxer.swift in Sources */, + 99F87D1829D8E4C900B40039 /* SwiftBridgeCore.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2846,6 +2865,7 @@ BFB39B5C252BC10E00D1BE50 /* Managed.swift in Sources */, BF770E5822BC3D0F002A40FE /* RefreshGroup.swift in Sources */, 19B9B7452845E6DF0076EF69 /* SelectTeamViewController.swift in Sources */, + 99F87D0529D8B4E200B40039 /* minimuxer-helpers.swift in Sources */, BF18B0F122E25DF9005C4CF5 /* ToastView.swift in Sources */, BF3D649F22E7B24C00E9056B /* CollapsingTextView.swift in Sources */, BF02419622F2199300129732 /* RefreshAttemptsViewController.swift in Sources */, @@ -3007,15 +3027,14 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "$(PROJECT_DIR)/Dependencies/em_proxy/target/aarch64-apple-ios/release", - "$(PROJECT_DIR)/Dependencies/em_proxy/target/aarch64-apple-ios/debug", + "$(PROJECT_DIR)/Dependencies/em_proxy", ); MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OBJC_BRIDGING_HEADER = EmotionalDamage/em_proxy.h; + SWIFT_OBJC_BRIDGING_HEADER = Dependencies/em_proxy/em_proxy.h; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TVOS_DEPLOYMENT_TARGET = 14.0; @@ -3034,14 +3053,13 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "$(PROJECT_DIR)/Dependencies/em_proxy/target/aarch64-apple-ios/release", - "$(PROJECT_DIR)/Dependencies/em_proxy/target/aarch64-apple-ios/debug", + "$(PROJECT_DIR)/Dependencies/em_proxy", ); MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - SWIFT_OBJC_BRIDGING_HEADER = EmotionalDamage/em_proxy.h; + SWIFT_OBJC_BRIDGING_HEADER = Dependencies/em_proxy/em_proxy.h; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TVOS_DEPLOYMENT_TARGET = 14.0; @@ -3061,14 +3079,13 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "$(PROJECT_DIR)/Dependencies/minimuxer/target/aarch64-apple-ios/release", - "$(PROJECT_DIR)/Dependencies/minimuxer/target/aarch64-apple-ios/debug", + "$(PROJECT_DIR)/Dependencies/minimuxer", ); OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OBJC_BRIDGING_HEADER = minimuxer/minimuxer.h; + SWIFT_OBJC_BRIDGING_HEADER = "Dependencies/minimuxer/minimuxer-Bridging-Header.h"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -3085,13 +3102,12 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "$(PROJECT_DIR)/Dependencies/minimuxer/target/aarch64-apple-ios/release", - "$(PROJECT_DIR)/Dependencies/minimuxer/target/aarch64-apple-ios/debug", + "$(PROJECT_DIR)/Dependencies/minimuxer", ); OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - SWIFT_OBJC_BRIDGING_HEADER = minimuxer/minimuxer.h; + SWIFT_OBJC_BRIDGING_HEADER = "Dependencies/minimuxer/minimuxer-Bridging-Header.h"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -3594,8 +3610,6 @@ "$(inherited)", "$(PROJECT_DIR)/Dependencies/fragmentzip", "$(PROJECT_DIR)/Dependencies/libcurl", - "$(PROJECT_DIR)/Dependencies/minimuxer/target/aarch64-apple-ios/debug", - "$(PROJECT_DIR)/Dependencies/minimuxer/target/aarch64-apple-ios/release", ); PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_BUNDLE_IDENTIFIER)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -3631,8 +3645,6 @@ "$(inherited)", "$(PROJECT_DIR)/Dependencies/fragmentzip", "$(PROJECT_DIR)/Dependencies/libcurl", - "$(PROJECT_DIR)/Dependencies/minimuxer/target/aarch64-apple-ios/debug", - "$(PROJECT_DIR)/Dependencies/minimuxer/target/aarch64-apple-ios/release", ); PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_BUNDLE_IDENTIFIER)"; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/AltStore/Info.plist b/AltStore/Info.plist index 2b4b48de..a54f4f93 100644 --- a/AltStore/Info.plist +++ b/AltStore/Info.plist @@ -14,7 +14,7 @@ ALTPairingFile <insert pairing file here> ALTAnisetteURL - https://sideloadly.io/anisette/irGb3Quww8zrhgqnzmrx + https://ani.sidestore.io CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDocumentTypes diff --git a/AltStore/LaunchViewController.swift b/AltStore/LaunchViewController.swift index 918b4c30..cc028720 100644 --- a/AltStore/LaunchViewController.swift +++ b/AltStore/LaunchViewController.swift @@ -15,6 +15,8 @@ import minimuxer import AltStoreCore import UniformTypeIdentifiers +let pairingFileName = "ALTPairingFile.mobiledevicepairing" + final class LaunchViewController: RSTLaunchViewController, UIDocumentPickerDelegate { private var didFinishLaunching = false @@ -83,7 +85,7 @@ final class LaunchViewController: RSTLaunchViewController, UIDocumentPickerDeleg } else { // Show an alert explaining the pairing file // Create new Alert - let dialogMessage = UIAlertController(title: "Pairing File", message: "Select the pairing file for your device. For more information, go to https://youtu.be/dQw4w9WgXcQ", preferredStyle: .alert) + let dialogMessage = UIAlertController(title: "Pairing File", message: "Select the pairing file for your device. For more information, go to https://wiki.sidestore.io/guides/install#pairing-process", preferredStyle: .alert) // Create OK button with action handler let ok = UIAlertAction(title: "OK", style: .default, handler: { (action) -> Void in @@ -129,14 +131,11 @@ final class LaunchViewController: RSTLaunchViewController, UIDocumentPickerDeleg } // Save to a file for next launch - let filename = "ALTPairingFile.mobiledevicepairing" - let fm = FileManager.default - let documentsPath = fm.documentsDirectory.appendingPathComponent("/\(filename)") - try pairing_string?.write(to: documentsPath, atomically: true, encoding: String.Encoding.utf8) + let pairingFile = FileManager.default.documentsDirectory.appendingPathComponent("\(pairingFileName)") + try pairing_string?.write(to: pairingFile, atomically: true, encoding: String.Encoding.utf8) // Start minimuxer now that we have a file start_minimuxer_threads(pairing_string!) - } catch { displayError("Unable to read pairing file") } @@ -152,22 +151,15 @@ final class LaunchViewController: RSTLaunchViewController, UIDocumentPickerDeleg } func start_minimuxer_threads(_ pairing_file: String) { - set_usbmuxd_socket() - #if false // Retries - var res = start_minimuxer(pairing_file: pairing_file) - var attempts = 10 - while (attempts != 0 && res != 0) { - print("start_minimuxer `res` != 0, retry #\(attempts)") - res = start_minimuxer(pairing_file: pairing_file) - attempts -= 1 + target_minimuxer_address() + let documentsDirectory = FileManager.default.documentsDirectory.absoluteString + do { + try start(pairing_file, documentsDirectory) + } catch { + try! FileManager.default.removeItem(at: FileManager.default.documentsDirectory.appendingPathComponent("\(pairingFileName)")) + displayError("minimuxer failed to start, please restart SideStore. \(minimuxerToOperationError(error).failureReason ?? "UNKNOWN ERROR!!!!!! REPORT TO GITHUB ISSUES!")") } - #else - let res = start_minimuxer(pairing_file: pairing_file) - #endif - if res != 0 { - displayError("minimuxer failed to start. Incorrect arguments were passed.") - } - auto_mount_dev_image() + start_auto_mounter(documentsDirectory) } } diff --git a/AltStore/Managing Apps/AppManager.swift b/AltStore/Managing Apps/AppManager.swift index d85fa339..f6fb71ce 100644 --- a/AltStore/Managing Apps/AppManager.swift +++ b/AltStore/Managing Apps/AppManager.swift @@ -392,7 +392,8 @@ extension AppManager func fetchAppIDs(completionHandler: @escaping (Result<([AppID], NSManagedObjectContext), Error>) -> Void) { let authenticationOperation = self.authenticate(presentingViewController: nil) { (result) in - print("Authenticated for fetching App IDs with result:", result) + // result contains name, email, auth token, OTP and other possibly personal/account specific info. we don't want this logged + //print("Authenticated for fetching App IDs with result:", result) } let fetchAppIDsOperation = FetchAppIDsOperation(context: authenticationOperation.context) @@ -873,7 +874,11 @@ private extension AppManager // Check if backup app is installed in place of real app. let uti = UTTypeCopyDeclaration(app.installedBackupAppUTI as CFString)?.takeRetainedValue() as NSDictionary? - if app.certificateSerialNumber != group.context.certificate?.serialNumber || + // for some reason, `app.certificateSerialNumber != group.context.certificate?.serialNumber` is true on first SideStore refresh + // in most cases, the first refresh gets stuck since it is a full reinstall, and to fix it you must exit to home screen + // which finishes it but removes all app data + // so we want to ensure we don't reinstall for SideStore if it's true (it will still reinstall if needsResign is true) + if (app.certificateSerialNumber != group.context.certificate?.serialNumber && app.bundleIdentifier != StoreApp.altstoreAppID) || uti != nil || app.needsResign { diff --git a/AltStore/Operations/DeactivateAppOperation.swift b/AltStore/Operations/DeactivateAppOperation.swift index e96d1fee..5742ec87 100644 --- a/AltStore/Operations/DeactivateAppOperation.swift +++ b/AltStore/Operations/DeactivateAppOperation.swift @@ -44,14 +44,9 @@ final class DeactivateAppOperation: ResultOperation for profile in allIdentifiers { do { - let res = try remove_provisioning_profile(id: profile) - if case Uhoh.Bad(let code) = res { - self.finish(.failure(minimuxer_to_operation(code: code))) - } - } catch Uhoh.Bad(let code) { - self.finish(.failure(minimuxer_to_operation(code: code))) + try remove_provisioning_profile(profile) } catch { - self.finish(.failure(ALTServerError(.unknownResponse))) + return self.finish(.failure(minimuxerToOperationError(error))) } } diff --git a/AltStore/Operations/EnableJITOperation.swift b/AltStore/Operations/EnableJITOperation.swift index f89296bf..1848109b 100644 --- a/AltStore/Operations/EnableJITOperation.swift +++ b/AltStore/Operations/EnableJITOperation.swift @@ -45,23 +45,13 @@ final class EnableJITOperation: ResultOperation guard let installedApp = self.context.installedApp else { return self.finish(.failure(OperationError.invalidParameters)) } installedApp.managedObjectContext?.perform { - let v = minimuxer_to_operation(code: 1) - do { - var x = try debug_app(app_id: installedApp.resignedBundleIdentifier) - switch x { - case .Good: - self.finish(.success(())) - case .Bad(let code): - self.finish(.failure(minimuxer_to_operation(code: code))) - } - } catch Uhoh.Bad(let code) { - self.finish(.failure(minimuxer_to_operation(code: code))) + try debug_app(installedApp.resignedBundleIdentifier) } catch { - self.finish(.failure(OperationError.unknown)) + return self.finish(.failure(minimuxerToOperationError(error))) } - + self.finish(.success(())) } } } diff --git a/AltStore/Operations/FetchProvisioningProfilesOperation.swift b/AltStore/Operations/FetchProvisioningProfilesOperation.swift index e7b0eb30..955282f4 100644 --- a/AltStore/Operations/FetchProvisioningProfilesOperation.swift +++ b/AltStore/Operations/FetchProvisioningProfilesOperation.swift @@ -384,6 +384,16 @@ extension FetchProvisioningProfilesOperation if app.isAltStoreApp { + print("Application groups before modifying for SideStore: \(applicationGroups)") + + // Remove app groups that contain AltStore since they can be problematic (cause SideStore to expire early) + for (index, group) in applicationGroups.enumerated() { + if group.contains("AltStore") { + print("Removing application group: \(group)") + applicationGroups.remove(at: index) + } + } + // Potentially updating app groups for this specific AltStore. // Find the (unique) AltStore app group, then replace it // with the correct "base" app group ID. @@ -397,6 +407,7 @@ extension FetchProvisioningProfilesOperation applicationGroups.append(Bundle.baseAltStoreAppGroupID) } } + print("Application groups: \(applicationGroups)") // Dispatch onto global queue to prevent appGroupsLock deadlock. DispatchQueue.global().async { @@ -478,10 +489,13 @@ extension FetchProvisioningProfilesOperation ALTAppleAPI.shared.delete(profile, for: team, session: session) { (success, error) in switch Result(success, error) { - case .failure(let error): completionHandler(.failure(error)) - case .success: + case .failure: + // As of March 20, 2023, the free provisioning profile is re-generated each fetch, and you can no longer delete it. + // So instead, we just return the fetched profile from above. + completionHandler(.success(profile)) - // Fetch new provisiong profile + case .success: + // Fetch new provisioning profile ALTAppleAPI.shared.fetchProvisioningProfile(for: appID, deviceType: .iphone, team: team, session: session) { (profile, error) in completionHandler(Result(profile, error)) } diff --git a/AltStore/Operations/InstallAppOperation.swift b/AltStore/Operations/InstallAppOperation.swift index f10c1272..c9ef8d50 100644 --- a/AltStore/Operations/InstallAppOperation.swift +++ b/AltStore/Operations/InstallAppOperation.swift @@ -11,6 +11,7 @@ import Network import AltStoreCore import AltSign import Roxas +import minimuxer @objc(InstallAppOperation) final class InstallAppOperation: ResultOperation @@ -148,17 +149,14 @@ final class InstallAppOperation: ResultOperation }) } - let ns_bundle = NSString(string: installedApp.bundleIdentifier) - let ns_bundle_ptr = UnsafeMutablePointer(mutating: ns_bundle.utf8String) - - let res = minimuxer_install_ipa(ns_bundle_ptr) - if res == 0 { - installedApp.refreshedDate = Date() - self.finish(.success(installedApp)) - - } else { - self.finish(.failure(minimuxer_to_operation(code: res))) + do { + try install_ipa(installedApp.bundleIdentifier) + } catch { + return self.finish(.failure(minimuxerToOperationError(error))) } + + installedApp.refreshedDate = Date() + self.finish(.success(installedApp)) } } @@ -174,10 +172,11 @@ final class InstallAppOperation: ResultOperation do { try FileManager.default.removeItem(at: fileURL) + print("Removed refreshed IPA") } catch { - print("Failed to remove refreshed .ipa:", error) + print("Failed to remove refreshed .ipa: \(error)") } } diff --git a/AltStore/Operations/OperationError.swift b/AltStore/Operations/OperationError.swift index 9d118a82..4e7a86b2 100644 --- a/AltStore/Operations/OperationError.swift +++ b/AltStore/Operations/OperationError.swift @@ -8,6 +8,7 @@ import Foundation import AltSign +import minimuxer enum OperationError: LocalizedError { @@ -42,9 +43,11 @@ enum OperationError: LocalizedError case uninstall case lookupApps case detach + case attach case functionArguments - case profileInstall + case profileManage case noConnection + case invalidPairingFile var failureReason: String? { switch self { @@ -70,9 +73,11 @@ enum OperationError: LocalizedError case .uninstall: return NSLocalizedString("Unable to uninstall the app", comment: "") case .lookupApps: return NSLocalizedString("Unable to fetch apps from the device", comment: "") case .detach: return NSLocalizedString("Unable to detach from the app's process", comment: "") + case .attach: return NSLocalizedString("Unable to attach to the app's process", comment: "") case .functionArguments: return NSLocalizedString("A function was passed invalid arguments", comment: "") - case .profileInstall: return NSLocalizedString("Unable to manage profiles on the device", comment: "") + case .profileManage: return NSLocalizedString("Unable to manage profiles on the device", comment: "") case .noConnection: return NSLocalizedString("Unable to connect to the device, make sure Wireguard is enabled and you're connected to WiFi", comment: "") + case .invalidPairingFile: return NSLocalizedString("Invalid pairing file. Your pairing file either didn't have a UDID, or it wasn't a valid plist. Please use jitterbugpair to generate it", comment: "") } } @@ -118,49 +123,50 @@ enum OperationError: LocalizedError } } -func minimuxer_to_operation(code: Int32) -> OperationError { - switch code { - case -1: +/// crashes if error is not a MinimuxerError +func minimuxerToOperationError(_ error: Error) -> OperationError { + switch error as! MinimuxerError { + case .NoDevice: return OperationError.noDevice - case -2: - return OperationError.createService(name: "debug") - case -3: - return OperationError.createService(name: "instproxy") - case -4: - return OperationError.getFromDevice(name: "installed apps") - case -5: - return OperationError.getFromDevice(name: "path to the app") - case -6: - return OperationError.getFromDevice(name: "bundle path") - case -7: - return OperationError.setArgument(name: "max packet") - case -8: - return OperationError.setArgument(name: "working directory") - case -9: - return OperationError.setArgument(name: "argv") - case -10: - return OperationError.getFromDevice(name: "launch success") - case -11: - return OperationError.detach - case -12: - return OperationError.functionArguments - case -13: - return OperationError.createService(name: "AFC") - case -14: - return OperationError.afc - case -15: - return OperationError.install - case -16: - return OperationError.uninstall - case -17: - return OperationError.createService(name: "misagent") - case -18: - return OperationError.profileInstall - case -19: - return OperationError.profileInstall - case -20: + case .NoConnection: return OperationError.noConnection - default: - return OperationError.unknown + case .PairingFile: + return OperationError.invalidPairingFile + case .CreateDebug: + return OperationError.createService(name: "debug") + case .CreateInstproxy: + return OperationError.createService(name: "instproxy") + case .LookupApps: + return OperationError.getFromDevice(name: "installed apps") + case .FindApp: + return OperationError.getFromDevice(name: "path to the app") + case .BundlePath: + return OperationError.getFromDevice(name: "bundle path") + case .MaxPacket: + return OperationError.setArgument(name: "max packet") + case .WorkingDirectory: + return OperationError.setArgument(name: "working directory") + case .Argv: + return OperationError.setArgument(name: "argv") + case .LaunchSuccess: + return OperationError.getFromDevice(name: "launch success") + case .Detach: + return OperationError.detach + case .Attach: + return OperationError.attach + case .CreateAfc: + return OperationError.createService(name: "AFC") + case .RwAfc: + return OperationError.afc + case .InstallApp: + return OperationError.install + case .UninstallApp: + return OperationError.uninstall + case .CreateMisagent: + return OperationError.createService(name: "misagent") + case .ProfileInstall: + return OperationError.profileManage + case .ProfileRemove: + return OperationError.profileManage } } diff --git a/AltStore/Operations/RefreshAppOperation.swift b/AltStore/Operations/RefreshAppOperation.swift index 084e281c..7747d237 100644 --- a/AltStore/Operations/RefreshAppOperation.swift +++ b/AltStore/Operations/RefreshAppOperation.swift @@ -49,15 +49,12 @@ final class RefreshAppOperation: ResultOperation for p in profiles { do { - let x = try install_provisioning_profile(plist: p.value.data) - if case .Bad(let code) = x { - self.finish(.failure(minimuxer_to_operation(code: code))) - } - } catch Uhoh.Bad(let code) { - self.finish(.failure(minimuxer_to_operation(code: code))) + let bytes = p.value.data.toRustByteSlice() + try install_provisioning_profile(bytes.forRust()) } catch { - self.finish(.failure(OperationError.unknown)) + return self.finish(.failure(minimuxerToOperationError(error))) } + self.progress.completedUnitCount += 1 let predicate = NSPredicate(format: "%K == %@", #keyPath(InstalledApp.bundleIdentifier), app.bundleIdentifier) diff --git a/AltStore/Operations/RemoveAppOperation.swift b/AltStore/Operations/RemoveAppOperation.swift index 6ec3cba4..042828ec 100644 --- a/AltStore/Operations/RemoveAppOperation.swift +++ b/AltStore/Operations/RemoveAppOperation.swift @@ -39,15 +39,11 @@ final class RemoveAppOperation: ResultOperation let resignedBundleIdentifier = installedApp.resignedBundleIdentifier do { - let res = try remove_app(app_id: resignedBundleIdentifier) - if case Uhoh.Bad(let code) = res { - self.finish(.failure(minimuxer_to_operation(code: code))) - } - } catch Uhoh.Bad(let code) { - self.finish(.failure(minimuxer_to_operation(code: code))) + try remove_app(resignedBundleIdentifier) } catch { - self.finish(.failure(ALTServerError(.appDeletionFailed))) + return self.finish(.failure(minimuxerToOperationError(error))) } + DatabaseManager.shared.persistentContainer.performBackgroundTask { (context) in self.progress.completedUnitCount += 1 diff --git a/AltStore/Operations/ResignAppOperation.swift b/AltStore/Operations/ResignAppOperation.swift index 8be28221..a6098e00 100644 --- a/AltStore/Operations/ResignAppOperation.swift +++ b/AltStore/Operations/ResignAppOperation.swift @@ -61,6 +61,7 @@ final class ResignAppOperation: ResultOperation { let destinationURL = InstalledApp.refreshedIPAURL(for: app) try FileManager.default.copyItem(at: resignedURL, to: destinationURL, shouldReplace: true) + print("Successfully resigned app to \(destinationURL.absoluteString)") // Use appBundleURL since we need an app bundle, not .ipa. guard let resignedApplication = ALTApplication(fileURL: appBundleURL) else { throw OperationError.invalidApp } diff --git a/AltStore/Operations/SendAppOperation.swift b/AltStore/Operations/SendAppOperation.swift index fb239ba1..dd366968 100644 --- a/AltStore/Operations/SendAppOperation.swift +++ b/AltStore/Operations/SendAppOperation.swift @@ -9,6 +9,7 @@ import Foundation import Network import AltStoreCore +import minimuxer @objc(SendAppOperation) final class SendAppOperation: ResultOperation<()> @@ -44,24 +45,18 @@ final class SendAppOperation: ResultOperation<()> print("AFC App `fileURL`: \(fileURL.absoluteString)") - let ns_bundle = NSString(string: app.bundleIdentifier) - let ns_bundle_ptr = UnsafeMutablePointer(mutating: ns_bundle.utf8String) - if let data = NSData(contentsOf: fileURL) { - let pls = UnsafeMutablePointer.allocate(capacity: data.length) - for (index, data) in data.enumerated() { - pls[index] = data - } - let res = minimuxer_yeet_app_afc(ns_bundle_ptr, pls, UInt(data.length)) - if res == 0 { - print("minimuxer_yeet_app_afc `res` == \(res)") - self.progress.completedUnitCount += 1 - self.finish(.success(())) - } else { - self.finish(.failure(minimuxer_to_operation(code: res))) + do { + let bytes = Data(data).toRustByteSlice() + try yeet_app_afc(app.bundleIdentifier, bytes.forRust()) + } catch { + return self.finish(.failure(minimuxerToOperationError(error))) } + self.progress.completedUnitCount += 1 + self.finish(.success(())) } else { + print("IPA doesn't exist????") self.finish(.failure(ALTServerError(.underlyingError))) } } diff --git a/AltStore/Resources/tempEnt.plist b/AltStore/Resources/tempEnt.plist index 2ae02803..a7b3b7dc 100644 --- a/AltStore/Resources/tempEnt.plist +++ b/AltStore/Resources/tempEnt.plist @@ -3,7 +3,7 @@ application-identifier - A72ZC8AJ5X.com.SideStore.AltStore + A72ZC8AJ5X.com.SideStore.SideStore aps-environment development com.apple.developer.siri @@ -12,9 +12,9 @@ A72ZC8AJ5X com.apple.security.application-groups - group.com.SideStore.AltStore + group.com.SideStore.SideStore get-task-allow - \ No newline at end of file + diff --git a/AltStore/Settings.bundle/Root.plist b/AltStore/Settings.bundle/Root.plist index b6d57f44..cad6e004 100644 --- a/AltStore/Settings.bundle/Root.plist +++ b/AltStore/Settings.bundle/Root.plist @@ -16,15 +16,13 @@ Key customAnisetteURL DefaultValue - http://ani.sidestore.io + https://ani.sidestore.io Titles SideStore Macley (US) Macley (DE) DrPudding - jkcoxson (AltServer) - jkcoxson (Provision) Sideloadly Nick Jawshoeadan @@ -32,12 +30,10 @@ Values - http://ani.sidestore.io + https://ani.sidestore.io http://us1.sternserv.tech http://de1.sternserv.tech https://sign.rheaa.xyz - http://jkcoxson.com:2095 - http://jkcoxson.com:2052 https://sideloadly.io/anisette/irGb3Quww8zrhgqnzmrx http://45.33.29.114 https://anisette.jawshoeadan.me diff --git a/AltStore/Sources/SourcesViewController.swift b/AltStore/Sources/SourcesViewController.swift index 2b15c240..7a42e446 100644 --- a/AltStore/Sources/SourcesViewController.swift +++ b/AltStore/Sources/SourcesViewController.swift @@ -381,13 +381,12 @@ private extension SourcesViewController dispatchGroup.notify(queue: .main) { if let error = fetchError { - finish(.failure(error)) - } - else - { - let sources = featuredSourceURLs.compactMap { sourcesByURL[$0] } - finish(.success(sources)) + print(error) + // 1 error doesn't mean all trusted sources failed to load! Riley, why did you do this??????? +// finish(.failure(error)) } + let sources = featuredSourceURLs.compactMap { sourcesByURL[$0] } + finish(.success(sources)) } } } diff --git a/Build.xcconfig b/Build.xcconfig index 5dea5226..b0686dea 100644 --- a/Build.xcconfig +++ b/Build.xcconfig @@ -1,8 +1,8 @@ // Configuration settings file format documentation can be found at: // https://help.apple.com/xcode/#/dev745c5c974 -MARKETING_VERSION = 0.3.0 -CURRENT_PROJECT_VERSION = 3020 +MARKETING_VERSION = 0.3.2 +CURRENT_PROJECT_VERSION = 3050 // Vars to be overwritten by `CodeSigning.xcconfig` if exists DEVELOPMENT_TEAM = S32Z3HMYVQ @@ -14,11 +14,14 @@ ORG_IDENTIFIER = com.SideStore ORG_PREFIX = $(ORG_IDENTIFIER) PRODUCT_NAME = SideStore -EXTENSION_PREFIX = $(ORG_PREFIX).SideStore //PRODUCT_NAME[configuration=Debug] = Prov Debug PRODUCT_BUNDLE_IDENTIFIER = $(ORG_PREFIX).SideStore -//PRODUCT_BUNDLE_IDENTIFIER[configuration=Debug] = $(ORG_PREFIX).$(PROJECT_NAME:lower)-debug +// add team ID to bundle ID for debug builds since these will most likely be installed via Xcode +// SideStore will expect the team ID to be at the end of the bundle ID, but this doesn't happen when we install via Xcode +// we don't want to do this for release since those builds will most likely be installed via SideServer, which adds the team ID +PRODUCT_BUNDLE_IDENTIFIER[config=Debug] = $(ORG_PREFIX).SideStore.$(DEVELOPMENT_TEAM) -APP_GROUP_IDENTIFIER = $(ORG_PREFIX).SideStore +EXTENSION_PREFIX = $(PRODUCT_BUNDLE_IDENTIFIER) +APP_GROUP_IDENTIFIER = $(PRODUCT_BUNDLE_IDENTIFIER) ICLOUD_CONTAINER_IDENTIFIER = iCloud.$(ORG_PREFIX).$(PROJECT_NAME) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 00000000..f71e494a --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,61 @@ +# Contributing to SideStore + +Thank you for your interest in contributing to SideStore! SideStore is a community driven project, and it's made possible by people like you. + +There are many ways to contribute to SideStore, so if you aren't a developer, there are still many other ways you can help out: + +- [Writing documentation](https://github.com/SideStore/SideStore-Docs) +- [Submitting detailed bug reports and suggesting new features](https://github.com/SideStore/SideStore/issues/new/choose) +- Helping out with support + - [Discord](https://discord.gg/RgpFBX3Q3k) + - [GitHub Discussions](https://github.com/SideStore/SideStore/discussions) + +However, this guide will focus on the development side of things. For now, we will only have setup information here, but you can [join our Discord](https://discord.gg/RgpFBX3Q3k) if you need help +after setup. + +## Requirements + +This guide assumes you: + +- are on a Mac +- have Xcode installed +- have basic command line knowledge (know how to run commands, cd into a directory) +- have basic Git knowledge ([GitHub Desktop](https://desktop.github.com) is a great tool for beginners, and greatly simplifies working with Git) +- have basic Swift/iOS development knowledge + +## Setup + +1. Fork the SideStore repo on GitHub. +2. Clone the fork: `git clone https://github.com//SideStore.git --recurse-submodules` + + If you are using GitHub Desktop, refer to + [this guide](https://docs.github.com/en/desktop/contributing-and-collaborating-using-github-desktop/adding-and-cloning-repositories/cloning-and-forking-repositories-from-github-desktop). + +3. Copy `CodeSigning.xcconfig.sample` to `CodeSigning.xcconfig` and fill in the values. +4. **(Development only)** Change the value for `ALTDeviceID` in the Info.plist to your device's UDID. Normally, SideServer embeds the device's UDID in SideStore's Info.plist during installation. When + running through Xcode you'll need to set the value yourself or else SideStore won't resign (or even install) apps for the proper device. You can achieve this by changing a few things to be able to + build and use SideStore. +5. Finally, open `AltStore.xcodeproj` in Xcode. + +Next, make and test your changes. Then, commit and push your changes using git and make a pull request. + +## Prebuilt binary information + +minimuxer and em_proxy use prebuilt static library binaries built by GitHub Actions to speed up builds and remove the need for Rust to be installed when working on SideStore. +[`Dependencies/fetch-prebuilt.sh`](./Dependencies/fetch-prebuilt.sh) will be run before each build by Xcode, and it will check if the downloaded binaries are up-to-date once every 6 hours. If you want +to force it to check for new binaries, run `bash ./Dependencies/fetch-prebuilt.sh force`. + +## Building an IPA for distribution + +You can use the Makefile: `make build fakesign ipa` + +This will create SideStore.ipa. + +> **Warning** +> +> The binary created will contain paths to Xcode's DerivedData, and if you built minimuxer on your machine, paths to $HOME/.cargo. This will include your username. If you want to keep your user's +> username private, you might want to get GitHub Actions to build the IPA instead. + +## Developing minimuxer alongside SideStore + +Please see [minimuxer's README](https://github.com/SideStore/minimuxer) for development instructions. diff --git a/Dependencies/em_proxy b/Dependencies/em_proxy deleted file mode 160000 index 57ab5a00..00000000 --- a/Dependencies/em_proxy +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 57ab5a000214800288a3cdd151dab3cf040bf376 diff --git a/Dependencies/em_proxy.xcodeproj/project.pbxproj b/Dependencies/em_proxy.xcodeproj/project.pbxproj index 9be3b5f2..d35e5c8c 100644 --- a/Dependencies/em_proxy.xcodeproj/project.pbxproj +++ b/Dependencies/em_proxy.xcodeproj/project.pbxproj @@ -1,371 +1,343 @@ // !$*UTF8*$! { - /* generated with cargo-xcode 1.5.0 */ - archiveVersion = 1; - classes = { - }; - objectVersion = 53; - objects = { + archiveVersion = 1; + classes = { + }; + objectVersion = 53; + objects = { + /* Begin PBXBuildFile section */ - - CA60E4E02AAAA30E3695DD59 /* Cargo.toml in Sources */ = { - isa = PBXBuildFile; - fileRef = CA6094FFF6923EF4668187A5 /* Cargo.toml */; - settings = { - COMPILER_FLAGS = "--lib"; /* == OTHER_INPUT_FILE_FLAGS */ - }; - }; - - CA60E4E02AAA37FC563E4BCC /* Cargo.toml in Sources */ = { - isa = PBXBuildFile; - fileRef = CA6094FFF6923EF4668187A5 /* Cargo.toml */; - settings = { - COMPILER_FLAGS = "--bin 'run'"; /* == OTHER_INPUT_FILE_FLAGS */ - }; - }; - + 9987603429A4555300818586 /* em_proxy.h in Sources */ = {isa = PBXBuildFile; fileRef = 9999259129A45319005CF020 /* em_proxy.h */; }; /* End PBXBuildFile section */ /* Begin PBXBuildRule section */ - CA6094FFF692AC6C1400ACA8 /* PBXBuildRule */ = { - isa = PBXBuildRule; - compilerSpec = com.apple.compilers.proxy.script; - dependencyFile = "$(DERIVED_FILE_DIR)/$(CARGO_XCODE_TARGET_ARCH)-$(EXECUTABLE_NAME).d"; - filePatterns = "*/Cargo.toml"; /* must contain asterisk */ - fileType = pattern.proxy; - inputFiles = (); - isEditable = 0; - name = "Cargo project build"; - outputFiles = ( - "$(OBJECT_FILE_DIR)/$(CARGO_XCODE_TARGET_ARCH)-$(EXECUTABLE_NAME)", - ); - script = "# generated with cargo-xcode 1.5.0\n\nset -eu; export PATH=\"$PATH:$HOME/.cargo/bin:/usr/local/bin\";\nif [ \"${IS_MACCATALYST-NO}\" = YES ]; then\n CARGO_XCODE_TARGET_TRIPLE=\"${CARGO_XCODE_TARGET_ARCH}-apple-ios-macabi\"\nelse\n CARGO_XCODE_TARGET_TRIPLE=\"${CARGO_XCODE_TARGET_ARCH}-apple-${CARGO_XCODE_TARGET_OS}\"\nfi\nif [ \"$CARGO_XCODE_TARGET_OS\" != \"darwin\" ]; then\n PATH=\"${PATH/\\/Contents\\/Developer\\/Toolchains\\/XcodeDefault.xctoolchain\\/usr\\/bin:/xcode-provided-ld-cant-link-lSystem-for-the-host-build-script:}\"\nfi\nPATH=\"$PATH:/opt/homebrew/bin\" # Rust projects often depend on extra tools like nasm, which Xcode lacks\nif [ \"$CARGO_XCODE_BUILD_MODE\" == release ]; then\n OTHER_INPUT_FILE_FLAGS=\"${OTHER_INPUT_FILE_FLAGS} --release\"\nfi\nif command -v rustup &> /dev/null; then\n if ! rustup target list --installed | egrep -q \"${CARGO_XCODE_TARGET_TRIPLE}\"; then\n echo \"warning: this build requires rustup toolchain for $CARGO_XCODE_TARGET_TRIPLE, but it isn\'t installed\"\n rustup target add \"${CARGO_XCODE_TARGET_TRIPLE}\" || echo >&2 \"warning: can\'t install $CARGO_XCODE_TARGET_TRIPLE\"\n fi\nfi\nif [ \"$ACTION\" = clean ]; then\n ( set -x; cargo clean --manifest-path=\"$SCRIPT_INPUT_FILE\" ${OTHER_INPUT_FILE_FLAGS} --target=\"${CARGO_XCODE_TARGET_TRIPLE}\"; );\nelse\n ( set -x; cargo build --manifest-path=\"$SCRIPT_INPUT_FILE\" --features=\"${CARGO_XCODE_FEATURES:-}\" ${OTHER_INPUT_FILE_FLAGS} --target=\"${CARGO_XCODE_TARGET_TRIPLE}\"; );\nfi\n# it\'s too hard to explain Cargo\'s actual exe path to Xcode build graph, so hardlink to a known-good path instead\nBUILT_SRC=\"${CARGO_TARGET_DIR}/${CARGO_XCODE_TARGET_TRIPLE}/${CARGO_XCODE_BUILD_MODE}/${CARGO_XCODE_CARGO_FILE_NAME}\"\nln -f -- \"$BUILT_SRC\" \"$SCRIPT_OUTPUT_FILE_0\"\n\n# xcode generates dep file, but for its own path, so append our rename to it\nDEP_FILE_SRC=\"${CARGO_TARGET_DIR}/${CARGO_XCODE_TARGET_TRIPLE}/${CARGO_XCODE_BUILD_MODE}/${CARGO_XCODE_CARGO_DEP_FILE_NAME}\"\nif [ -f \"$DEP_FILE_SRC\" ]; then\n DEP_FILE_DST=\"${DERIVED_FILE_DIR}/${CARGO_XCODE_TARGET_ARCH}-${EXECUTABLE_NAME}.d\"\n cp -f \"$DEP_FILE_SRC\" \"$DEP_FILE_DST\"\n echo >> \"$DEP_FILE_DST\" \"$SCRIPT_OUTPUT_FILE_0: $BUILT_SRC\"\nfi\n\n# lipo script needs to know all the platform-specific files that have been built\n# archs is in the file name, so that paths don\'t stay around after archs change\n# must match input for LipoScript\nFILE_LIST=\"${DERIVED_FILE_DIR}/${ARCHS}-${EXECUTABLE_NAME}.xcfilelist\"\ntouch \"$FILE_LIST\"\nif ! egrep -q \"$SCRIPT_OUTPUT_FILE_0\" \"$FILE_LIST\" ; then\n echo >> \"$FILE_LIST\" \"$SCRIPT_OUTPUT_FILE_0\"\nfi\n"; - }; + CA6094FFF692AC6C1400ACA8 /* PBXBuildRule */ = { + isa = PBXBuildRule; + compilerSpec = com.apple.compilers.proxy.script; + filePatterns = "*/em_proxy.h"; + fileType = pattern.proxy; + inputFiles = ( + ); + isEditable = 0; + name = "Cargo project build"; + outputFiles = ( + "$(OBJECT_FILE_DIR)/$(CARGO_XCODE_TARGET_ARCH)-$(EXECUTABLE_NAME)", + ); + script = "# generated with cargo-xcode 1.5.0\n# modified to use prebuilt binaries\n\nset -eu;\n\nBUILT_SRC=\"./em_proxy/$LIB_FILE_NAME.a\"\nln -f -- \"$BUILT_SRC\" \"$TARGET_BUILD_DIR/$EXECUTABLE_PATH\" || cp \"$BUILT_SRC\" \"$TARGET_BUILD_DIR/$EXECUTABLE_PATH\"\necho \"$BUILT_SRC -> $TARGET_BUILD_DIR/$EXECUTABLE_PATH\"\n\n# xcode generates dep file, but for its own path, so append our rename to it\n#DEP_FILE_SRC=\"minimuxer/target/${CARGO_XCODE_TARGET_TRIPLE}/release/${CARGO_XCODE_CARGO_DEP_FILE_NAME}\"\n#if [ -f \"$DEP_FILE_SRC\" ]; then\n# DEP_FILE_DST=\"${DERIVED_FILE_DIR}/${CARGO_XCODE_TARGET_ARCH}-${EXECUTABLE_NAME}.d\"\n# cp -f \"$DEP_FILE_SRC\" \"$DEP_FILE_DST\"\n# echo >> \"$DEP_FILE_DST\" \"$SCRIPT_OUTPUT_FILE_0: $BUILT_SRC\"\n#fi\n\n# lipo script needs to know all the platform-specific files that have been built\n# archs is in the file name, so that paths don't stay around after archs change\n# must match input for LipoScript\n#FILE_LIST=\"${DERIVED_FILE_DIR}/${ARCHS}-${EXECUTABLE_NAME}.xcfilelist\"\n#touch \"$FILE_LIST\"\n#if ! egrep -q \"$SCRIPT_OUTPUT_FILE_0\" \"$FILE_LIST\" ; then\n# echo >> \"$FILE_LIST\" \"$SCRIPT_OUTPUT_FILE_0\"\n#fi\n"; + }; /* End PBXBuildRule section */ /* Begin PBXFileReference section */ - - CA60C44C93D7916DE57E6EBD /* staticlib */ = { - isa = PBXFileReference; - explicitFileType = "archive.ar"; - includeInIndex = 0; - name = "libem_proxy_static.a"; - sourceTree = TARGET_BUILD_DIR; - }; - CA60058A9FBE4D17AF51A7D5 /* bin */ = { - isa = PBXFileReference; - explicitFileType = "compiled.mach-o.executable"; - includeInIndex = 0; - name = "run"; - sourceTree = TARGET_BUILD_DIR; - }; - CA6094FFF6923EF4668187A5 /* Cargo.toml */ = { - isa = PBXFileReference; - lastKnownFileType = text; - fileEncoding = 4; - name = "Cargo.toml"; - path = "em_proxy/Cargo.toml"; - sourceTree = ""; - }; - /* Rust needs libresolv */ - ADDEDBA66A6E1 = { - isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; - name = libresolv.tbd; path = usr/lib/libresolv.tbd; sourceTree = SDKROOT; - }; - + 9999259129A45319005CF020 /* em_proxy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = em_proxy.h; path = em_proxy/em_proxy.h; sourceTree = ""; }; + ADDEDBA66A6E1 /* libresolv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libresolv.tbd; path = usr/lib/libresolv.tbd; sourceTree = SDKROOT; }; + CA60058A9FBE4D17AF51A7D5 /* run */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = run; sourceTree = BUILT_PRODUCTS_DIR; }; + CA60C44C93D7916DE57E6EBD /* libem_proxy_static.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libem_proxy_static.a; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXGroup section */ - CA6094FFF69298AF0B5890DB /* Frameworks */ = { - isa = PBXGroup; - children = ( - ADDEDBA66A6E2, - - ); - name = Frameworks; - sourceTree = ""; - }; - - - ADDEDBA66A6E2 /* Required for static linking */ = { - isa = PBXGroup; - children = ( - ADDEDBA66A6E1 - ); - name = "Required for static linking"; - sourceTree = ""; - }; - - CA6094FFF69222869D176AE5 /* Products */ = { - isa = PBXGroup; - children = ( - CA60C44C93D7916DE57E6EBD, -CA60058A9FBE4D17AF51A7D5, - - ); - name = Products; - sourceTree = ""; - }; - - CA6094FFF692D65BC3C892A8 /* Main */ = { - isa = PBXGroup; - children = ( - CA6094FFF6923EF4668187A5, -CA6094FFF69222869D176AE5, -CA6094FFF69298AF0B5890DB, - - ); - sourceTree = ""; - }; - + ADDEDBA66A6E2 /* Required for static linking */ = { + isa = PBXGroup; + children = ( + ADDEDBA66A6E1 /* libresolv.tbd */, + ); + name = "Required for static linking"; + sourceTree = ""; + }; + CA6094FFF69222869D176AE5 /* Products */ = { + isa = PBXGroup; + children = ( + CA60C44C93D7916DE57E6EBD /* libem_proxy_static.a */, + CA60058A9FBE4D17AF51A7D5 /* run */, + ); + name = Products; + sourceTree = ""; + }; + CA6094FFF69298AF0B5890DB /* Frameworks */ = { + isa = PBXGroup; + children = ( + ADDEDBA66A6E2 /* Required for static linking */, + ); + name = Frameworks; + sourceTree = ""; + }; + CA6094FFF692D65BC3C892A8 = { + isa = PBXGroup; + children = ( + 9999259129A45319005CF020 /* em_proxy.h */, + CA6094FFF69222869D176AE5 /* Products */, + CA6094FFF69298AF0B5890DB /* Frameworks */, + ); + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - CA60C44C93D7A30E3695DD59 /* em_proxy-staticlib */ = { - isa = PBXNativeTarget; - buildConfigurationList = CA603DD75FB4A30E3695DD59; - buildPhases = ( - CA60445C3036A30E3695DD59 /* Sources */, - CA6094FFF692AF6EBB7F357C /* Universal Binary lipo */, - ); - buildRules = ( - CA6094FFF692AC6C1400ACA8 /* PBXBuildRule */, - ); - dependencies = ( - ); - name = "em_proxy-staticlib"; - productName = "libem_proxy_static.a"; - productReference = CA60C44C93D7916DE57E6EBD; - productType = "com.apple.product-type.library.static"; - }; - CA60058A9FBE37FC563E4BCC /* run-bin */ = { - isa = PBXNativeTarget; - buildConfigurationList = CA603DD75FB437FC563E4BCC; - buildPhases = ( - CA60445C303637FC563E4BCC /* Sources */, - CA6094FFF692AF6EBB7F357C /* Universal Binary lipo */, - ); - buildRules = ( - CA6094FFF692AC6C1400ACA8 /* PBXBuildRule */, - ); - dependencies = ( - ); - name = "run-bin"; - productName = "run"; - productReference = CA60058A9FBE4D17AF51A7D5; - productType = "com.apple.product-type.tool"; - }; - + CA60058A9FBE37FC563E4BCC /* run-bin */ = { + isa = PBXNativeTarget; + buildConfigurationList = CA603DD75FB437FC563E4BCC /* Build configuration list for PBXNativeTarget "run-bin" */; + buildPhases = ( + CA60445C303637FC563E4BCC /* Sources */, + CA6094FFF692AF6EBB7F357C /* Universal Binary lipo */, + ); + buildRules = ( + CA6094FFF692AC6C1400ACA8 /* PBXBuildRule */, + ); + dependencies = ( + ); + name = "run-bin"; + productName = run; + productReference = CA60058A9FBE4D17AF51A7D5 /* run */; + productType = "com.apple.product-type.tool"; + }; + CA60C44C93D7A30E3695DD59 /* em_proxy-staticlib */ = { + isa = PBXNativeTarget; + buildConfigurationList = CA603DD75FB4A30E3695DD59 /* Build configuration list for PBXNativeTarget "em_proxy-staticlib" */; + buildPhases = ( + 9987603529A4610700818586 /* ShellScript */, + CA60445C3036A30E3695DD59 /* Sources */, + CA6094FFF692AF6EBB7F357C /* Universal Binary lipo */, + ); + buildRules = ( + CA6094FFF692AC6C1400ACA8 /* PBXBuildRule */, + ); + dependencies = ( + ); + name = "em_proxy-staticlib"; + productName = libem_proxy_static.a; + productReference = CA60C44C93D7916DE57E6EBD /* libem_proxy_static.a */; + productType = "com.apple.product-type.library.static"; + }; /* End PBXNativeTarget section */ - CA60445C3036A30E3695DD59 = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - CA60E4E02AAAA30E3695DD59 - ); - runOnlyForDeploymentPostprocessing = 0; - }; - - CA603DD75FB4A30E3695DD59 /* staticlib */ = { - isa = XCConfigurationList; - buildConfigurations = ( - CA604DFE779BA30E3695DD59 /* Release */, - CA60DE07A83FA30E3695DD59 /* Debug */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - CA604DFE779BA30E3695DD59 /* staticlib */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = "em_proxy_static"; - "CARGO_XCODE_CARGO_FILE_NAME" = "libem_proxy.a"; - "CARGO_XCODE_CARGO_DEP_FILE_NAME" = "libem_proxy.d"; - SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos appletvsimulator appletvos"; - SKIP_INSTALL = YES; - INSTALL_GROUP = ""; - INSTALL_MODE_FLAG = ""; - INSTALL_OWNER = ""; - - }; - name = Release; - }; - CA60DE07A83FA30E3695DD59 /* staticlib */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = "em_proxy_static"; - "CARGO_XCODE_CARGO_FILE_NAME" = "libem_proxy.a"; - "CARGO_XCODE_CARGO_DEP_FILE_NAME" = "libem_proxy.d"; - SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos appletvsimulator appletvos"; - SKIP_INSTALL = YES; - INSTALL_GROUP = ""; - INSTALL_MODE_FLAG = ""; - INSTALL_OWNER = ""; - - }; - name = Debug; - };CA60445C303637FC563E4BCC = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - CA60E4E02AAA37FC563E4BCC - ); - runOnlyForDeploymentPostprocessing = 0; - }; - - CA603DD75FB437FC563E4BCC /* bin */ = { - isa = XCConfigurationList; - buildConfigurations = ( - CA604DFE779B37FC563E4BCC /* Release */, - CA60DE07A83F37FC563E4BCC /* Debug */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - CA604DFE779B37FC563E4BCC /* bin */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = "run"; - "CARGO_XCODE_CARGO_FILE_NAME" = "run"; - "CARGO_XCODE_CARGO_DEP_FILE_NAME" = "run.d"; - SUPPORTED_PLATFORMS = "macosx"; - - - }; - name = Release; - }; - CA60DE07A83F37FC563E4BCC /* bin */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = "run"; - "CARGO_XCODE_CARGO_FILE_NAME" = "run"; - "CARGO_XCODE_CARGO_DEP_FILE_NAME" = "run.d"; - SUPPORTED_PLATFORMS = "macosx"; - - - }; - name = Debug; - }; +/* Begin PBXProject section */ + CA6094FFF692E04653AD465F /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 1300; + TargetAttributes = { + CA60058A9FBE37FC563E4BCC = { + CreatedOnToolsVersion = 9.2; + ProvisioningStyle = Automatic; + }; + CA60C44C93D7A30E3695DD59 = { + CreatedOnToolsVersion = 9.2; + ProvisioningStyle = Automatic; + }; + }; + }; + buildConfigurationList = CA6094FFF69280E02D6C7F57 /* Build configuration list for PBXProject "em_proxy" */; + compatibilityVersion = "Xcode 11.4"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = CA6094FFF692D65BC3C892A8; + productRefGroup = CA6094FFF69222869D176AE5 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + CA60C44C93D7A30E3695DD59 /* em_proxy-staticlib */, + CA60058A9FBE37FC563E4BCC /* run-bin */, + ); + }; +/* End PBXProject section */ - CA6094FFF692AF6EBB7F357C /* LipoScript */ = { - name = "Universal Binary lipo"; - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = (); - inputFileListPaths = (); - inputPaths = ( - "$(DERIVED_FILE_DIR)/$(ARCHS)-$(EXECUTABLE_NAME).xcfilelist", - ); - outputFileListPaths = (); - outputPaths = ( - "$(TARGET_BUILD_DIR)/$(EXECUTABLE_PATH)" - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "# generated with cargo-xcode 1.5.0\n\n set -eux; cat \"$DERIVED_FILE_DIR/$ARCHS-$EXECUTABLE_NAME.xcfilelist\" | tr \'\\n\' \'\\0\' | xargs -0 lipo -create -output \"$TARGET_BUILD_DIR/$EXECUTABLE_PATH\"\n if [ ${LD_DYLIB_INSTALL_NAME:+1} ]; then\n install_name_tool -id \"$LD_DYLIB_INSTALL_NAME\" \"$TARGET_BUILD_DIR/$EXECUTABLE_PATH\"\n fi\n "; - }; +/* Begin PBXShellScriptBuildPhase section */ + 9987603529A4610700818586 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + outputFileListPaths = ( + ); + outputPaths = ( + ./em_proxy/em_proxy.h, + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "bash ./fetch-prebuilt.sh em_proxy\n"; + }; + CA6094FFF692AF6EBB7F357C /* Universal Binary lipo */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "$(DERIVED_FILE_DIR)/$(ARCHS)-$(EXECUTABLE_NAME).xcfilelist", + ); + name = "Universal Binary lipo"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(TARGET_BUILD_DIR)/$(EXECUTABLE_PATH)", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "# generated with cargo-xcode 1.5.0\n\n#set -eux; cat \"$DERIVED_FILE_DIR/$ARCHS-$EXECUTABLE_NAME.xcfilelist\" | tr '\\n' '\\0' | xargs -0 lipo -create -output \"$TARGET_BUILD_DIR/$EXECUTABLE_PATH\"\n#if [ ${LD_DYLIB_INSTALL_NAME:+1} ]; then\n# install_name_tool -id \"$LD_DYLIB_INSTALL_NAME\" \"$TARGET_BUILD_DIR/$EXECUTABLE_PATH\"\n#fi\n"; + }; +/* End PBXShellScriptBuildPhase section */ - CA6094FFF69280E02D6C7F57 = { - isa = XCConfigurationList; - buildConfigurations = ( - CA609A5173513CC16B37690B /* Release */, - CA609A517351228BE02872F8 /* Debug */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; +/* Begin PBXSourcesBuildPhase section */ + CA60445C303637FC563E4BCC /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + CA60445C3036A30E3695DD59 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 9987603429A4555300818586 /* em_proxy.h in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ - CA609A5173513CC16B37690B = { - isa = XCBuildConfiguration; - buildSettings = { - - ALWAYS_SEARCH_USER_PATHS = NO; - SUPPORTS_MACCATALYST = YES; - CARGO_TARGET_DIR = "$(PROJECT_TEMP_DIR)/cargo_target"; /* for cargo */ - CARGO_XCODE_FEATURES = ""; /* configure yourself */ - "CARGO_XCODE_TARGET_ARCH[arch=arm64*]" = "aarch64"; - "CARGO_XCODE_TARGET_ARCH[arch=x86_64*]" = "x86_64"; /* catalyst adds h suffix */ - "CARGO_XCODE_TARGET_ARCH[arch=i386]" = "i686"; - "CARGO_XCODE_TARGET_OS[sdk=macosx*]" = "darwin"; - "CARGO_XCODE_TARGET_OS[sdk=iphonesimulator*]" = "ios-sim"; - "CARGO_XCODE_TARGET_OS[sdk=iphonesimulator*][arch=x86_64*]" = "ios"; - "CARGO_XCODE_TARGET_OS[sdk=iphoneos*]" = "ios"; - "CARGO_XCODE_TARGET_OS[sdk=appletvsimulator*]" = "tvos"; - "CARGO_XCODE_TARGET_OS[sdk=appletvos*]" = "tvos"; - PRODUCT_NAME = "em_proxy"; - MARKETING_VERSION = "0.1.0"; - CURRENT_PROJECT_VERSION = "0.1"; - SDKROOT = macosx; - - "CARGO_XCODE_BUILD_MODE" = "release"; /* for xcode scripts */ - }; - name = Release; - }; +/* Begin XCBuildConfiguration section */ + CA604DFE779B37FC563E4BCC /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CARGO_XCODE_CARGO_DEP_FILE_NAME = run.d; + CARGO_XCODE_CARGO_FILE_NAME = run; + PRODUCT_NAME = run; + SUPPORTED_PLATFORMS = macosx; + }; + name = Release; + }; + CA604DFE779BA30E3695DD59 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CARGO_XCODE_CARGO_DEP_FILE_NAME = libem_proxy.d; + CARGO_XCODE_CARGO_FILE_NAME = libem_proxy.a; + INSTALL_GROUP = ""; + INSTALL_MODE_FLAG = ""; + INSTALL_OWNER = ""; + LIB_FILE_NAME = ""; + "LIB_FILE_NAME[sdk=iphoneos*]" = libem_proxy; + "LIB_FILE_NAME[sdk=iphonesimulator*]" = "libem_proxy-sim"; + PRODUCT_NAME = em_proxy_static; + SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos appletvsimulator appletvos"; + }; + name = Release; + }; + CA609A517351228BE02872F8 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CARGO_TARGET_DIR = "$(PROJECT_TEMP_DIR)/cargo_target"; + CARGO_XCODE_BUILD_MODE = debug; + CARGO_XCODE_FEATURES = ""; + "CARGO_XCODE_TARGET_ARCH[arch=arm64*]" = aarch64; + "CARGO_XCODE_TARGET_ARCH[arch=i386]" = i686; + "CARGO_XCODE_TARGET_ARCH[arch=x86_64*]" = x86_64; + "CARGO_XCODE_TARGET_OS[sdk=appletvos*]" = tvos; + "CARGO_XCODE_TARGET_OS[sdk=appletvsimulator*]" = tvos; + "CARGO_XCODE_TARGET_OS[sdk=iphoneos*]" = ios; + "CARGO_XCODE_TARGET_OS[sdk=iphonesimulator*]" = "ios-sim"; + "CARGO_XCODE_TARGET_OS[sdk=iphonesimulator*][arch=x86_64*]" = ios; + "CARGO_XCODE_TARGET_OS[sdk=macosx*]" = darwin; + CURRENT_PROJECT_VERSION = 0.1; + MARKETING_VERSION = 0.1.0; + ONLY_ACTIVE_ARCH = YES; + PRODUCT_NAME = em_proxy; + SDKROOT = macosx; + SUPPORTS_MACCATALYST = YES; + }; + name = Debug; + }; + CA609A5173513CC16B37690B /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CARGO_TARGET_DIR = "$(PROJECT_TEMP_DIR)/cargo_target"; + CARGO_XCODE_BUILD_MODE = release; + CARGO_XCODE_FEATURES = ""; + "CARGO_XCODE_TARGET_ARCH[arch=arm64*]" = aarch64; + "CARGO_XCODE_TARGET_ARCH[arch=i386]" = i686; + "CARGO_XCODE_TARGET_ARCH[arch=x86_64*]" = x86_64; + "CARGO_XCODE_TARGET_OS[sdk=appletvos*]" = tvos; + "CARGO_XCODE_TARGET_OS[sdk=appletvsimulator*]" = tvos; + "CARGO_XCODE_TARGET_OS[sdk=iphoneos*]" = ios; + "CARGO_XCODE_TARGET_OS[sdk=iphonesimulator*]" = "ios-sim"; + "CARGO_XCODE_TARGET_OS[sdk=iphonesimulator*][arch=x86_64*]" = ios; + "CARGO_XCODE_TARGET_OS[sdk=macosx*]" = darwin; + CURRENT_PROJECT_VERSION = 0.1; + MARKETING_VERSION = 0.1.0; + PRODUCT_NAME = em_proxy; + SDKROOT = macosx; + SUPPORTS_MACCATALYST = YES; + }; + name = Release; + }; + CA60DE07A83F37FC563E4BCC /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CARGO_XCODE_CARGO_DEP_FILE_NAME = run.d; + CARGO_XCODE_CARGO_FILE_NAME = run; + PRODUCT_NAME = run; + SUPPORTED_PLATFORMS = macosx; + }; + name = Debug; + }; + CA60DE07A83FA30E3695DD59 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CARGO_XCODE_CARGO_DEP_FILE_NAME = libem_proxy.d; + CARGO_XCODE_CARGO_FILE_NAME = libem_proxy.a; + INSTALL_GROUP = ""; + INSTALL_MODE_FLAG = ""; + INSTALL_OWNER = ""; + LIB_FILE_NAME = ""; + "LIB_FILE_NAME[sdk=iphoneos*]" = libem_proxy; + "LIB_FILE_NAME[sdk=iphonesimulator*]" = "libem_proxy-sim"; + PRODUCT_NAME = em_proxy_static; + SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos appletvsimulator appletvos"; + }; + name = Debug; + }; +/* End XCBuildConfiguration section */ - CA609A517351228BE02872F8 = { - isa = XCBuildConfiguration; - buildSettings = { - - ALWAYS_SEARCH_USER_PATHS = NO; - SUPPORTS_MACCATALYST = YES; - CARGO_TARGET_DIR = "$(PROJECT_TEMP_DIR)/cargo_target"; /* for cargo */ - CARGO_XCODE_FEATURES = ""; /* configure yourself */ - "CARGO_XCODE_TARGET_ARCH[arch=arm64*]" = "aarch64"; - "CARGO_XCODE_TARGET_ARCH[arch=x86_64*]" = "x86_64"; /* catalyst adds h suffix */ - "CARGO_XCODE_TARGET_ARCH[arch=i386]" = "i686"; - "CARGO_XCODE_TARGET_OS[sdk=macosx*]" = "darwin"; - "CARGO_XCODE_TARGET_OS[sdk=iphonesimulator*]" = "ios-sim"; - "CARGO_XCODE_TARGET_OS[sdk=iphonesimulator*][arch=x86_64*]" = "ios"; - "CARGO_XCODE_TARGET_OS[sdk=iphoneos*]" = "ios"; - "CARGO_XCODE_TARGET_OS[sdk=appletvsimulator*]" = "tvos"; - "CARGO_XCODE_TARGET_OS[sdk=appletvos*]" = "tvos"; - PRODUCT_NAME = "em_proxy"; - MARKETING_VERSION = "0.1.0"; - CURRENT_PROJECT_VERSION = "0.1"; - SDKROOT = macosx; - - "CARGO_XCODE_BUILD_MODE" = "debug"; /* for xcode scripts */ - ONLY_ACTIVE_ARCH = YES; - }; - name = Debug; - }; - - CA6094FFF692E04653AD465F = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 1300; - TargetAttributes = { - CA60C44C93D7A30E3695DD59 = { - CreatedOnToolsVersion = 9.2; - ProvisioningStyle = Automatic; - }; - CA60058A9FBE37FC563E4BCC = { - CreatedOnToolsVersion = 9.2; - ProvisioningStyle = Automatic; - }; - }; - }; - buildConfigurationList = CA6094FFF69280E02D6C7F57; - compatibilityVersion = "Xcode 11.4"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = CA6094FFF692D65BC3C892A8; - productRefGroup = CA6094FFF69222869D176AE5 /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - CA60C44C93D7A30E3695DD59, -CA60058A9FBE37FC563E4BCC, - - ); - }; - - }; - rootObject = CA6094FFF692E04653AD465F; +/* Begin XCConfigurationList section */ + CA603DD75FB437FC563E4BCC /* Build configuration list for PBXNativeTarget "run-bin" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + CA604DFE779B37FC563E4BCC /* Release */, + CA60DE07A83F37FC563E4BCC /* Debug */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + CA603DD75FB4A30E3695DD59 /* Build configuration list for PBXNativeTarget "em_proxy-staticlib" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + CA604DFE779BA30E3695DD59 /* Release */, + CA60DE07A83FA30E3695DD59 /* Debug */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + CA6094FFF69280E02D6C7F57 /* Build configuration list for PBXProject "em_proxy" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + CA609A5173513CC16B37690B /* Release */, + CA609A517351228BE02872F8 /* Debug */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = CA6094FFF692E04653AD465F /* Project object */; } - \ No newline at end of file diff --git a/Dependencies/em_proxy/.gitkeep b/Dependencies/em_proxy/.gitkeep new file mode 100644 index 00000000..d338f61d --- /dev/null +++ b/Dependencies/em_proxy/.gitkeep @@ -0,0 +1 @@ +Use ../fetch-prebuilt.sh to fetch prebuilt Rust dependencies \ No newline at end of file diff --git a/Dependencies/fetch-prebuilt.sh b/Dependencies/fetch-prebuilt.sh new file mode 100644 index 00000000..35760b95 --- /dev/null +++ b/Dependencies/fetch-prebuilt.sh @@ -0,0 +1,66 @@ +#!/usr/bin/env bash + +# Ensure we are in Dependencies directory +cd "$(dirname "$0")" + +check_for_update() { + if [ -f ".skip-prebuilt-fetch-$1" ]; then + echo "Skipping prebuilt fetch for $1 since .skip-prebuilt-fetch-$1 exists. If you are developing $1 alongside SideStore, don't remove this file, or this script will replace your locally built binaries with the ones built by GitHub Actions." + return + fi + + if [ ! -f ".last-prebuilt-fetch-$1" ]; then + echo "0,none" > ".last-prebuilt-fetch-$1" + fi + + LAST_FETCH=`cat .last-prebuilt-fetch-$1 | perl -n -e '/([0-9]*),([^ ]*)$/ && print $1'` + LAST_COMMIT=`cat .last-prebuilt-fetch-$1 | perl -n -e '/([0-9]*),([^ ]*)$/ && print $2'` + + # fetch if last fetch was over 1 hour ago + if [[ $LAST_FETCH -lt $(expr $(date +%s) - 3600) ]] || [[ "$2" == "force" ]]; then + echo "Checking $1 for update" + echo + LATEST_COMMIT=`curl https://api.github.com/repos/SideStore/$1/releases/latest | perl -n -e '/Commit: https:\\/\\/github\\.com\\/[^\\/]*\\/[^\\/]*\\/commit\\/([^"]*)/ && print $1'` + echo + echo "Last commit: $LAST_COMMIT" + echo "Latest commit: $LATEST_COMMIT" + if [[ "$LAST_COMMIT" != "$LATEST_COMMIT" ]]; then + echo "Found update, downloading binaries" + echo + wget -O "$1/lib$1-sim.a" "https://github.com/SideStore/$1/releases/latest/download/lib$1-sim.a" + if [[ "$1" != "minimuxer" ]]; then + wget -O "$1/lib$1.a" "https://github.com/SideStore/$1/releases/latest/download/lib$1.a" + wget -O "$1/$1.h" "https://github.com/SideStore/$1/releases/latest/download/$1.h" + echo + else + wget -O "$1/lib$1-ios.a" "https://github.com/SideStore/$1/releases/latest/download/lib$1-ios.a" + wget -O "$1/generated.zip" "https://github.com/SideStore/$1/releases/latest/download/generated.zip" + echo + echo "Unzipping generated.zip" + cd "$1" + unzip ./generated.zip + mv -v generated/* . + rm generated.zip + rmdir generated/ + cd .. + echo "Done" + fi + else + echo "Up-to-date" + fi + echo "$(date +%s),$LATEST_COMMIT" > ".last-prebuilt-fetch-$1" + else + echo "It hasn't been 1 hour and force was not specified, skipping update check for $1" + fi +} + +# Allow for Xcode to check minimuxer and em_proxy separately by skipping the update check if the other one is specified as an argument +if [[ "$1" != "em_proxy" ]]; then + check_for_update minimuxer "$1" + if [[ "$1" != "minimuxer" ]]; then + echo + fi +fi +if [[ "$1" != "minimuxer" ]]; then + check_for_update em_proxy "$1" +fi diff --git a/Dependencies/minimuxer b/Dependencies/minimuxer deleted file mode 160000 index 6a5a5b4e..00000000 --- a/Dependencies/minimuxer +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6a5a5b4e730e5f5ed6e337e768da52bd93ed3457 diff --git a/Dependencies/minimuxer.xcodeproj/project.pbxproj b/Dependencies/minimuxer.xcodeproj/project.pbxproj index 0c50e9b9..0eecb844 100644 --- a/Dependencies/minimuxer.xcodeproj/project.pbxproj +++ b/Dependencies/minimuxer.xcodeproj/project.pbxproj @@ -1,292 +1,300 @@ // !$*UTF8*$! { - /* generated with cargo-xcode 1.5.0 */ - archiveVersion = 1; - classes = { - }; - objectVersion = 53; - objects = { + archiveVersion = 1; + classes = { + }; + objectVersion = 53; + objects = { + /* Begin PBXBuildFile section */ - - CA6038F2DF2FA560B9642892 /* Cargo.toml in Sources */ = { - isa = PBXBuildFile; - fileRef = CA6012A875F93EF4668187A5 /* Cargo.toml */; - settings = { - COMPILER_FLAGS = "--lib"; /* == OTHER_INPUT_FILE_FLAGS */ - }; - }; - + 9961EC2829BE9C2000AF2C6F /* SwiftBridgeCore.h in Sources */ = {isa = PBXBuildFile; fileRef = 9961EC2729BE9C1200AF2C6F /* SwiftBridgeCore.h */; }; + 9987603329A454B500818586 /* minimuxer.h in Sources */ = {isa = PBXBuildFile; fileRef = 9987603229A454B500818586 /* minimuxer.h */; }; /* End PBXBuildFile section */ /* Begin PBXBuildRule section */ - CA6012A875F9AC6C1400ACA8 /* PBXBuildRule */ = { - isa = PBXBuildRule; - compilerSpec = com.apple.compilers.proxy.script; - dependencyFile = "$(DERIVED_FILE_DIR)/$(CARGO_XCODE_TARGET_ARCH)-$(EXECUTABLE_NAME).d"; - filePatterns = "*/Cargo.toml"; /* must contain asterisk */ - fileType = pattern.proxy; - inputFiles = (); - isEditable = 0; - name = "Cargo project build"; - outputFiles = ( - "$(OBJECT_FILE_DIR)/$(CARGO_XCODE_TARGET_ARCH)-$(EXECUTABLE_NAME)", - ); - script = "# generated with cargo-xcode 1.5.0\n\nset -eu; export PATH=\"$PATH:$HOME/.cargo/bin:/usr/local/bin\";\nif [ \"${IS_MACCATALYST-NO}\" = YES ]; then\n CARGO_XCODE_TARGET_TRIPLE=\"${CARGO_XCODE_TARGET_ARCH}-apple-ios-macabi\"\nelse\n CARGO_XCODE_TARGET_TRIPLE=\"${CARGO_XCODE_TARGET_ARCH}-apple-${CARGO_XCODE_TARGET_OS}\"\nfi\nif [ \"$CARGO_XCODE_TARGET_OS\" != \"darwin\" ]; then\n PATH=\"${PATH/\\/Contents\\/Developer\\/Toolchains\\/XcodeDefault.xctoolchain\\/usr\\/bin:/xcode-provided-ld-cant-link-lSystem-for-the-host-build-script:}\"\nfi\nPATH=\"$PATH:/opt/homebrew/bin\" # Rust projects often depend on extra tools like nasm, which Xcode lacks\nif [ \"$CARGO_XCODE_BUILD_MODE\" == release ]; then\n OTHER_INPUT_FILE_FLAGS=\"${OTHER_INPUT_FILE_FLAGS} --release\"\nfi\nif command -v rustup &> /dev/null; then\n if ! rustup target list --installed | egrep -q \"${CARGO_XCODE_TARGET_TRIPLE}\"; then\n echo \"warning: this build requires rustup toolchain for $CARGO_XCODE_TARGET_TRIPLE, but it isn\'t installed\"\n rustup target add \"${CARGO_XCODE_TARGET_TRIPLE}\" || echo >&2 \"warning: can\'t install $CARGO_XCODE_TARGET_TRIPLE\"\n fi\nfi\nif [ \"$ACTION\" = clean ]; then\n ( set -x; cargo clean --manifest-path=\"$SCRIPT_INPUT_FILE\" ${OTHER_INPUT_FILE_FLAGS} --target=\"${CARGO_XCODE_TARGET_TRIPLE}\"; );\nelse\n ( set -x; cargo build --manifest-path=\"$SCRIPT_INPUT_FILE\" --features=\"${CARGO_XCODE_FEATURES:-}\" ${OTHER_INPUT_FILE_FLAGS} --target=\"${CARGO_XCODE_TARGET_TRIPLE}\"; );\nfi\n# it\'s too hard to explain Cargo\'s actual exe path to Xcode build graph, so hardlink to a known-good path instead\nBUILT_SRC=\"${CARGO_TARGET_DIR}/${CARGO_XCODE_TARGET_TRIPLE}/${CARGO_XCODE_BUILD_MODE}/${CARGO_XCODE_CARGO_FILE_NAME}\"\nln -f -- \"$BUILT_SRC\" \"$SCRIPT_OUTPUT_FILE_0\"\n\n# xcode generates dep file, but for its own path, so append our rename to it\nDEP_FILE_SRC=\"${CARGO_TARGET_DIR}/${CARGO_XCODE_TARGET_TRIPLE}/${CARGO_XCODE_BUILD_MODE}/${CARGO_XCODE_CARGO_DEP_FILE_NAME}\"\nif [ -f \"$DEP_FILE_SRC\" ]; then\n DEP_FILE_DST=\"${DERIVED_FILE_DIR}/${CARGO_XCODE_TARGET_ARCH}-${EXECUTABLE_NAME}.d\"\n cp -f \"$DEP_FILE_SRC\" \"$DEP_FILE_DST\"\n echo >> \"$DEP_FILE_DST\" \"$SCRIPT_OUTPUT_FILE_0: $BUILT_SRC\"\nfi\n\n# lipo script needs to know all the platform-specific files that have been built\n# archs is in the file name, so that paths don\'t stay around after archs change\n# must match input for LipoScript\nFILE_LIST=\"${DERIVED_FILE_DIR}/${ARCHS}-${EXECUTABLE_NAME}.xcfilelist\"\ntouch \"$FILE_LIST\"\nif ! egrep -q \"$SCRIPT_OUTPUT_FILE_0\" \"$FILE_LIST\" ; then\n echo >> \"$FILE_LIST\" \"$SCRIPT_OUTPUT_FILE_0\"\nfi\n"; - }; + CA6012A875F9AC6C1400ACA8 /* PBXBuildRule */ = { + isa = PBXBuildRule; + compilerSpec = com.apple.compilers.proxy.script; + filePatterns = "*/minimuxer.h"; + fileType = pattern.proxy; + inputFiles = ( + ); + isEditable = 0; + name = "Cargo project build"; + outputFiles = ( + "$(OBJECT_FILE_DIR)/$(CARGO_XCODE_TARGET_ARCH)-$(EXECUTABLE_NAME)", + ); + script = "# generated with cargo-xcode 1.5.0\n# modified to use prebuilt binaries\n\nset -eu;\n\nBUILT_SRC=\"./minimuxer/$LIB_FILE_NAME.a\"\nln -f -- \"$BUILT_SRC\" \"$TARGET_BUILD_DIR/$EXECUTABLE_PATH\" || cp \"$BUILT_SRC\" \"$TARGET_BUILD_DIR/$EXECUTABLE_PATH\"\necho \"$BUILT_SRC -> $TARGET_BUILD_DIR/$EXECUTABLE_PATH\"\n\n# xcode generates dep file, but for its own path, so append our rename to it\n#DEP_FILE_SRC=\"minimuxer/target/${CARGO_XCODE_TARGET_TRIPLE}/release/${CARGO_XCODE_CARGO_DEP_FILE_NAME}\"\n#if [ -f \"$DEP_FILE_SRC\" ]; then\n# DEP_FILE_DST=\"${DERIVED_FILE_DIR}/${CARGO_XCODE_TARGET_ARCH}-${EXECUTABLE_NAME}.d\"\n# cp -f \"$DEP_FILE_SRC\" \"$DEP_FILE_DST\"\n# echo >> \"$DEP_FILE_DST\" \"$SCRIPT_OUTPUT_FILE_0: $BUILT_SRC\"\n#fi\n\n# lipo script needs to know all the platform-specific files that have been built\n# archs is in the file name, so that paths don't stay around after archs change\n# must match input for LipoScript\n#FILE_LIST=\"${DERIVED_FILE_DIR}/${ARCHS}-${EXECUTABLE_NAME}.xcfilelist\"\n#touch \"$FILE_LIST\"\n#if ! egrep -q \"$SCRIPT_OUTPUT_FILE_0\" \"$FILE_LIST\" ; then\n# echo >> \"$FILE_LIST\" \"$SCRIPT_OUTPUT_FILE_0\"\n#fi\n"; + }; /* End PBXBuildRule section */ /* Begin PBXFileReference section */ - - CA609C732349C7AAD9FA67C4 /* staticlib */ = { - isa = PBXFileReference; - explicitFileType = "archive.ar"; - includeInIndex = 0; - name = "libminimuxer_static.a"; - sourceTree = TARGET_BUILD_DIR; - }; - CA6012A875F93EF4668187A5 /* Cargo.toml */ = { - isa = PBXFileReference; - lastKnownFileType = text; - fileEncoding = 4; - name = "Cargo.toml"; - path = "minimuxer/Cargo.toml"; - sourceTree = ""; - }; - /* Rust needs libresolv */ - ADDEDBA66A6E1 = { - isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; - name = libresolv.tbd; path = usr/lib/libresolv.tbd; sourceTree = SDKROOT; - }; - + 9961EC2729BE9C1200AF2C6F /* SwiftBridgeCore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwiftBridgeCore.h; path = minimuxer/SwiftBridgeCore.h; sourceTree = ""; }; + 9987603229A454B500818586 /* minimuxer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = minimuxer.h; path = minimuxer/minimuxer.h; sourceTree = ""; }; + ADDEDBA66A6E1 /* libresolv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libresolv.tbd; path = usr/lib/libresolv.tbd; sourceTree = SDKROOT; }; + CA609C732349C7AAD9FA67C4 /* libminimuxer_static.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libminimuxer_static.a; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXGroup section */ - CA6012A875F998AF0B5890DB /* Frameworks */ = { - isa = PBXGroup; - children = ( - ADDEDBA66A6E2, - - ); - name = Frameworks; - sourceTree = ""; - }; - - - ADDEDBA66A6E2 /* Required for static linking */ = { - isa = PBXGroup; - children = ( - ADDEDBA66A6E1 - ); - name = "Required for static linking"; - sourceTree = ""; - }; - - CA6012A875F922869D176AE5 /* Products */ = { - isa = PBXGroup; - children = ( - CA609C732349C7AAD9FA67C4, - - ); - name = Products; - sourceTree = ""; - }; - - CA6012A875F9D65BC3C892A8 /* Main */ = { - isa = PBXGroup; - children = ( - CA6012A875F93EF4668187A5, -CA6012A875F922869D176AE5, -CA6012A875F998AF0B5890DB, - - ); - sourceTree = ""; - }; - + 99F87D1529D8E41100B40039 /* Generated */ = { + isa = PBXGroup; + children = ( + 9961EC2729BE9C1200AF2C6F /* SwiftBridgeCore.h */, + 9987603229A454B500818586 /* minimuxer.h */, + ); + name = Generated; + sourceTree = ""; + }; + ADDEDBA66A6E2 /* Required for static linking */ = { + isa = PBXGroup; + children = ( + ADDEDBA66A6E1 /* libresolv.tbd */, + ); + name = "Required for static linking"; + sourceTree = ""; + }; + CA6012A875F922869D176AE5 /* Products */ = { + isa = PBXGroup; + children = ( + CA609C732349C7AAD9FA67C4 /* libminimuxer_static.a */, + ); + name = Products; + sourceTree = ""; + }; + CA6012A875F998AF0B5890DB /* Frameworks */ = { + isa = PBXGroup; + children = ( + ADDEDBA66A6E2 /* Required for static linking */, + ); + name = Frameworks; + sourceTree = ""; + }; + CA6012A875F9D65BC3C892A8 = { + isa = PBXGroup; + children = ( + 99F87D1529D8E41100B40039 /* Generated */, + CA6012A875F922869D176AE5 /* Products */, + CA6012A875F998AF0B5890DB /* Frameworks */, + ); + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - CA609C732349A560B9642892 /* minimuxer-staticlib */ = { - isa = PBXNativeTarget; - buildConfigurationList = CA600589A243A560B9642892; - buildPhases = ( - CA600F638141A560B9642892 /* Sources */, - CA6012A875F9AF6EBB7F357C /* Universal Binary lipo */, - ); - buildRules = ( - CA6012A875F9AC6C1400ACA8 /* PBXBuildRule */, - ); - dependencies = ( - ); - name = "minimuxer-staticlib"; - productName = "libminimuxer_static.a"; - productReference = CA609C732349C7AAD9FA67C4; - productType = "com.apple.product-type.library.static"; - }; - + CA609C732349A560B9642892 /* minimuxer-staticlib */ = { + isa = PBXNativeTarget; + buildConfigurationList = CA600589A243A560B9642892 /* Build configuration list for PBXNativeTarget "minimuxer-staticlib" */; + buildPhases = ( + 9987603629A4611D00818586 /* Run Script */, + CA600F638141A560B9642892 /* Sources */, + CA6012A875F9AF6EBB7F357C /* Universal Binary lipo */, + ); + buildRules = ( + CA6012A875F9AC6C1400ACA8 /* PBXBuildRule */, + ); + dependencies = ( + ); + name = "minimuxer-staticlib"; + productName = libminimuxer_static.a; + productReference = CA609C732349C7AAD9FA67C4 /* libminimuxer_static.a */; + productType = "com.apple.product-type.library.static"; + }; /* End PBXNativeTarget section */ - CA600F638141A560B9642892 = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - CA6038F2DF2FA560B9642892 - ); - runOnlyForDeploymentPostprocessing = 0; - }; - - CA600589A243A560B9642892 /* staticlib */ = { - isa = XCConfigurationList; - buildConfigurations = ( - CA602DE9FCEDA560B9642892 /* Release */, - CA6008D36272A560B9642892 /* Debug */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - CA602DE9FCEDA560B9642892 /* staticlib */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = "minimuxer_static"; - "CARGO_XCODE_CARGO_FILE_NAME" = "libminimuxer.a"; - "CARGO_XCODE_CARGO_DEP_FILE_NAME" = "libminimuxer.d"; - SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos appletvsimulator appletvos"; - SKIP_INSTALL = YES; - INSTALL_GROUP = ""; - INSTALL_MODE_FLAG = ""; - INSTALL_OWNER = ""; - - }; - name = Release; - }; - CA6008D36272A560B9642892 /* staticlib */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = "minimuxer_static"; - "CARGO_XCODE_CARGO_FILE_NAME" = "libminimuxer.a"; - "CARGO_XCODE_CARGO_DEP_FILE_NAME" = "libminimuxer.d"; - SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos appletvsimulator appletvos"; - SKIP_INSTALL = YES; - INSTALL_GROUP = ""; - INSTALL_MODE_FLAG = ""; - INSTALL_OWNER = ""; - - }; - name = Debug; - }; +/* Begin PBXProject section */ + CA6012A875F9E04653AD465F /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 1300; + TargetAttributes = { + CA609C732349A560B9642892 = { + CreatedOnToolsVersion = 9.2; + ProvisioningStyle = Automatic; + }; + }; + }; + buildConfigurationList = CA6012A875F980E02D6C7F57 /* Build configuration list for PBXProject "minimuxer" */; + compatibilityVersion = "Xcode 11.4"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = CA6012A875F9D65BC3C892A8; + productRefGroup = CA6012A875F922869D176AE5 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + CA609C732349A560B9642892 /* minimuxer-staticlib */, + ); + }; +/* End PBXProject section */ - CA6012A875F9AF6EBB7F357C /* LipoScript */ = { - name = "Universal Binary lipo"; - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = (); - inputFileListPaths = (); - inputPaths = ( - "$(DERIVED_FILE_DIR)/$(ARCHS)-$(EXECUTABLE_NAME).xcfilelist", - ); - outputFileListPaths = (); - outputPaths = ( - "$(TARGET_BUILD_DIR)/$(EXECUTABLE_PATH)" - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "# generated with cargo-xcode 1.5.0\n\n set -eux; cat \"$DERIVED_FILE_DIR/$ARCHS-$EXECUTABLE_NAME.xcfilelist\" | tr \'\\n\' \'\\0\' | xargs -0 lipo -create -output \"$TARGET_BUILD_DIR/$EXECUTABLE_PATH\"\n if [ ${LD_DYLIB_INSTALL_NAME:+1} ]; then\n install_name_tool -id \"$LD_DYLIB_INSTALL_NAME\" \"$TARGET_BUILD_DIR/$EXECUTABLE_PATH\"\n fi\n "; - }; +/* Begin PBXShellScriptBuildPhase section */ + 9987603629A4611D00818586 /* Run Script */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "Run Script"; + outputFileListPaths = ( + ); + outputPaths = ( + ./minimuxer/minimuxer.h, + ./minimuxer/SwiftBridgeCore.h, + ./minimuxer/minimuxer.swift, + ./minimuxer/SwiftBridgeCore.swift, + "./minimuxer/minimuxer-Bridging-Header.h", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "bash ./fetch-prebuilt.sh minimuxer\n"; + }; + CA6012A875F9AF6EBB7F357C /* Universal Binary lipo */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "$(DERIVED_FILE_DIR)/$(ARCHS)-$(EXECUTABLE_NAME).xcfilelist", + ); + name = "Universal Binary lipo"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(TARGET_BUILD_DIR)/$(EXECUTABLE_PATH)", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "# generated with cargo-xcode 1.5.0\n\n#set -eux; cat \"$DERIVED_FILE_DIR/$ARCHS-$EXECUTABLE_NAME.xcfilelist\" | tr '\\n' '\\0' | xargs -0 lipo -create -output \"$TARGET_BUILD_DIR/$EXECUTABLE_PATH\"\n#if [ ${LD_DYLIB_INSTALL_NAME:+1} ]; then\n# install_name_tool -id \"$LD_DYLIB_INSTALL_NAME\" \"$TARGET_BUILD_DIR/$EXECUTABLE_PATH\"\n#fi\n"; + }; +/* End PBXShellScriptBuildPhase section */ - CA6012A875F980E02D6C7F57 = { - isa = XCConfigurationList; - buildConfigurations = ( - CA60A20F8EA63CC16B37690B /* Release */, - CA60A20F8EA6228BE02872F8 /* Debug */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; +/* Begin PBXSourcesBuildPhase section */ + CA600F638141A560B9642892 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 9961EC2829BE9C2000AF2C6F /* SwiftBridgeCore.h in Sources */, + 9987603329A454B500818586 /* minimuxer.h in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ - CA60A20F8EA63CC16B37690B = { - isa = XCBuildConfiguration; - buildSettings = { - - ALWAYS_SEARCH_USER_PATHS = NO; - SUPPORTS_MACCATALYST = YES; - CARGO_TARGET_DIR = "$(PROJECT_TEMP_DIR)/cargo_target"; /* for cargo */ - CARGO_XCODE_FEATURES = ""; /* configure yourself */ - "CARGO_XCODE_TARGET_ARCH[arch=arm64*]" = "aarch64"; - "CARGO_XCODE_TARGET_ARCH[arch=x86_64*]" = "x86_64"; /* catalyst adds h suffix */ - "CARGO_XCODE_TARGET_ARCH[arch=i386]" = "i686"; - "CARGO_XCODE_TARGET_OS[sdk=macosx*]" = "darwin"; - "CARGO_XCODE_TARGET_OS[sdk=iphonesimulator*]" = "ios-sim"; - "CARGO_XCODE_TARGET_OS[sdk=iphonesimulator*][arch=x86_64*]" = "ios"; - "CARGO_XCODE_TARGET_OS[sdk=iphoneos*]" = "ios"; - "CARGO_XCODE_TARGET_OS[sdk=appletvsimulator*]" = "tvos"; - "CARGO_XCODE_TARGET_OS[sdk=appletvos*]" = "tvos"; - PRODUCT_NAME = "minimuxer"; - MARKETING_VERSION = "0.1.0"; - CURRENT_PROJECT_VERSION = "0.1"; - SDKROOT = macosx; - - "CARGO_XCODE_BUILD_MODE" = "release"; /* for xcode scripts */ - }; - name = Release; - }; +/* Begin XCBuildConfiguration section */ + CA6008D36272A560B9642892 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CARGO_XCODE_CARGO_DEP_FILE_NAME = libminimuxer.d; + CARGO_XCODE_CARGO_FILE_NAME = libminimuxer.a; + INSTALL_GROUP = ""; + INSTALL_MODE_FLAG = ""; + INSTALL_OWNER = ""; + LIB_FILE_NAME = ""; + "LIB_FILE_NAME[sdk=iphoneos*]" = "libminimuxer-ios"; + "LIB_FILE_NAME[sdk=iphonesimulator*]" = "libminimuxer-sim"; + PRODUCT_NAME = minimuxer_static; + SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos appletvsimulator appletvos"; + }; + name = Debug; + }; + CA602DE9FCEDA560B9642892 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CARGO_XCODE_CARGO_DEP_FILE_NAME = libminimuxer.d; + CARGO_XCODE_CARGO_FILE_NAME = libminimuxer.a; + INSTALL_GROUP = ""; + INSTALL_MODE_FLAG = ""; + INSTALL_OWNER = ""; + LIB_FILE_NAME = ""; + "LIB_FILE_NAME[sdk=iphoneos*]" = "libminimuxer-ios"; + "LIB_FILE_NAME[sdk=iphonesimulator*]" = "libminimuxer-sim"; + PRODUCT_NAME = minimuxer_static; + SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos appletvsimulator appletvos"; + }; + name = Release; + }; + CA60A20F8EA6228BE02872F8 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CARGO_TARGET_DIR = "$(PROJECT_TEMP_DIR)/cargo_target"; + CARGO_XCODE_BUILD_MODE = debug; + CARGO_XCODE_FEATURES = ""; + "CARGO_XCODE_TARGET_ARCH[arch=arm64*]" = aarch64; + "CARGO_XCODE_TARGET_ARCH[arch=i386]" = i686; + "CARGO_XCODE_TARGET_ARCH[arch=x86_64*]" = x86_64; + "CARGO_XCODE_TARGET_OS[sdk=appletvos*]" = tvos; + "CARGO_XCODE_TARGET_OS[sdk=appletvsimulator*]" = tvos; + "CARGO_XCODE_TARGET_OS[sdk=iphoneos*]" = ios; + "CARGO_XCODE_TARGET_OS[sdk=iphonesimulator*]" = "ios-sim"; + "CARGO_XCODE_TARGET_OS[sdk=iphonesimulator*][arch=x86_64*]" = ios; + "CARGO_XCODE_TARGET_OS[sdk=macosx*]" = darwin; + CURRENT_PROJECT_VERSION = 0.1; + MARKETING_VERSION = 0.1.0; + ONLY_ACTIVE_ARCH = YES; + PRODUCT_NAME = minimuxer; + SDKROOT = macosx; + SUPPORTS_MACCATALYST = YES; + }; + name = Debug; + }; + CA60A20F8EA63CC16B37690B /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CARGO_TARGET_DIR = "$(PROJECT_TEMP_DIR)/cargo_target"; + CARGO_XCODE_BUILD_MODE = release; + CARGO_XCODE_FEATURES = ""; + "CARGO_XCODE_TARGET_ARCH[arch=arm64*]" = aarch64; + "CARGO_XCODE_TARGET_ARCH[arch=i386]" = i686; + "CARGO_XCODE_TARGET_ARCH[arch=x86_64*]" = x86_64; + "CARGO_XCODE_TARGET_OS[sdk=appletvos*]" = tvos; + "CARGO_XCODE_TARGET_OS[sdk=appletvsimulator*]" = tvos; + "CARGO_XCODE_TARGET_OS[sdk=iphoneos*]" = ios; + "CARGO_XCODE_TARGET_OS[sdk=iphonesimulator*]" = "ios-sim"; + "CARGO_XCODE_TARGET_OS[sdk=iphonesimulator*][arch=x86_64*]" = ios; + "CARGO_XCODE_TARGET_OS[sdk=macosx*]" = darwin; + CURRENT_PROJECT_VERSION = 0.1; + MARKETING_VERSION = 0.1.0; + PRODUCT_NAME = minimuxer; + SDKROOT = macosx; + SUPPORTS_MACCATALYST = YES; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ - CA60A20F8EA6228BE02872F8 = { - isa = XCBuildConfiguration; - buildSettings = { - - ALWAYS_SEARCH_USER_PATHS = NO; - SUPPORTS_MACCATALYST = YES; - CARGO_TARGET_DIR = "$(PROJECT_TEMP_DIR)/cargo_target"; /* for cargo */ - CARGO_XCODE_FEATURES = ""; /* configure yourself */ - "CARGO_XCODE_TARGET_ARCH[arch=arm64*]" = "aarch64"; - "CARGO_XCODE_TARGET_ARCH[arch=x86_64*]" = "x86_64"; /* catalyst adds h suffix */ - "CARGO_XCODE_TARGET_ARCH[arch=i386]" = "i686"; - "CARGO_XCODE_TARGET_OS[sdk=macosx*]" = "darwin"; - "CARGO_XCODE_TARGET_OS[sdk=iphonesimulator*]" = "ios-sim"; - "CARGO_XCODE_TARGET_OS[sdk=iphonesimulator*][arch=x86_64*]" = "ios"; - "CARGO_XCODE_TARGET_OS[sdk=iphoneos*]" = "ios"; - "CARGO_XCODE_TARGET_OS[sdk=appletvsimulator*]" = "tvos"; - "CARGO_XCODE_TARGET_OS[sdk=appletvos*]" = "tvos"; - PRODUCT_NAME = "minimuxer"; - MARKETING_VERSION = "0.1.0"; - CURRENT_PROJECT_VERSION = "0.1"; - SDKROOT = macosx; - - "CARGO_XCODE_BUILD_MODE" = "debug"; /* for xcode scripts */ - ONLY_ACTIVE_ARCH = YES; - }; - name = Debug; - }; - - CA6012A875F9E04653AD465F = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 1300; - TargetAttributes = { - CA609C732349A560B9642892 = { - CreatedOnToolsVersion = 9.2; - ProvisioningStyle = Automatic; - }; - }; - }; - buildConfigurationList = CA6012A875F980E02D6C7F57; - compatibilityVersion = "Xcode 11.4"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = CA6012A875F9D65BC3C892A8; - productRefGroup = CA6012A875F922869D176AE5 /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - CA609C732349A560B9642892, - - ); - }; - - }; - rootObject = CA6012A875F9E04653AD465F; +/* Begin XCConfigurationList section */ + CA600589A243A560B9642892 /* Build configuration list for PBXNativeTarget "minimuxer-staticlib" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + CA602DE9FCEDA560B9642892 /* Release */, + CA6008D36272A560B9642892 /* Debug */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + CA6012A875F980E02D6C7F57 /* Build configuration list for PBXProject "minimuxer" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + CA60A20F8EA63CC16B37690B /* Release */, + CA60A20F8EA6228BE02872F8 /* Debug */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = CA6012A875F9E04653AD465F /* Project object */; } - \ No newline at end of file diff --git a/Dependencies/minimuxer/.gitkeep b/Dependencies/minimuxer/.gitkeep new file mode 100644 index 00000000..d338f61d --- /dev/null +++ b/Dependencies/minimuxer/.gitkeep @@ -0,0 +1 @@ +Use ../fetch-prebuilt.sh to fetch prebuilt Rust dependencies \ No newline at end of file diff --git a/Dependencies/update.sh b/Dependencies/update.sh deleted file mode 100755 index bdcea4c2..00000000 --- a/Dependencies/update.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash -set -e; set -o pipefail; set -x; - -echo "Building Rust projects..." -cd em_proxy -cargo xcode --output-dir ../ -cd ../ -cd minimuxer -cargo xcode --output-dir ../ -echo "Done!" diff --git a/EmotionalDamage/em_proxy.h b/EmotionalDamage/em_proxy.h deleted file mode 100644 index fd09f4fa..00000000 --- a/EmotionalDamage/em_proxy.h +++ /dev/null @@ -1,40 +0,0 @@ -// Jackson Coxson - -#include -#include -#include -#include -#include - - -/** - * Starts your emotional damage - * # Arguments - * * `bind_addr` - The UDP socket to listen to - * # Returns - * A handle to stop further emotional damage. - * Null on failure - * # Safety - * Don't be stupid - */ -int start_emotional_damage(const char *bind_addr); - -/** - * Stops further emotional damage - * # Arguments - * * `handle` - The coping mechanism generated by start_emotional_damage - * # Returns - * The knowledge of knowing that you couldn't handle failure - * # Safety - * Don't be stupid - */ -void stop_emotional_damage(void); - -/** - * Blocks until Wireguard is ready - * # Arguments - * * `timeout` - The timeout in miliseconds to wait for Wireguard - * # Returns - * 0 on success, -1 on failure - */ -int test_emotional_damage(int timeout); diff --git a/Makefile b/Makefile index 69952f3f..503859bf 100644 --- a/Makefile +++ b/Makefile @@ -2,8 +2,6 @@ SHELL := /bin/bash .PHONY: help ios update tvos RUBY := $(shell command -v ruby 2>/dev/null) -RUST := $(shell command -v rust 2>/dev/null) -RUSTUP := $(shell command -v rustup 2>/dev/null) HOMEBREW := $(shell command -v brew 2>/dev/null) BUNDLER := $(shell command -v bundle 2>/dev/null) @@ -72,11 +70,7 @@ help: ## Install dependencies. setup: \ - pre_setup \ - install_rust \ - install_rustup \ - install_rust_toolchain \ - build_rust_dependencies + pre_setup # check_for_homebrew \ # update_homebrew \ @@ -89,20 +83,6 @@ pull_request: \ pre_setup: $(info Project setup…) -check_for_rust: - $(info Checking for Rust…) - -ifeq ($(RUST),) - $(error Rust is not installed.) -endif - -check_for_rustup: - $(info Checking for Rustup…) - -ifeq ($(RUSTUP),) - $(error Rust is not installed.) -endif - check_for_ruby: $(info Checking for Ruby…) @@ -153,79 +133,12 @@ pull: ## -- Source Code Tasks -- ## Pull upstream and update 3rd party frameworks -# update: pull submodules build_rust_dependencies -update: submodules build_rust_dependencies +update: submodules submodules: $(info Updating submodules…) - git submodule update --init --recursive - -build_rust_dependencies: - $(info Building Rust dependencies…) - - pushd Dependencies/em_proxy - cargo build --release --target aarch64-apple-ios - popd - pushd Dependencies/minimuxer - cargo build --release --target aarch64-apple-ios - popd - -install_rustup: - $(info Installing Rustup…) - - curl https://sh.rustup.rs -sSf | sh - source "$(HOME)/.cargo/env" - rustup target add aarch64-apple-ios - -# TODO: Add x86, armv7? toolchains -# https://doc.rust-lang.org/nightly/rustc/platform-support.html - -install_cbindgen: - $(info Installing cbindgen…) - - cargo install cbindgen - -install_rust_toolchain: - $(info Installing Rust toolchain…) - - rustup target add aarch64-apple-ios - -install_rust_toolchain_ios_sim: - $(info Installing Rust iOS Sim toolchain…) - - rustup target add aarch64-apple-ios-sim - -install_rust_toolchain_tvos: - $(info Installing Rust tvOS toolchain…) - - rustup target add aarch64-apple-tvos - -install_rust_toolchain_tvos_sim: - $(info Installing Rust tvOS Sim toolchain…) - - rustup target add aarch64-apple-tvos-sim - -install_rust_toolchain_watchos_sim: - $(info Installing Rust watchOS Sim toolchain…) - - rustup target add aarch64-apple-watchos-sim - -install_rust_toolchain_watchos: - $(info Installing Rust watchOS toolchain…) - - rustup target add aarch64-apple-watchos - -install_rust_toolchain_catalyst: - $(info Installing Rust macOS Catalyst toolchain…) - - rustup target add aarch64-apple-ios-macabi - -install_rust: - $(info Installing Rust…) - - curl https://sh.rustup.rs -sSf | sh - source "$(HOME)/.cargo/env" + git submodule update --init --recursive --remote ## -- QA Task Runners -- @@ -243,32 +156,25 @@ test: ## -- Building -- -developer_ios: - $(info Building iOS for Developer profile…) +build: + @xcodebuild -project AltStore.xcodeproj \ + -scheme AltStore \ + -sdk iphoneos \ + archive -archivePath ./archive \ + CODE_SIGNING_REQUIRED=NO \ + AD_HOC_CODE_SIGNING_ALLOWED=YES \ + CODE_SIGNING_ALLOWED=NO \ + DEVELOPMENT_TEAM=XYZ0123456 \ + ORG_IDENTIFIER=com.SideStore \ + DWARF_DSYM_FOLDER_PATH="." - xcodebuild -project AltStore.xcodeproj -scheme AltStore -sdk iphoneos archive -archivePath ./archive CODE_SIGNING_REQUIRED=NO AD_HOC_CODE_SIGNING_ALLOWED=YES CODE_SIGNING_ALLOWED=NO DEVELOPMENT_TEAM=XYZ0123456 ORG_IDENTIFIER=com.SideStore | xcpretty +fakesign: + rm -rf archive.xcarchive/Products/Applications/SideStore.app/Frameworks/AltStoreCore.framework/Frameworks/ + ldid -SAltStore/Resources/tempEnt.plist archive.xcarchive/Products/Applications/SideStore.app/SideStore -developer_tvos: - $(info Building tvOS for Developer profile…) +ipa: + mkdir Payload + mkdir Payload/SideStore.app + cp -R archive.xcarchive/Products/Applications/SideStore.app/ Payload/SideStore.app/ + zip -r SideStore.ipa Payload - xcodebuild -project AltStore.xcodeproj -scheme AltStore -sdk tvos archive -archivePath ./archive CODE_SIGNING_REQUIRED=NO AD_HOC_CODE_SIGNING_ALLOWED=YES CODE_SIGNING_ALLOWED=NO DEVELOPMENT_TEAM=XYZ0123456 ORG_IDENTIFIER=com.SideStore | xcpretty - -## Update & build for iOS -ios: | update developer_ios - -## Update & build for tvOS -tvos: | update developer_tvos - -## Open the workspace -open: - open AltStore.xcodeproj - -## tag and release to github -release: | _var_VERSION - @if ! git diff --quiet HEAD; then \ - ( $(call _error,refusing to release with uncommitted changes) ; exit 1 ); \ - fi - test - package - make --no-print-directory _tag VERSION=$(VERSION) - make --no-print-directory _push VERSION=$(VERSION) diff --git a/README.md b/README.md index 06da08e6..66faf98d 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,10 @@ [![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](https://www.gnu.org/licenses/agpl-3.0) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://makeapullrequest.com) -[![Build and Upload SideStore](https://github.com/SideStore/SideStore/actions/workflows/build.yml/badge.svg)](https://github.com/SideStore/SideStore/actions/workflows/build.yml) +[![Nightly SideStore build](https://github.com/SideStore/SideStore/actions/workflows/nightly.yml/badge.svg)](https://github.com/SideStore/SideStore/actions/workflows/nightly.yml) +[![.github/workflows/beta.yml](https://github.com/SideStore/SideStore/actions/workflows/beta.yml/badge.svg)](https://github.com/SideStore/SideStore/actions/workflows/beta.yml) + +![Alt](https://repobeats.axiom.co/api/embed/3a329ce95955690b9a9366f8d5598626a847d96c.svg "Repobeats analytics image") SideStore is an iOS application that allows you to sideload apps onto your iOS device with just your Apple ID. SideStore resigns apps with your personal development certificate, and then uses a [specially designed VPN](https://github.com/jkcoxson/Secret-Tunnel) in order to trick iOS into installing them. SideStore will periodically "refresh" your apps in the background, to keep their normal 7-day development period from expiring. @@ -12,7 +15,6 @@ SideStore's goal is to provide an untethered sideloading experience. It's a comm (Contributions are welcome! 🙂) - ## Requirements - Xcode 14 - iOS 14+ @@ -35,21 +37,9 @@ SideStore is a just regular, sandboxed iOS application. The AltStore app target We're hoping to eventually eliminate our dependency on it, as it increases the amount of unnecessary Objective-C in the project. -## Compilation Instructions -SideStore is fairly straightforward to compile and run if you're already an iOS or macOS developer. Here are some basic instructions to get you started: +## Contributing/Compilation Instructions -1. Clone the repository - ``` - git clone https://github.com/SideStore/SideStore.git --recurse-submodules - ``` -2. After installing Rustup, run `rustup target add aarch64-apple-ios` -12. Within the Dependencies/em_proxy and Dependencies/minimuxer directories, run `cargo build --release --target aarch64-apple-ios` -2. Open `AltStore.xcodeproj` and select the AltStore project in the project navigator. On the `Signing & Capabilities` tab, change the team from to your own account. -3. **(Development only)** Change the value for `ALTDeviceID` in the Info.plist to your device's UDID. Normally, SideServer embeds the device's UDID in SideStore's Info.plist during installation. When running through Xcode you'll need to set the value yourself or else SideStore won't resign (or even install) apps for the proper device. You can achieve this by changing a few things to be able to build and use SideStore. -5. Copy `CodeSigning.xcconfig.sample` to `CodeSigning.xcconfig` -6. Fill out all of the properties in `CodeSigning.xcconfig` to match your account. -7. In `Shared/Extensions/Bundle+AltStore.swift`, replace "group.com.rileytestut.AltStore" with your own App Group ID. -8. Build + run app! 🎉 +Please see [CONTRIBUTING.md](./CONTRIBUTING.md) ## Licensing diff --git a/Shared/Extensions/Bundle+AltStore.swift b/Shared/Extensions/Bundle+AltStore.swift index cd3eff27..6754f5c9 100644 --- a/Shared/Extensions/Bundle+AltStore.swift +++ b/Shared/Extensions/Bundle+AltStore.swift @@ -55,7 +55,7 @@ public extension Bundle public extension Bundle { - static var baseAltStoreAppGroupID = "group.com.SideStore.SideStore" + static var baseAltStoreAppGroupID = "group." + Bundle.Info.appbundleIdentifier var appGroups: [String] { return self.infoDictionary?[Bundle.Info.appGroups] as? [String] ?? [] diff --git a/minimuxer/minimuxer.h b/minimuxer/minimuxer.h deleted file mode 100644 index 0abc5419..00000000 --- a/minimuxer/minimuxer.h +++ /dev/null @@ -1,76 +0,0 @@ -// Jackson Coxson - -#include -#include -#include -#include -#include - - -/** - * Mount iOS's developer DMG - * # Safety - * Don't be stupid - */ -void minimuxer_auto_mount(char *docs_path); - -/** - * Starts the muxer and heartbeat client - * # Arguments - * Pairing file as a list of chars and the length - * # Safety - * Don't be stupid - */ -int minimuxer_c_start(char *pairing_file, char *log_path); - -/** - * Debugs an app from an app ID - * # Safety - * Don't be stupid - */ -int minimuxer_debug_app(char *app_id); - -/** - * Installs an ipa with a bundle ID - * Expects the ipa to be in the afc jail from yeet_app_afc - * # Safety - * Don't be stupid - */ -int minimuxer_install_ipa(char *bundle_id); - -/** - * Installs a provisioning profile on the device - * # Arguments - * Pass a pointer to a plist - * # Returns - * 0 on success - * # Safety - * Don't be stupid - */ -int minimuxer_install_provisioning_profile(uint8_t *pointer, unsigned int len); - -/** - * Removes an app from the device - * # Safety - * Don't be stupid - */ -int minimuxer_remove_app(char *bundle_id); - -/** - * Removes a provisioning profile - * # Safety - * Don't be stupid - */ -int minimuxer_remove_provisioning_profile(char *id); - -/** - * Yeets an ipa to the afc jail - * # Safety - * Don't be stupid - */ -int minimuxer_yeet_app_afc(char *bundle_id, uint8_t *bytes_ptr, unsigned long bytes_len); - -/** - * Sets the current environment variable for libusbmuxd to localhost - */ -void target_minimuxer_address(void); diff --git a/minimuxer/minimuxer.swift b/minimuxer/minimuxer.swift deleted file mode 100644 index fb024f63..00000000 --- a/minimuxer/minimuxer.swift +++ /dev/null @@ -1,111 +0,0 @@ -// -// minimuxer.swift -// minimuxer -// -// Created by Jackson Coxson on 10/27/22. -// - -import Foundation - -public enum Uhoh: Error { - case Good - case Bad(code: Int32) -} - -public func start_minimuxer(pairing_file: String) -> Int32 { - let pf = NSString(string: pairing_file) - let pf_pointer = UnsafeMutablePointer(mutating: pf.utf8String) - let u = NSString(string: getDocumentsDirectory().absoluteString) - let u_ptr = UnsafeMutablePointer(mutating: u.utf8String) - return minimuxer_c_start(pf_pointer, u_ptr) -} - -public func set_usbmuxd_socket() { - target_minimuxer_address() -} - -public func debug_app(app_id: String) throws -> Uhoh { - let ai = NSString(string: app_id) - let ai_pointer = UnsafeMutablePointer(mutating: ai.utf8String) - #if false // Retries - var res = minimuxer_debug_app(ai_pointer) - var attempts = 10 - while (attempts != 0 && res != 0) { - print("(JIT) ATTEMPTS: \(attempts)") - res = minimuxer_debug_app(ai_pointer) - attempts -= 1 - } - #else - let res = minimuxer_debug_app(ai_pointer) - #endif - if res != 0 { - throw Uhoh.Bad(code: res) - } - return Uhoh.Good -} - -public func install_provisioning_profile(plist: Data) throws -> Uhoh { - let pls = String(decoding: plist, as: UTF8.self) - print(pls) - print(plist) - #if false // Retries - var res = minimuxer_install_provisioning_profile(x, UInt32(plist.count)) - var attempts = 10 - while (attempts != 0 && res != 0) { - print("(INSTALL) ATTEMPTS: \(attempts)") - res = minimuxer_install_provisioning_profile(x, UInt32(plist.count)) - attempts -= 1 - } - #else - let x = plist.withUnsafeBytes { buf in UnsafeMutableRawPointer(mutating: buf) } - #endif - let res = minimuxer_install_provisioning_profile(x, UInt32(plist.count)) - if res != 0 { - throw Uhoh.Bad(code: res) - } - return Uhoh.Good -} - -public func remove_provisioning_profile(id: String) throws -> Uhoh { - let id_ns = NSString(string: id) - let id_pointer = UnsafeMutablePointer(mutating: id_ns.utf8String) - #if false // Retries - var res = minimuxer_remove_provisioning_profile(id_pointer) - var attempts = 10 - while (attempts != 0 && res != 0) { - print("(REMOVE PROFILE) ATTEMPTS: \(attempts)") - res = minimuxer_remove_provisioning_profile(id_pointer) - attempts -= 1 - } - #else - let res = minimuxer_remove_provisioning_profile(id_pointer) - #endif - if res != 0 { - throw Uhoh.Bad(code: res) - } - return Uhoh.Good -} - -public func remove_app(app_id: String) throws -> Uhoh { - let ai = NSString(string: app_id) - let ai_pointer = UnsafeMutablePointer(mutating: ai.utf8String) - let res = minimuxer_remove_app(ai_pointer) - if res != 0 { - throw Uhoh.Bad(code: res) - } - return Uhoh.Good -} - -public func auto_mount_dev_image() { - let u = NSString(string: getDocumentsDirectory().absoluteString) - let u_ptr = UnsafeMutablePointer(mutating: u.utf8String) - minimuxer_auto_mount(u_ptr) -} - -func getDocumentsDirectory() -> URL { - // find all possible documents directories for this user - let paths = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask) - - // just send back the first one, which ought to be the only one - return paths[0] -} diff --git a/trustedapps.json b/trustedapps.json index 016fadf3..a88df4a8 100644 --- a/trustedapps.json +++ b/trustedapps.json @@ -26,7 +26,7 @@ }, { "identifier": "dev.crystall1ne.repos.PojavLauncher", - "sourceURL": "https://alt.crystall1ne.software/" + "sourceURL": "https://alt.crystall1ne.dev" }, { "identifier": "eu.pokemmo.altstore",