From ee054ed1a6f91ba004230bf7e8161853af98bda8 Mon Sep 17 00:00:00 2001 From: Jason Millard Date: Thu, 13 Feb 2025 20:29:05 -0500 Subject: [PATCH] misc: shorten externals, add linux arm64 runners --- .github/workflows/libdmdutil.yml | 64 +++++------------------ platforms/android/arm64-v8a/external.sh | 23 ++++---- platforms/ios-simulator/arm64/external.sh | 25 ++++----- platforms/ios/arm64/external.sh | 23 ++++---- platforms/linux/aarch64/external.sh | 23 ++++---- platforms/linux/x64/external.sh | 23 ++++---- platforms/macos/arm64/external.sh | 23 ++++---- platforms/macos/x64/external.sh | 23 ++++---- platforms/tvos/arm64/external.sh | 23 ++++---- platforms/win/x64/external.sh | 23 ++++---- platforms/win/x86/external.sh | 23 ++++---- 11 files changed, 144 insertions(+), 152 deletions(-) diff --git a/.github/workflows/libdmdutil.yml b/.github/workflows/libdmdutil.yml index beaec4a7..010dd859 100644 --- a/.github/workflows/libdmdutil.yml +++ b/.github/workflows/libdmdutil.yml @@ -34,36 +34,16 @@ jobs: fail-fast: false matrix: include: - - os: windows-latest - platform: win - arch: x64 - - os: windows-latest - platform: win - arch: x86 - - os: macos-latest - platform: macos - arch: arm64 - - os: macos-latest - platform: macos - arch: x64 - - os: ubuntu-latest - platform: linux - arch: x64 - - os: ubuntu-latest - platform: linux - arch: aarch64 - - os: ubuntu-latest - platform: android - arch: arm64-v8a - - os: macos-latest - platform: ios - arch: arm64 - - os: macos-latest - platform: ios-simulator - arch: arm64 - - os: macos-latest - platform: tvos - arch: arm64 + - { os: windows-latest, platform: win, arch: x64 } + - { os: windows-latest, platform: win, arch: x86 } + - { os: macos-latest, platform: macos, arch: arm64 } + - { os: macos-latest, platform: macos, arch: x64 } + - { os: ubuntu-latest, platform: linux, arch: x64 } + - { os: ubuntu-latest, platform: linux, arch: aarch64 } + - { os: ubuntu-latest, platform: android, arch: arm64-v8a } + - { os: macos-latest, platform: ios, arch: arm64 } + - { os: macos-latest, platform: ios-simulator, arch: arm64 } + - { os: macos-latest, platform: tvos, arch: arm64 } steps: - uses: actions/checkout@v4 - if: (matrix.os == 'windows-latest') @@ -73,15 +53,16 @@ jobs: name: Add autoconf and automake (mac runner) run: | brew install autoconf automake libtool - - if: (!(matrix.platform == 'linux' && matrix.arch == 'aarch64')) - name: Build libdmdutil-${{ matrix.platform }}-${{ matrix.arch }} + - name: Build libdmdutil-${{ matrix.platform }}-${{ matrix.arch }} run: | ./platforms/${{ matrix.platform }}/${{ matrix.arch }}/external.sh if [[ "${{ matrix.platform }}" == "win" ]]; then if [[ "${{ matrix.arch }}" == "x64" ]]; then cmake -G "Visual Studio 17 2022" -DPLATFORM=${{ matrix.platform }} -DARCH=${{ matrix.arch }} -B build - else + elif [[ "${{ matrix.arch }}" == "x86" ]]; then cmake -G "Visual Studio 17 2022" -A Win32 -DPLATFORM=${{ matrix.platform }} -DARCH=${{ matrix.arch }} -B build + elif [[ "${{ matrix.arch }}" == "arm64" ]]; then + cmake -G "Visual Studio 17 2022" -A ARM64 -DPLATFORM=${{ matrix.platform }} -DARCH=${{ matrix.arch }} -B build fi cmake --build build --config Release else @@ -93,23 +74,6 @@ jobs: cmake -DCMAKE_BUILD_TYPE=Release -DPLATFORM=${{ matrix.platform }} -DARCH=${{ matrix.arch }} -B build cmake --build build -- -j${NUM_PROCS} fi - - if: (matrix.platform == 'linux' && matrix.arch == 'aarch64') - name: Build libdmdutil-${{ matrix.platform }}-${{ matrix.arch }} (arm runner) - uses: pguyot/arm-runner-action@v2 - with: - base_image: raspios_lite_arm64:latest - image_additional_mb: 4096 - cpu: cortex-a53 - cpu_info: cpuinfo/raspberrypi_zero2_w_arm64 - bind_mount_repository: true - commands: | - apt-get update -y --allow-releaseinfo-change - apt-get install --no-install-recommends -y pkg-config cmake autoconf automake libtool - ./platforms/${{ matrix.platform }}/${{ matrix.arch }}/external.sh - NUM_PROCS=$(nproc) - cmake -DCMAKE_BUILD_TYPE=Release -DPLATFORM=${{ matrix.platform }} -DARCH=${{ matrix.arch }} -B build - cmake --build build -- -j${NUM_PROCS} - build/dmdutil_test - if: (!(matrix.arch == 'arm64' || matrix.arch == 'arm64-v8a' || matrix.arch == 'aarch64' || matrix.platform == 'win')) name: dmdutil_test run: build/dmdutil_test diff --git a/platforms/android/arm64-v8a/external.sh b/platforms/android/arm64-v8a/external.sh index 4f085be9..df4f4973 100755 --- a/platforms/android/arm64-v8a/external.sh +++ b/platforms/android/arm64-v8a/external.sh @@ -2,7 +2,7 @@ set -e -LIBZEDMD_SHA=732573aa68c56679859c3d59baa682a7b7ac7cd6 +LIBZEDMD_SHA=4487023aef5019f3b0ce6814834603fa758abcf1 LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612 @@ -37,9 +37,10 @@ cd external # build libzedmd and copy to external # -curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.zip -o libzedmd.zip -unzip libzedmd.zip -cd libzedmd-$LIBZEDMD_SHA +curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.tar.gz -o libzedmd-${LIBZEDMD_SHA}.tar.gz +tar xzf libzedmd-${LIBZEDMD_SHA}.tar.gz +mv libzedmd-${LIBZEDMD_SHA} libzedmd +cd libzedmd BUILD_TYPE=${BUILD_TYPE} platforms/android/arm64-v8a/external.sh cmake \ -DPLATFORM=android \ @@ -61,9 +62,10 @@ cd .. # build libserum and copy to external # -curl -sL https://github.com/zesinger/libserum/archive/${LIBSERUM_SHA}.zip -o libserum.zip -unzip libserum.zip -cd libserum-$LIBSERUM_SHA +curl -sL https://github.com/zesinger/libserum/archive/${LIBSERUM_SHA}.tar.gz -o libserum-${LIBSERUM_SHA}.tar.gz +tar xzf libserum-${LIBSERUM_SHA}.tar.gz +mv libserum-${LIBSERUM_SHA} libserum +cd libserum cmake \ -DPLATFORM=android \ -DARCH=arm64-v8a \ @@ -81,9 +83,10 @@ cd .. # build libpupdmd and copy to external # -curl -sL https://github.com/ppuc/libpupdmd/archive/${LIBPUPDMD_SHA}.zip -o libpupdmd.zip -unzip libpupdmd.zip -cd libpupdmd-$LIBPUPDMD_SHA +curl -sL https://github.com/ppuc/libpupdmd/archive/${LIBPUPDMD_SHA}.tar.gz -o libpupdmd-${LIBPUPDMD_SHA}.tar.gz +tar xzf libpupdmd-${LIBPUPDMD_SHA}.tar.gz +mv libpupdmd-${LIBPUPDMD_SHA} libpupdmd +cd libpupdmd cmake -DPLATFORM=android \ -DARCH=arm64-v8a \ -DBUILD_SHARED=ON \ diff --git a/platforms/ios-simulator/arm64/external.sh b/platforms/ios-simulator/arm64/external.sh index 9eef5a91..6e5dc921 100755 --- a/platforms/ios-simulator/arm64/external.sh +++ b/platforms/ios-simulator/arm64/external.sh @@ -2,11 +2,9 @@ set -e -CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251 -LIBZEDMD_SHA=732573aa68c56679859c3d59baa682a7b7ac7cd6 +LIBZEDMD_SHA=4487023aef5019f3b0ce6814834603fa758abcf1 LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612 -LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182 NUM_PROCS=$(sysctl -n hw.ncpu) @@ -32,9 +30,10 @@ cd external # build libzedmd and copy to external # -curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.zip -o libzedmd.zip -unzip libzedmd.zip -cd libzedmd-$LIBZEDMD_SHA +curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.tar.gz -o libzedmd-${LIBZEDMD_SHA}.tar.gz +tar xzf libzedmd-${LIBZEDMD_SHA}.tar.gz +mv libzedmd-${LIBZEDMD_SHA} libzedmd +cd libzedmd BUILD_TYPE=${BUILD_TYPE} platforms/ios-simulator/arm64/external.sh cmake \ -DPLATFORM=ios-simulator \ @@ -56,9 +55,10 @@ cd .. # build libserum and copy to external # -curl -sL https://github.com/zesinger/libserum/archive/${LIBSERUM_SHA}.zip -o libserum.zip -unzip libserum.zip -cd libserum-$LIBSERUM_SHA +curl -sL https://github.com/zesinger/libserum/archive/${LIBSERUM_SHA}.tar.gz -o libserum-${LIBSERUM_SHA}.tar.gz +tar xzf libserum-${LIBSERUM_SHA}.tar.gz +mv libserum-${LIBSERUM_SHA} libserum +cd libserum cmake \ -DPLATFORM=ios-simulator \ -DARCH=arm64 \ @@ -76,9 +76,10 @@ cd .. # build libpupdmd and copy to external # -curl -sL https://github.com/ppuc/libpupdmd/archive/${LIBPUPDMD_SHA}.zip -o libpupdmd.zip -unzip libpupdmd.zip -cd libpupdmd-$LIBPUPDMD_SHA +curl -sL https://github.com/ppuc/libpupdmd/archive/${LIBPUPDMD_SHA}.tar.gz -o libpupdmd-${LIBPUPDMD_SHA}.tar.gz +tar xzf libpupdmd-${LIBPUPDMD_SHA}.tar.gz +mv libpupdmd-${LIBPUPDMD_SHA} libpupdmd +cd libpupdmd cmake \ -DPLATFORM=ios-simulator \ -DARCH=arm64 \ diff --git a/platforms/ios/arm64/external.sh b/platforms/ios/arm64/external.sh index efe1b138..9c844481 100755 --- a/platforms/ios/arm64/external.sh +++ b/platforms/ios/arm64/external.sh @@ -2,7 +2,7 @@ set -e -LIBZEDMD_SHA=732573aa68c56679859c3d59baa682a7b7ac7cd6 +LIBZEDMD_SHA=4487023aef5019f3b0ce6814834603fa758abcf1 LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612 @@ -30,9 +30,10 @@ cd external # build libzedmd and copy to external # -curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.zip -o libzedmd.zip -unzip libzedmd.zip -cd libzedmd-$LIBZEDMD_SHA +curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.tar.gz -o libzedmd-${LIBZEDMD_SHA}.tar.gz +tar xzf libzedmd-${LIBZEDMD_SHA}.tar.gz +mv libzedmd-${LIBZEDMD_SHA} libzedmd +cd libzedmd BUILD_TYPE=${BUILD_TYPE} platforms/ios/arm64/external.sh cmake \ -DPLATFORM=ios \ @@ -54,9 +55,10 @@ cd .. # build libserum and copy to external # -curl -sL https://github.com/zesinger/libserum/archive/${LIBSERUM_SHA}.zip -o libserum.zip -unzip libserum.zip -cd libserum-$LIBSERUM_SHA +curl -sL https://github.com/zesinger/libserum/archive/${LIBSERUM_SHA}.tar.gz -o libserum-${LIBSERUM_SHA}.tar.gz +tar xzf libserum-${LIBSERUM_SHA}.tar.gz +mv libserum-${LIBSERUM_SHA} libserum +cd libserum cmake \ -DPLATFORM=ios \ -DARCH=arm64 \ @@ -74,9 +76,10 @@ cd .. # build libpupdmd and copy to external # -curl -sL https://github.com/ppuc/libpupdmd/archive/${LIBPUPDMD_SHA}.zip -o libpupdmd.zip -unzip libpupdmd.zip -cd libpupdmd-$LIBPUPDMD_SHA +curl -sL https://github.com/ppuc/libpupdmd/archive/${LIBPUPDMD_SHA}.tar.gz -o libpupdmd-${LIBPUPDMD_SHA}.tar.gz +tar xzf libpupdmd-${LIBPUPDMD_SHA}.tar.gz +mv libpupdmd-${LIBPUPDMD_SHA} libpupdmd +cd libpupdmd cmake \ -DPLATFORM=ios \ -DARCH=arm64 \ diff --git a/platforms/linux/aarch64/external.sh b/platforms/linux/aarch64/external.sh index 4e545906..4dd4d880 100755 --- a/platforms/linux/aarch64/external.sh +++ b/platforms/linux/aarch64/external.sh @@ -2,7 +2,7 @@ set -e -LIBZEDMD_SHA=732573aa68c56679859c3d59baa682a7b7ac7cd6 +LIBZEDMD_SHA=4487023aef5019f3b0ce6814834603fa758abcf1 LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612 @@ -30,9 +30,10 @@ cd external # build libzedmd and copy to external # -curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.zip -o libzedmd.zip -unzip libzedmd.zip -cd libzedmd-$LIBZEDMD_SHA +curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.tar.gz -o libzedmd-${LIBZEDMD_SHA}.tar.gz +tar xzf libzedmd-${LIBZEDMD_SHA}.tar.gz +mv libzedmd-${LIBZEDMD_SHA} libzedmd +cd libzedmd BUILD_TYPE=${BUILD_TYPE} platforms/linux/aarch64/external.sh cmake \ -DPLATFORM=linux \ @@ -56,9 +57,10 @@ cd .. # build libserum and copy to external # -curl -sL https://github.com/zesinger/libserum/archive/${LIBSERUM_SHA}.zip -o libserum.zip -unzip libserum.zip -cd libserum-$LIBSERUM_SHA +curl -sL https://github.com/zesinger/libserum/archive/${LIBSERUM_SHA}.tar.gz -o libserum-${LIBSERUM_SHA}.tar.gz +tar xzf libserum-${LIBSERUM_SHA}.tar.gz +mv libserum-${LIBSERUM_SHA} libserum +cd libserum cmake \ -DPLATFORM=linux \ -DARCH=aarch64 \ @@ -77,9 +79,10 @@ cd .. # build libpupdmd and copy to external # -curl -sL https://github.com/ppuc/libpupdmd/archive/${LIBPUPDMD_SHA}.zip -o libpupdmd.zip -unzip libpupdmd.zip -cd libpupdmd-$LIBPUPDMD_SHA +curl -sL https://github.com/ppuc/libpupdmd/archive/${LIBPUPDMD_SHA}.tar.gz -o libpupdmd-${LIBPUPDMD_SHA}.tar.gz +tar xzf libpupdmd-${LIBPUPDMD_SHA}.tar.gz +mv libpupdmd-${LIBPUPDMD_SHA} libpupdmd +cd libpupdmd cmake \ -DPLATFORM=linux \ -DARCH=aarch64 \ diff --git a/platforms/linux/x64/external.sh b/platforms/linux/x64/external.sh index 3244ad16..269057fc 100755 --- a/platforms/linux/x64/external.sh +++ b/platforms/linux/x64/external.sh @@ -2,7 +2,7 @@ set -e -LIBZEDMD_SHA=732573aa68c56679859c3d59baa682a7b7ac7cd6 +LIBZEDMD_SHA=4487023aef5019f3b0ce6814834603fa758abcf1 LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612 @@ -30,9 +30,10 @@ cd external # build libzedmd and copy to external # -curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.zip -o libzedmd.zip -unzip libzedmd.zip -cd libzedmd-$LIBZEDMD_SHA +curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.tar.gz -o libzedmd-${LIBZEDMD_SHA}.tar.gz +tar xzf libzedmd-${LIBZEDMD_SHA}.tar.gz +mv libzedmd-${LIBZEDMD_SHA} libzedmd +cd libzedmd BUILD_TYPE=${BUILD_TYPE} platforms/linux/x64/external.sh cmake \ -DPLATFORM=linux \ @@ -56,9 +57,10 @@ cd .. # build libserum and copy to external # -curl -sL https://github.com/zesinger/libserum/archive/${LIBSERUM_SHA}.zip -o libserum.zip -unzip libserum.zip -cd libserum-$LIBSERUM_SHA +curl -sL https://github.com/zesinger/libserum/archive/${LIBSERUM_SHA}.tar.gz -o libserum-${LIBSERUM_SHA}.tar.gz +tar xzf libserum-${LIBSERUM_SHA}.tar.gz +mv libserum-${LIBSERUM_SHA} libserum +cd libserum cmake \ -DPLATFORM=linux \ -DARCH=x64 \ @@ -76,9 +78,10 @@ cd .. # build libpupdmd and copy to external # -curl -sL https://github.com/ppuc/libpupdmd/archive/${LIBPUPDMD_SHA}.zip -o libpupdmd.zip -unzip libpupdmd.zip -cd libpupdmd-$LIBPUPDMD_SHA +curl -sL https://github.com/ppuc/libpupdmd/archive/${LIBPUPDMD_SHA}.tar.gz -o libpupdmd-${LIBPUPDMD_SHA}.tar.gz +tar xzf libpupdmd-${LIBPUPDMD_SHA}.tar.gz +mv libpupdmd-${LIBPUPDMD_SHA} libpupdmd +cd libpupdmd cmake \ -DPLATFORM=linux \ -DARCH=x64 \ diff --git a/platforms/macos/arm64/external.sh b/platforms/macos/arm64/external.sh index 818e01b0..2b51a40f 100755 --- a/platforms/macos/arm64/external.sh +++ b/platforms/macos/arm64/external.sh @@ -2,7 +2,7 @@ set -e -LIBZEDMD_SHA=732573aa68c56679859c3d59baa682a7b7ac7cd6 +LIBZEDMD_SHA=4487023aef5019f3b0ce6814834603fa758abcf1 LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612 @@ -30,9 +30,10 @@ cd external # build libzedmd and copy to external # -curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.zip -o libzedmd.zip -unzip libzedmd.zip -cd libzedmd-$LIBZEDMD_SHA +curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.tar.gz -o libzedmd-${LIBZEDMD_SHA}.tar.gz +tar xzf libzedmd-${LIBZEDMD_SHA}.tar.gz +mv libzedmd-${LIBZEDMD_SHA} libzedmd +cd libzedmd BUILD_TYPE=${BUILD_TYPE} platforms/macos/arm64/external.sh cmake \ -DPLATFORM=macos \ @@ -56,9 +57,10 @@ cd .. # build libserum and copy to external # -curl -sL https://github.com/zesinger/libserum/archive/${LIBSERUM_SHA}.zip -o libserum.zip -unzip libserum.zip -cd libserum-$LIBSERUM_SHA +curl -sL https://github.com/zesinger/libserum/archive/${LIBSERUM_SHA}.tar.gz -o libserum-${LIBSERUM_SHA}.tar.gz +tar xzf libserum-${LIBSERUM_SHA}.tar.gz +mv libserum-${LIBSERUM_SHA} libserum +cd libserum cmake \ -DPLATFORM=macos \ -DARCH=arm64 \ @@ -77,9 +79,10 @@ cd .. # build libpupdmd and copy to external # -curl -sL https://github.com/ppuc/libpupdmd/archive/${LIBPUPDMD_SHA}.zip -o libpupdmd.zip -unzip libpupdmd.zip -cd libpupdmd-$LIBPUPDMD_SHA +curl -sL https://github.com/ppuc/libpupdmd/archive/${LIBPUPDMD_SHA}.tar.gz -o libpupdmd-${LIBPUPDMD_SHA}.tar.gz +tar xzf libpupdmd-${LIBPUPDMD_SHA}.tar.gz +mv libpupdmd-${LIBPUPDMD_SHA} libpupdmd +cd libpupdmd cmake \ -DPLATFORM=macos \ -DARCH=arm64 \ diff --git a/platforms/macos/x64/external.sh b/platforms/macos/x64/external.sh index 7b6d5f83..432efdc2 100755 --- a/platforms/macos/x64/external.sh +++ b/platforms/macos/x64/external.sh @@ -2,7 +2,7 @@ set -e -LIBZEDMD_SHA=732573aa68c56679859c3d59baa682a7b7ac7cd6 +LIBZEDMD_SHA=4487023aef5019f3b0ce6814834603fa758abcf1 LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612 @@ -30,9 +30,10 @@ cd external # build libzedmd and copy to external # -curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.zip -o libzedmd.zip -unzip libzedmd.zip -cd libzedmd-$LIBZEDMD_SHA +curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.tar.gz -o libzedmd-${LIBZEDMD_SHA}.tar.gz +tar xzf libzedmd-${LIBZEDMD_SHA}.tar.gz +mv libzedmd-${LIBZEDMD_SHA} libzedmd +cd libzedmd BUILD_TYPE=${BUILD_TYPE} platforms/macos/x64/external.sh cmake \ -DPLATFORM=macos \ @@ -56,9 +57,10 @@ cd .. # build libserum and copy to external # -curl -sL https://github.com/zesinger/libserum/archive/${LIBSERUM_SHA}.zip -o libserum.zip -unzip libserum.zip -cd libserum-$LIBSERUM_SHA +curl -sL https://github.com/zesinger/libserum/archive/${LIBSERUM_SHA}.tar.gz -o libserum-${LIBSERUM_SHA}.tar.gz +tar xzf libserum-${LIBSERUM_SHA}.tar.gz +mv libserum-${LIBSERUM_SHA} libserum +cd libserum cmake \ -DPLATFORM=macos \ -DARCH=x64 \ @@ -77,9 +79,10 @@ cd .. # build libpupdmd and copy to external # -curl -sL https://github.com/ppuc/libpupdmd/archive/${LIBPUPDMD_SHA}.zip -o libpupdmd.zip -unzip libpupdmd.zip -cd libpupdmd-$LIBPUPDMD_SHA +curl -sL https://github.com/ppuc/libpupdmd/archive/${LIBPUPDMD_SHA}.tar.gz -o libpupdmd-${LIBPUPDMD_SHA}.tar.gz +tar xzf libpupdmd-${LIBPUPDMD_SHA}.tar.gz +mv libpupdmd-${LIBPUPDMD_SHA} libpupdmd +cd libpupdmd cmake \ -DPLATFORM=macos \ -DARCH=x64 \ diff --git a/platforms/tvos/arm64/external.sh b/platforms/tvos/arm64/external.sh index 1fb7968d..78d3bccc 100755 --- a/platforms/tvos/arm64/external.sh +++ b/platforms/tvos/arm64/external.sh @@ -2,7 +2,7 @@ set -e -LIBZEDMD_SHA=732573aa68c56679859c3d59baa682a7b7ac7cd6 +LIBZEDMD_SHA=4487023aef5019f3b0ce6814834603fa758abcf1 LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612 @@ -30,9 +30,10 @@ cd external # build libzedmd and copy to external # -curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.zip -o libzedmd.zip -unzip libzedmd.zip -cd libzedmd-$LIBZEDMD_SHA +curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.tar.gz -o libzedmd-${LIBZEDMD_SHA}.tar.gz +tar xzf libzedmd-${LIBZEDMD_SHA}.tar.gz +mv libzedmd-${LIBZEDMD_SHA} libzedmd +cd libzedmd BUILD_TYPE=${BUILD_TYPE} platforms/tvos/arm64/external.sh cmake \ -DPLATFORM=tvos \ @@ -54,9 +55,10 @@ cd .. # build libserum and copy to external # -curl -sL https://github.com/zesinger/libserum/archive/${LIBSERUM_SHA}.zip -o libserum.zip -unzip libserum.zip -cd libserum-$LIBSERUM_SHA +curl -sL https://github.com/zesinger/libserum/archive/${LIBSERUM_SHA}.tar.gz -o libserum-${LIBSERUM_SHA}.tar.gz +tar xzf libserum-${LIBSERUM_SHA}.tar.gz +mv libserum-${LIBSERUM_SHA} libserum +cd libserum cmake \ -DPLATFORM=tvos \ -DARCH=arm64 \ @@ -75,9 +77,10 @@ cd .. # build libpupdmd and copy to external # -curl -sL https://github.com/ppuc/libpupdmd/archive/${LIBPUPDMD_SHA}.zip -o libpupdmd.zip -unzip libpupdmd.zip -cd libpupdmd-$LIBPUPDMD_SHA +curl -sL https://github.com/ppuc/libpupdmd/archive/${LIBPUPDMD_SHA}.tar.gz -o libpupdmd-${LIBPUPDMD_SHA}.tar.gz +tar xzf libpupdmd-${LIBPUPDMD_SHA}.tar.gz +mv libpupdmd-${LIBPUPDMD_SHA} libpupdmd +cd libpupdmd cmake \ -DPLATFORM=tvos \ -DARCH=arm64 \ diff --git a/platforms/win/x64/external.sh b/platforms/win/x64/external.sh index d59dc014..d24e0a87 100755 --- a/platforms/win/x64/external.sh +++ b/platforms/win/x64/external.sh @@ -2,7 +2,7 @@ set -e -LIBZEDMD_SHA=732573aa68c56679859c3d59baa682a7b7ac7cd6 +LIBZEDMD_SHA=4487023aef5019f3b0ce6814834603fa758abcf1 LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612 @@ -27,9 +27,10 @@ cd external # build libzedmd and copy to external # -curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.zip -o libzedmd.zip -unzip libzedmd.zip -cd libzedmd-$LIBZEDMD_SHA +curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.tar.gz -o libzedmd-${LIBZEDMD_SHA}.tar.gz +tar xzf libzedmd-${LIBZEDMD_SHA}.tar.gz +mv libzedmd-${LIBZEDMD_SHA} libzedmd +cd libzedmd BUILD_TYPE=${BUILD_TYPE} platforms/win/x64/external.sh cmake \ -G "Visual Studio 17 2022" \ @@ -59,9 +60,10 @@ cd .. # build libserum and copy to external # -curl -sL https://github.com/zesinger/libserum/archive/${LIBSERUM_SHA}.zip -o libserum.zip -unzip libserum.zip -cd libserum-$LIBSERUM_SHA +curl -sL https://github.com/zesinger/libserum/archive/${LIBSERUM_SHA}.tar.gz -o libserum-${LIBSERUM_SHA}.tar.gz +tar xzf libserum-${LIBSERUM_SHA}.tar.gz +mv libserum-${LIBSERUM_SHA} libserum +cd libserum cmake \ -G "Visual Studio 17 2022" \ -DPLATFORM=win \ @@ -81,9 +83,10 @@ cd .. # build libpupdmd and copy to external # -curl -sL https://github.com/ppuc/libpupdmd/archive/${LIBPUPDMD_SHA}.zip -o libpupdmd.zip -unzip libpupdmd.zip -cd libpupdmd-$LIBPUPDMD_SHA +curl -sL https://github.com/ppuc/libpupdmd/archive/${LIBPUPDMD_SHA}.tar.gz -o libpupdmd-${LIBPUPDMD_SHA}.tar.gz +tar xzf libpupdmd-${LIBPUPDMD_SHA}.tar.gz +mv libpupdmd-${LIBPUPDMD_SHA} libpupdmd +cd libpupdmd cmake \ -G "Visual Studio 17 2022" \ -DPLATFORM=win \ diff --git a/platforms/win/x86/external.sh b/platforms/win/x86/external.sh index a68f7661..3f00d173 100755 --- a/platforms/win/x86/external.sh +++ b/platforms/win/x86/external.sh @@ -2,7 +2,7 @@ set -e -LIBZEDMD_SHA=732573aa68c56679859c3d59baa682a7b7ac7cd6 +LIBZEDMD_SHA=4487023aef5019f3b0ce6814834603fa758abcf1 LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612 @@ -27,9 +27,10 @@ cd external # build libzedmd and copy to external # -curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.zip -o libzedmd.zip -unzip libzedmd.zip -cd libzedmd-$LIBZEDMD_SHA +curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.tar.gz -o libzedmd-${LIBZEDMD_SHA}.tar.gz +tar xzf libzedmd-${LIBZEDMD_SHA}.tar.gz +mv libzedmd-${LIBZEDMD_SHA} libzedmd +cd libzedmd BUILD_TYPE=${BUILD_TYPE} platforms/win/x86/external.sh cmake \ -G "Visual Studio 17 2022" \ @@ -60,9 +61,10 @@ cd .. # build libserum and copy to external # -curl -sL https://github.com/zesinger/libserum/archive/${LIBSERUM_SHA}.zip -o libserum.zip -unzip libserum.zip -cd libserum-$LIBSERUM_SHA +curl -sL https://github.com/zesinger/libserum/archive/${LIBSERUM_SHA}.tar.gz -o libserum-${LIBSERUM_SHA}.tar.gz +tar xzf libserum-${LIBSERUM_SHA}.tar.gz +mv libserum-${LIBSERUM_SHA} libserum +cd libserum cmake \ -G "Visual Studio 17 2022" \ -A Win32 \ @@ -83,9 +85,10 @@ cd .. # build libpupdmd and copy to external # -curl -sL https://github.com/ppuc/libpupdmd/archive/${LIBPUPDMD_SHA}.zip -o libpupdmd.zip -unzip libpupdmd.zip -cd libpupdmd-$LIBPUPDMD_SHA +curl -sL https://github.com/ppuc/libpupdmd/archive/${LIBPUPDMD_SHA}.tar.gz -o libpupdmd-${LIBPUPDMD_SHA}.tar.gz +tar xzf libpupdmd-${LIBPUPDMD_SHA}.tar.gz +mv libpupdmd-${LIBPUPDMD_SHA} libpupdmd +cd libpupdmd cmake \ -G "Visual Studio 17 2022" \ -A Win32 \