Merge branch 'master' into footage-viewer-merge
This commit is contained in:
@@ -86,6 +86,7 @@ jobs:
|
|||||||
# Process AppDir
|
# Process AppDir
|
||||||
/usr/local/linuxdeployqt-x86_64.AppImage \
|
/usr/local/linuxdeployqt-x86_64.AppImage \
|
||||||
appdir/usr/share/applications/org.olivevideoeditor.Olive.desktop \
|
appdir/usr/share/applications/org.olivevideoeditor.Olive.desktop \
|
||||||
|
-exclude-libs=libQt5Pdf.so,libQt5Qml.so,libQt5QmlModels.so,libQt5Quick.so,libQt5VirtualKeyboard.so \
|
||||||
-bundle-non-qt-libs \
|
-bundle-non-qt-libs \
|
||||||
-executable=appdir/usr/bin/crashpad_handler \
|
-executable=appdir/usr/bin/crashpad_handler \
|
||||||
-executable=appdir/usr/bin/minidump_stackwalk \
|
-executable=appdir/usr/bin/minidump_stackwalk \
|
||||||
|
|||||||
@@ -23,7 +23,9 @@ export PATH
|
|||||||
# Toolchain can be controlled with env vars CC, CXX and AR
|
# Toolchain can be controlled with env vars CC, CXX and AR
|
||||||
mkdir crashpad
|
mkdir crashpad
|
||||||
cd crashpad
|
cd crashpad
|
||||||
fetch crashpad
|
git clone --depth 1 https://github.com/olive-editor/crashpad.git
|
||||||
|
gclient config https://github.com/olive-editor/crashpad.git
|
||||||
|
gclient sync
|
||||||
cd crashpad
|
cd crashpad
|
||||||
# TODO: Do we want to set any special args here? For example:
|
# TODO: Do we want to set any special args here? For example:
|
||||||
# gn gen --args="target_cpu=\"x64\" is_debug=true" out/Default
|
# gn gen --args="target_cpu=\"x64\" is_debug=true" out/Default
|
||||||
|
|||||||
@@ -9,9 +9,25 @@ cmake --build .
|
|||||||
|
|
||||||
cmake --install app --prefix appdir/usr
|
cmake --install app --prefix appdir/usr
|
||||||
|
|
||||||
|
# TODO: Can the following libs be excluded?
|
||||||
|
#libQt5DBus.so,\
|
||||||
|
#libQt5MultimediaGstTools.so,\
|
||||||
|
#libQt5MultimediaWidgets.so,\
|
||||||
|
|
||||||
/usr/local/linuxdeployqt-x86_64.AppImage \
|
/usr/local/linuxdeployqt-x86_64.AppImage \
|
||||||
appdir/usr/share/applications/org.olivevideoeditor.Olive.desktop \
|
appdir/usr/share/applications/org.olivevideoeditor.Olive.desktop \
|
||||||
-appimage \
|
-appimage \
|
||||||
|
-exclude-libs=\
|
||||||
|
libQt5Pdf.so,\
|
||||||
|
libQt5Qml.so,\
|
||||||
|
libQt5QmlModels.so,\
|
||||||
|
libQt5Quick.so,\
|
||||||
|
libQt5Svg.so,\
|
||||||
|
libQt5VirtualKeyboard.so \
|
||||||
|
-bundle-non-qt-libs \
|
||||||
|
-executable=appdir/usr/bin/crashpad_handler \
|
||||||
|
-executable=appdir/usr/bin/minidump_stackwalk \
|
||||||
|
-executable=appdir/usr/bin/olive-crashhandler \
|
||||||
--appimage-extract-and-run
|
--appimage-extract-and-run
|
||||||
|
|
||||||
./Olive*.AppImage --appimage-extract-and-run --version
|
./Olive*.AppImage --appimage-extract-and-run --version
|
||||||
|
|||||||
Reference in New Issue
Block a user