diff --git a/.github/workflows/build-ton-linux-arm64-appimage.yml b/.github/workflows/build-ton-linux-arm64-appimage.yml index 78ae1cd83..d464d8a2a 100644 --- a/.github/workflows/build-ton-linux-arm64-appimage.yml +++ b/.github/workflows/build-ton-linux-arm64-appimage.yml @@ -34,11 +34,11 @@ jobs: - name: Make AppImages run: | - cp assembly/appimage/create-appimages-arm64.sh . + cp assembly/appimage/create-appimages.sh . cp assembly/appimage/AppRun . cp assembly/appimage/ton.png . - chmod +x create-appimages-arm64.sh - ./create-appimages-arm64.sh + chmod +x create-appimages.sh + ./create-appimages.sh aarch64 rm -rf artifacts diff --git a/.github/workflows/build-ton-linux-x86-64-appimage.yml b/.github/workflows/build-ton-linux-x86-64-appimage.yml index f012f656b..4f78ece9d 100644 --- a/.github/workflows/build-ton-linux-x86-64-appimage.yml +++ b/.github/workflows/build-ton-linux-x86-64-appimage.yml @@ -44,7 +44,7 @@ jobs: cp assembly/appimage/AppRun . cp assembly/appimage/ton.png . chmod +x create-appimages.sh - ./create-appimages.sh + ./create-appimages.sh x86_64 rm -rf artifacts diff --git a/assembly/appimage/create-appimages-arm64.sh b/assembly/appimage/create-appimages-arm64.sh deleted file mode 100644 index f52a27717..000000000 --- a/assembly/appimage/create-appimages-arm64.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash - -if [ ! -d "artifacts" ]; then - echo "No artifacts found." - exit 2 -fi - -rm -rf appimages - -mkdir -p appimages/artifacts - -wget -nc https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-aarch64.AppImage -chmod +x ./appimagetool-aarch64.AppImage - -cd appimages -for file in ../artifacts/*; do - if [[ -f "$file" && "$file" != *.so ]]; then - appName=$(basename "$file") - echo $appName - # prepare AppDir - mkdir -p $appName.AppDir/usr/{bin,lib} - cp ../AppRun $appName.AppDir/AppRun - sed -i "s/app/$appName/g" $appName.AppDir/AppRun - chmod +x ./$appName.AppDir/AppRun - printf '[Desktop Entry]\nName='$appName'\nExec='$appName'\nIcon='$appName'\nType=Application\nCategories=Utility;\n' > $appName.AppDir/$appName.desktop - cp ../ton.png $appName.AppDir/$appName.png - cp $file $appName.AppDir/usr/bin/ - cp ../build/openssl_3/libcrypto.so.3 \ - /lib/aarch64-linux-gnu/libatomic.so.1 \ - /lib/aarch64-linux-gnu/libsodium.so.23 \ - /lib/aarch64-linux-gnu/libz.so.1 \ - /lib/aarch64-linux-gnu/liblz4.so.1 \ - /lib/aarch64-linux-gnu/libmicrohttpd.so.12 \ - /lib/aarch64-linux-gnu/libreadline.so.8 \ - /lib/aarch64-linux-gnu/libstdc++.so.6 \ - $appName.AppDir/usr/lib/ - - chmod +x ./$appName.AppDir/usr/bin/$appName - # create AppImage - ./../appimagetool-aarch64.AppImage -l $appName.AppDir - mv $appName-aarch64.AppImage artifacts/$appName - fi -done - -ls -larth artifacts -cp -r ../artifacts/{smartcont,lib} artifacts/ -pwd -ls -larth artifacts diff --git a/assembly/appimage/create-appimages.sh b/assembly/appimage/create-appimages.sh index 593d0dbd4..2a8cd0ec6 100644 --- a/assembly/appimage/create-appimages.sh +++ b/assembly/appimage/create-appimages.sh @@ -4,13 +4,15 @@ if [ ! -d "artifacts" ]; then echo "No artifacts found." exit 2 fi +# x86_64 or aarch64 +ARCH=$1 rm -rf appimages mkdir -p appimages/artifacts -wget -nc https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage -chmod +x ./appimagetool-x86_64.AppImage +wget -nc https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-$ARCH.AppImage +chmod +x ./appimagetool-$ARCH.AppImage cd appimages for file in ../artifacts/*; do @@ -26,19 +28,19 @@ for file in ../artifacts/*; do cp ../ton.png $appName.AppDir/$appName.png cp $file $appName.AppDir/usr/bin/ cp ../build/openssl_3/libcrypto.so.3 \ - /lib/x86_64-linux-gnu/libatomic.so.1 \ - /lib/x86_64-linux-gnu/libsodium.so.23 \ - /lib/x86_64-linux-gnu/libz.so.1 \ - /lib/x86_64-linux-gnu/liblz4.so.1 \ - /lib/x86_64-linux-gnu/libmicrohttpd.so.12 \ - /lib/x86_64-linux-gnu/libreadline.so.8 \ - /lib/x86_64-linux-gnu/libstdc++.so.6 \ + /lib/$ARCH-linux-gnu/libatomic.so.1 \ + /lib/$ARCH-linux-gnu/libsodium.so.23 \ + /lib/$ARCH-linux-gnu/libz.so.1 \ + /lib/$ARCH-linux-gnu/liblz4.so.1 \ + /lib/$ARCH-linux-gnu/libmicrohttpd.so.12 \ + /lib/$ARCH-linux-gnu/libreadline.so.8 \ + /lib/$ARCH-linux-gnu/libstdc++.so.6 \ $appName.AppDir/usr/lib/ chmod +x ./$appName.AppDir/usr/bin/$appName # create AppImage - ./../appimagetool-x86_64.AppImage -l $appName.AppDir - mv $appName-x86_64.AppImage artifacts/$appName + ./../appimagetool-$ARCH.AppImage -l $appName.AppDir + mv $appName-$ARCH.AppImage artifacts/$appName fi done diff --git a/assembly/native/build-ubuntu-appimages.sh b/assembly/native/build-ubuntu-appimages.sh index 8a3742139..4e63234d9 100644 --- a/assembly/native/build-ubuntu-appimages.sh +++ b/assembly/native/build-ubuntu-appimages.sh @@ -39,9 +39,6 @@ else echo "Using compiled openssl_3" fi -echo libstdc++.so.6 supported GLIBC -strings /lib/x86_64-linux-gnu/libstdc++.so.6 | grep GLIBC - cmake -GNinja .. \ -DCMAKE_BUILD_TYPE=Release \ -DPORTABLE=1 \ @@ -85,8 +82,6 @@ echo libtonlibjson.so ldd ./tonlib/libtonlibjson.so.0.5 || exit 1 echo libemulator.so ldd ./emulator/libemulator.so || exit 1 -echo libstdc++.so.6 -strings /lib/x86_64-linux-gnu/libstdc++.so.6 | grep GLIBC cd ..