build: rebrand output artifacts to Oak and fix macOS QML deployment
- Rename macOS bundle output from Olive.app to Oak.app. - Rename editor binary to oak-editor and render worker to oak-render-worker. - Rename crash handler output to oak-crashhandler. - Update worker lookup, NSIS installer, Linux desktop/AppRun, crashhandler symbol paths, and documentation for the new binary names. - Update CD workflow paths and add -qmldir flags to macdeployqt so QtQuick / QML plugins required by KDDockWidgets are bundled, fixing the launch crash on macOS. - Update user-facing GitHub URLs to OakVideoEditorCommunity/oak.
This commit is contained in:
@@ -20,16 +20,16 @@
|
||||
|
||||
APPDIR=$(readlink -f $(dirname "$0"))
|
||||
|
||||
# Custom AppRun that ensures the AppImage doesn't dismount before olive-crashhandler exits
|
||||
# Custom AppRun that ensures the AppImage doesn't dismount before oak-crashhandler exits
|
||||
|
||||
# Run main program
|
||||
"$APPDIR/usr/bin/olive-editor" "$@"
|
||||
"$APPDIR/usr/bin/oak-editor" "$@"
|
||||
|
||||
# Wait arbitrary amount of time
|
||||
sleep 5
|
||||
|
||||
# While olive-crashhandler exists, keep sleeping
|
||||
while [[ $(ps -aux | grep olive-crashhandler | grep -v grep) ]]
|
||||
# While oak-crashhandler exists, keep sleeping
|
||||
while [[ $(ps -aux | grep oak-crashhandler | grep -v grep) ]]
|
||||
do
|
||||
sleep 5
|
||||
done
|
||||
|
||||
@@ -28,8 +28,8 @@
|
||||
<p xml:lang="id">Oak Video Editor adalah aplikasi edit video bersifat non-linier yang bebas dan gratis, bertujuan untuk memberikan alternatif yang lengkap untuk aplikasi edit video profesional. Ini adalah fork komunitas dari Olive Video Editor.</p>
|
||||
<p xml:lang="fr">Oak Video Editor est un éditeur vidéo non linéaire libre visant à fournir une alternative complète aux logiciels de montage vidéo professionnels haut de gamme. Il s'agit d'un fork communautaire d'Olive Video Editor.</p>
|
||||
</description>
|
||||
<url type="homepage">https://github.com/olive-editor/olive</url>
|
||||
<url type="bugtracker">https://github.com/olive-editor/olive/issues</url>
|
||||
<url type="homepage">https://github.com/OakVideoEditorCommunity/oak</url>
|
||||
<url type="bugtracker">https://github.com/OakVideoEditorCommunity/oak/issues</url>
|
||||
<screenshots>
|
||||
<screenshot type="default"><image>https://olivevideoeditor.org/img/screenshot.1600.jpg</image></screenshot>
|
||||
</screenshots>
|
||||
|
||||
@@ -4,7 +4,7 @@ Comment=Professional open-source non-linear video editor
|
||||
Comment[fr]=Éditeur vidéo non-linéaire open-source professionnel
|
||||
Comment[it]=Programma di montaggio video professionale open-source
|
||||
Comment[id]=Aplikasi edit video yang non-linier, profesional serta sumbernya terbuka.
|
||||
Exec=olive-editor %f
|
||||
Exec=oak-editor %f
|
||||
Icon=org.oakvideoeditor.Oak
|
||||
Terminal=false
|
||||
Type=Application
|
||||
|
||||
@@ -4,9 +4,9 @@
|
||||
!define MUI_UNICON "uninstall icon.ico"
|
||||
|
||||
!define APP_NAME "Oak Video Editor"
|
||||
!define APP_TARGET "olive-editor"
|
||||
!define APP_TARGET "oak-editor"
|
||||
|
||||
!define MUI_FINISHPAGE_RUN "$INSTDIR\olive-editor.exe"
|
||||
!define MUI_FINISHPAGE_RUN "$INSTDIR\oak-editor.exe"
|
||||
|
||||
SetCompressor lzma
|
||||
|
||||
@@ -38,14 +38,14 @@ InstallDir "$PROGRAMFILES32\${APP_NAME}"
|
||||
Section "Oak Video Editor"
|
||||
SectionIn RO
|
||||
SetOutPath $INSTDIR
|
||||
File /r olive-editor\*
|
||||
File /r oak-editor\*
|
||||
|
||||
# Render worker process must live next to the editor binary
|
||||
File "olive-editor\olive-render-worker.exe"
|
||||
File "oak-editor\oak-render-worker.exe"
|
||||
|
||||
# Render backends must also live next to the editor binary
|
||||
File "olive-editor\oakgl.dll"
|
||||
File /nonfatal "olive-editor\oakvulkan.dll"
|
||||
File "oak-editor\oakgl.dll"
|
||||
File /nonfatal "oak-editor\oakvulkan.dll"
|
||||
|
||||
WriteUninstaller "$INSTDIR\uninstall.exe"
|
||||
|
||||
@@ -69,8 +69,8 @@ Section "Associate *.ove files with Oak Video Editor"
|
||||
WriteRegStr HKCR ".ove" "" "OakEditor.OVEFile"
|
||||
WriteRegStr HKCR ".ove" "Content Type" "application/vnd.olive-project"
|
||||
WriteRegStr HKCR "OakEditor.OVEFile" "" "Oak project file"
|
||||
WriteRegStr HKCR "OakEditor.OVEFile\DefaultIcon" "" "$INSTDIR\olive-editor.exe,1"
|
||||
WriteRegStr HKCR "OakEditor.OVEFile\shell\open\command" "" "$\"$INSTDIR\olive-editor.exe$\" $\"%1$\""
|
||||
WriteRegStr HKCR "OakEditor.OVEFile\DefaultIcon" "" "$INSTDIR\oak-editor.exe,1"
|
||||
WriteRegStr HKCR "OakEditor.OVEFile\shell\open\command" "" "$\"$INSTDIR\oak-editor.exe$\" $\"%1$\""
|
||||
System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
|
||||
SectionEnd
|
||||
|
||||
Reference in New Issue
Block a user