diff --git a/CHANGELOG.md b/CHANGELOG.md index 72ee4e76..194f4ff0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - able to install bauh with python/pip without enforcing requirements through the environment variable `BAUH_SETUP_NO_REQS=1` - Distribution - - AppImage: -~50% size reduction (141.93 MB -> 72.20 MB) [#1ba610da9d651f627b3c6163bbcf8ecfd17276b5](https://github.com/vinifmor/bauh/commit/1ba610da9d651f627b3c6163bbcf8ecfd17276b5) + - AppImage: -~32% size reduction (141.93 MB -> 96.32 MB) ### Fixes diff --git a/linux_dist/appimage/AppImageBuilder.yml b/linux_dist/appimage/AppImageBuilder.yml index 193a9015..14c423dc 100755 --- a/linux_dist/appimage/AppImageBuilder.yml +++ b/linux_dist/appimage/AppImageBuilder.yml @@ -2,6 +2,14 @@ version: 1 script: - rm -rf AppDir appimage-builder-cache *.AppImage *.zsync |true - mkdir -p AppDir/usr + - mkdir -p AppDir/usr/share/icons/hicolor/scalable/apps + - mkdir -p AppDir/usr/share/applications + - wget https://github.com/vinifmor/bauh/archive/${BAUH_VERSION}.tar.gz || exit 1 + - BAUH_SETUP_NO_REQS=1 pip3 install ${BAUH_VERSION}.tar.gz --prefix=/usr --root=AppDir || exit 1 + - tar -xf ${BAUH_VERSION}.tar.gz || exit 1 + - cd bauh-${BAUH_VERSION} || exit 1 + - cp bauh/view/resources/img/logo.svg ../AppDir/usr/share/icons/hicolor/scalable/apps/bauh.svg || exit 1 + - cp bauh/desktop/bauh.desktop ../AppDir/usr/share/applications || exit 1 AppDir: @@ -14,7 +22,7 @@ AppDir: version: !ENV ${BAUH_VERSION} exec: /usr/bin/python3 exec_args: "$APPDIR/usr/bin/bauh $@" - + apt: arch: amd64 @@ -24,31 +32,40 @@ AppDir: include: - python3 - - python3-pip - - python3-setuptools - python3-requests - python3-colorama - python3-dateutil - python3-yaml - python3-packaging - - python3-pyqt5 - python3-lxml - python3-bs4 - sqlite3 - wget - - libfreetype6 - - libfontconfig1 - exclude: [] + # - libfreetype6 + # - libfontconfig1 + exclude: + - dpkg + - apt + - aptitude + - python3-pip + - python3-setuptools + - python3-distutils + - libc-bin + - libc-dev-bin + - libc6 + - libc6-dbg + - libc6-dev + + after_bundle: + - pip3 install pyqt5 --prefix=/usr --root=AppDir || exit 1 + - cd AppDir/usr/lib/python3.8/site-packages/PyQt5/Qt5/plugins || exit 1 + - rm -rf audio gamepad gamepads geoservices printsupport sceneparsers sensorgestures sensors sqldrivers texttospeech webview || exit 1 + - cd ../ + - cd lib/ || exit 1 + - rm libQt5Bluetooth.so.5 libQt5Designer.so.5 libQt5Multimedia.so.5 libQt5MultimediaGstTools.so.5 libQt5MultimediaWidgets.so.5 || exit 1 + - rm libQt5Quick3D.so.5 libQt5Quick3DAssetImport.so.5 libQt5Quick3DRender.so.5 libQt5Quick3DRuntimeRender.so.5 libQt5QuickTest.so.5 || exit 1 + - rm libQt5Quick3DUtils.so.5 libQt5PrintSupport.so.5 libQt5SerialPort.so.5 libQt5Sql.so.5 libQt5Sensors.so.5 libQt5Test.so.5 libQt5WebView.so.5 || exit 1 - after_bundle: - - mkdir -p AppDir/usr/share/icons/hicolor/scalable/apps - - mkdir -p AppDir/usr/share/applications - - wget https://github.com/vinifmor/bauh/archive/${BAUH_VERSION}.tar.gz || exit 1 - - tar -xf ${BAUH_VERSION}.tar.gz || exit 1 - - cd bauh-${BAUH_VERSION} || exit 1 - - cp bauh/view/resources/img/logo.svg ../AppDir/usr/share/icons/hicolor/scalable/apps/bauh.svg || exit 1 - - cp bauh/desktop/bauh.desktop ../AppDir/usr/share/applications || exit 1 - - BAUH_SETUP_NO_REQS=1 python3 setup.py install --prefix=/usr --root=../AppDir --optimize=1 || exit 1 runtime: version: "continuous"