diff --git a/scripts/build-appimage-32.sh b/scripts/build-appimage-32.sh index f2af405d..27514582 100755 --- a/scripts/build-appimage-32.sh +++ b/scripts/build-appimage-32.sh @@ -54,26 +54,20 @@ qmake "$REPO_ROOT" make -j$(nproc) make install INSTALL_ROOT=AppDir -#-----------------------------------------------------------------------# -# Now, build AppImage using linuxdeploy and linuxdeploy-plugin-qt # -# Download linuxdeploy and its Qt plugin # -#-----------------------------------------------------------------------# -wget https://artifacts.assassinate-you.net/artifactory/linuxdeploy/travis-456/linuxdeploy-i386.AppImage -wget https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-i386.AppImage - #-----------------------------------------------------------------------# # Make them executable # #-----------------------------------------------------------------------# -chmod +x linuxdeploy*.AppImage +chmod +x "$REPO_ROOT"/scripts/tools/linuxdeploy*.AppImage #-----------------------------------------------------------------------# # Make sure Qt plugin finds QML sources so it can deploy the imported # # files # +#-----------------------------------------------------------------------# export QML_SOURCES_PATHS="$REPO_ROOT"/src -./linuxdeploy-i386.AppImage --appimage-extract-and-run --appdir AppDir -e OpenRGB -i "$REPO_ROOT"/qt/OpenRGB.png -d "$REPO_ROOT"/qt/OpenRGB.desktop -./linuxdeploy-plugin-qt-i386.AppImage --appimage-extract-and-run --appdir AppDir -./linuxdeploy-i386.AppImage --appimage-extract-and-run --appdir AppDir --output appimage +"$REPO_ROOT"/scripts/tools//linuxdeploy-i386.AppImage --appimage-extract-and-run --appdir AppDir -e OpenRGB -i "$REPO_ROOT"/qt/OpenRGB.png -d "$REPO_ROOT"/qt/OpenRGB.desktop +"$REPO_ROOT"/scripts/tools//linuxdeploy-plugin-qt-i386.AppImage --appimage-extract-and-run --appdir AppDir +"$REPO_ROOT"/scripts/tools//linuxdeploy-i386.AppImage --appimage-extract-and-run --appdir AppDir --output appimage #-----------------------------------------------------------------------# # Move built AppImage back into original CWD # diff --git a/scripts/build-appimage.sh b/scripts/build-appimage.sh index ca4e986b..01906055 100755 --- a/scripts/build-appimage.sh +++ b/scripts/build-appimage.sh @@ -54,26 +54,20 @@ qmake "$REPO_ROOT" make -j$(nproc) make install INSTALL_ROOT=AppDir -#-----------------------------------------------------------------------# -# Now, build AppImage using linuxdeploy and linuxdeploy-plugin-qt # -# Download linuxdeploy and its Qt plugin # -#-----------------------------------------------------------------------# -wget https://artifacts.assassinate-you.net/artifactory/linuxdeploy/travis-456/linuxdeploy-x86_64.AppImage -wget https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage - #-----------------------------------------------------------------------# # Make them executable # #-----------------------------------------------------------------------# -chmod +x linuxdeploy*.AppImage +chmod +x "$REPO_ROOT"/scripts/tools/linuxdeploy*.AppImage #-----------------------------------------------------------------------# # Make sure Qt plugin finds QML sources so it can deploy the imported # # files # +#-----------------------------------------------------------------------# export QML_SOURCES_PATHS="$REPO_ROOT"/src -./linuxdeploy-x86_64.AppImage --appimage-extract-and-run --appdir AppDir -e OpenRGB -i "$REPO_ROOT"/qt/OpenRGB.png -d "$REPO_ROOT"/qt/OpenRGB.desktop -./linuxdeploy-plugin-qt-x86_64.AppImage --appimage-extract-and-run --appdir AppDir -./linuxdeploy-x86_64.AppImage --appimage-extract-and-run --appdir AppDir --output appimage +"$REPO_ROOT"/scripts/tools/linuxdeploy-x86_64.AppImage --appimage-extract-and-run --appdir AppDir -e OpenRGB -i "$REPO_ROOT"/qt/OpenRGB.png -d "$REPO_ROOT"/qt/OpenRGB.desktop +"$REPO_ROOT"/scripts/tools/linuxdeploy-plugin-qt-x86_64.AppImage --appimage-extract-and-run --appdir AppDir +"$REPO_ROOT"/scripts/tools/linuxdeploy-x86_64.AppImage --appimage-extract-and-run --appdir AppDir --output appimage #-----------------------------------------------------------------------# # Move built AppImage back into original CWD # diff --git a/scripts/tools/linuxdeploy-i386.AppImage b/scripts/tools/linuxdeploy-i386.AppImage new file mode 100644 index 00000000..edba3347 Binary files /dev/null and b/scripts/tools/linuxdeploy-i386.AppImage differ diff --git a/scripts/tools/linuxdeploy-plugin-qt-i386.AppImage b/scripts/tools/linuxdeploy-plugin-qt-i386.AppImage new file mode 100644 index 00000000..02f59d99 Binary files /dev/null and b/scripts/tools/linuxdeploy-plugin-qt-i386.AppImage differ diff --git a/scripts/tools/linuxdeploy-plugin-qt-x86_64.AppImage b/scripts/tools/linuxdeploy-plugin-qt-x86_64.AppImage new file mode 100644 index 00000000..03fab0ff Binary files /dev/null and b/scripts/tools/linuxdeploy-plugin-qt-x86_64.AppImage differ diff --git a/scripts/tools/linuxdeploy-x86_64.AppImage b/scripts/tools/linuxdeploy-x86_64.AppImage new file mode 100644 index 00000000..761726d3 Binary files /dev/null and b/scripts/tools/linuxdeploy-x86_64.AppImage differ