oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: move render worker out of app/ into top-level worker/

Browse Source 
- oak-render-worker now builds from worker/ (own CMakeLists.txt) as a
  peer of app/; RenderWorkerPool resolves the new build-tree location
- deduplicated the Linux install() rules for the worker
- worker-spawning tests resolve build/worker instead of build/app
- cd.yml: Windows staging copies the worker from its new output path
This commit is contained in:
Mike-Solar
2026-07-19 22:12:29 +08:00
parent 76f5c2a65b
commit 7832cb30b3
11 changed files with 89 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/cd.yml
+1 -1
View File
@@ -59,7 +59,7 @@ jobs:
run: |
mkdir -p app/packaging/windows/nsis/oak-editor
cp build/app/oak-editor.exe app/packaging/windows/nsis/oak-editor/
cp build/app/oak-render-worker.exe app/packaging/windows/nsis/oak-editor/
cp build/worker/oak-render-worker.exe app/packaging/windows/nsis/oak-editor/
cp build/app/oakgl.dll app/packaging/windows/nsis/oak-editor/
if [ -f build/app/oakvulkan.dll ]; then
cp build/app/oakvulkan.dll app/packaging/windows/nsis/oak-editor/
CMakeLists.txt
+1
View File
@@ -309,6 +309,7 @@ add_subdirectory(third_party/KDDockWidgets EXCLUDE_FROM_ALL)
add_subdirectory(third_party/openfx/HostSupport)
add_subdirectory(app)
add_subdirectory(worker)
if (BUILD_TESTS)
enable_testing()
app/CMakeLists.txt
+3 -42
View File
@@ -247,35 +247,8 @@ if (OAK_ENABLE_DYNAMIC_RENDER_BACKEND)
add_dependencies(olive-editor oakvulkan)
endif ()
endif ()
# Ensure the render worker is always built together with the editor on every platform.
add_dependencies(olive-editor olive-render-worker)
set_target_properties(olive-editor PROPERTIES OUTPUT_NAME "oak-editor")
# Add render worker process (oak-render-worker).
# Reuses the libolive-editor object library so the worker shares the exact same render/node/codec
# code as the editor. It is a headless app that owns its own offscreen GL context. The link set is
# currently the full OLIVE_LIBRARIES for simplicity; trimming UI-only dependencies is a later-phase
# cleanup (see render-process-isolation plan).
add_executable(olive-render-worker
render/worker/workermain.cpp
$<TARGET_OBJECTS:libolive-editor>
$<TARGET_OBJECTS:olive-version-obj>
)
set_target_properties(olive-render-worker PROPERTIES OUTPUT_NAME "oak-render-worker")
if (APPLE)
target_sources(olive-render-worker PRIVATE render/worker/workermain_mac.mm)
target_link_libraries(olive-render-worker PRIVATE "-framework Cocoa")
endif ()
target_include_directories(olive-render-worker PUBLIC pluginSupport)
target_link_libraries(olive-render-worker PUBLIC OfxHost)
if (OAK_ENABLE_DYNAMIC_RENDER_BACKEND)
target_compile_definitions(olive-render-worker PRIVATE OAK_ENABLE_DYNAMIC_RENDER_BACKEND)
add_dependencies(olive-render-worker oakgl)
if (TARGET oakvulkan)
add_dependencies(olive-render-worker oakvulkan)
endif ()
endif ()
# Create docs if doxygen was found
if (DOXYGEN_FOUND)
set(DOXYGEN_PROJECT_NAME "Oak Video Editor")
@@ -331,15 +304,12 @@ elseif (APPLE)
endif ()
elseif (UNIX)
# Set Linux-specific properties for application
# The render worker must ship next to oak-editor: RenderWorkerPool spawns
# it from QCoreApplication::applicationDirPath()
install(TARGETS olive-editor olive-render-worker RUNTIME DESTINATION bin)
install(TARGETS olive-editor RUNTIME DESTINATION bin)
endif ()
# Set link libraries
target_link_libraries(olive-editor PRIVATE ${OLIVE_LIBRARIES})
target_link_libraries(libolive-editor PRIVATE ${OLIVE_LIBRARIES})
target_link_libraries(olive-render-worker PRIVATE ${OLIVE_LIBRARIES})
# The ffmpeg_bridge shared library ships next to the binaries: inside the
# macOS app bundle (Contents/MacOS, resolved via @loader_path), and in the
@@ -348,14 +318,13 @@ if (APPLE)
# macOS bundles are distributed via POST_BUILD copies (not install()), so
# @loader_path must already be in the build-tree binaries' RPATH.
set(OLIVE_FB_RPATH "@loader_path")
set_target_properties(olive-editor olive-render-worker PROPERTIES
set_target_properties(olive-editor PROPERTIES
BUILD_RPATH "@loader_path")
elseif (UNIX)
set(OLIVE_FB_RPATH "$ORIGIN/../lib")
endif ()
if (OLIVE_FB_RPATH)
set_target_properties(olive-editor olive-render-worker PROPERTIES
INSTALL_RPATH "${OLIVE_FB_RPATH}")
set_target_properties(olive-editor PROPERTIES INSTALL_RPATH "${OLIVE_FB_RPATH}")
if (TARGET oakgl)
set_target_properties(oakgl PROPERTIES INSTALL_RPATH "${OLIVE_FB_RPATH}")
endif ()
@@ -367,22 +336,14 @@ endif ()
# Set compile options
target_compile_options(olive-editor PRIVATE ${OLIVE_COMPILE_OPTIONS})
target_compile_options(libolive-editor PRIVATE ${OLIVE_COMPILE_OPTIONS})
target_compile_options(olive-render-worker PRIVATE ${OLIVE_COMPILE_OPTIONS})
# Set global definitions
target_compile_definitions(olive-editor PRIVATE ${OLIVE_DEFINITIONS})
target_compile_definitions(libolive-editor PRIVATE ${OLIVE_DEFINITIONS})
target_compile_definitions(olive-render-worker PRIVATE ${OLIVE_DEFINITIONS})
# Set include dirs
target_include_directories(olive-editor PRIVATE ${OLIVE_INCLUDE_DIRS})
target_include_directories(libolive-editor PRIVATE ${OLIVE_INCLUDE_DIRS})
target_include_directories(olive-render-worker PRIVATE ${OLIVE_INCLUDE_DIRS})
# Install the render worker alongside the editor on Linux.
if (UNIX AND NOT APPLE)
install(TARGETS olive-render-worker RUNTIME DESTINATION bin)
endif ()
# Add crash handler
if (GoogleCrashpad_FOUND AND Qt${QT_VERSION_MAJOR}Network_FOUND)
app/render/renderworkerpool.cpp
+1
View File
@@ -245,6 +245,7 @@ QString worker_program_path()
const QStringList candidates = {
QDir(app_dir).filePath(file),
QDir(app_dir).filePath(QStringLiteral("../app/") + file),
QDir(app_dir).filePath(QStringLiteral("../worker/") + file),
};
for (const QString &path : candidates) {
tests/gtest/render_clip_buffer_hint_test.cpp
+2 -2
View File
@@ -69,11 +69,11 @@ QString demo_video_path()
QString worker_binary_path()
{
// The test binary lives in cmake-build-debug/tests/gtest; the worker is in
// cmake-build-debug/app.
// cmake-build-debug/worker.
QDir dir(QCoreApplication::applicationDirPath());
dir.cdUp(); // tests/gtest -> tests
dir.cdUp(); // tests -> build dir
dir.cd(QStringLiteral("app"));
dir.cd(QStringLiteral("worker"));
#if defined(_WIN32)
return dir.filePath(QStringLiteral("oak-render-worker.exe"));
#else
tests/gtest/render_direct_connection_test.cpp
+2 -2
View File
@@ -56,11 +56,11 @@ QString demo_video_path()
QString worker_binary_path()
{
// The test binary lives in cmake-build-debug/tests/gtest; the worker is in
// cmake-build-debug/app.
// cmake-build-debug/worker.
QDir dir(QCoreApplication::applicationDirPath());
dir.cdUp(); // tests/gtest -> tests
dir.cdUp(); // tests -> build dir
dir.cd(QStringLiteral("app"));
dir.cd(QStringLiteral("worker"));
#if defined(_WIN32)
return dir.filePath(QStringLiteral("oak-render-worker.exe"));
#else
tests/gtest/render_worker_footage_test.cpp
+2 -2
View File
@@ -93,11 +93,11 @@ constexpr int k_timeout_ms = 30000;
QString worker_binary_path()
{
// The test binary lives in cmake-build-debug/tests/gtest; the worker is in
// cmake-build-debug/app.
// cmake-build-debug/worker.
QDir dir(QCoreApplication::applicationDirPath());
dir.cdUp(); // tests/gtest -> tests
dir.cdUp(); // tests -> build dir
dir.cd(QStringLiteral("app"));
dir.cd(QStringLiteral("worker"));
#if defined(_WIN32)
return dir.filePath(QStringLiteral("oak-render-worker.exe"));
#else
tests/gtest/viewer_display_repro_test.cpp
+1 -1
View File
@@ -59,7 +59,7 @@ QString worker_binary_path_t()
QDir dir(QCoreApplication::applicationDirPath());
dir.cdUp();
dir.cdUp();
dir.cd(QStringLiteral("app"));
dir.cd(QStringLiteral("worker"));
#if defined(_WIN32)
return dir.filePath(QStringLiteral("oak-render-worker.exe"));
#else
worker/CMakeLists.txt
+76
View File
@@ -0,0 +1,76 @@
# Oak - Non-Linear Video Editor
# Copyright (C) 2026 Oak Team
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Render worker process (oak-render-worker).
#
# The worker is a headless render process spawned by the editor through
# RenderWorkerPool. It reuses the libolive-editor object library so it
# shares the exact same render/node/codec code as the editor. The link set
# is currently the full OLIVE_LIBRARIES for simplicity; trimming UI-only
# dependencies is a later-phase cleanup (render-process-isolation plan).
add_executable(olive-render-worker
workermain.cpp
$<TARGET_OBJECTS:libolive-editor>
$<TARGET_OBJECTS:olive-version-obj>
)
set_target_properties(olive-render-worker PROPERTIES OUTPUT_NAME "oak-render-worker")
if (APPLE)
target_sources(olive-render-worker PRIVATE workermain_mac.mm)
target_link_libraries(olive-render-worker PRIVATE "-framework Cocoa")
endif ()
# CMAKE_INCLUDE_CURRENT_DIR only covers the app/ scope, so add the app
# include roots explicitly now that the worker lives outside it
target_include_directories(olive-render-worker PRIVATE
${CMAKE_SOURCE_DIR}/app
${CMAKE_BINARY_DIR}/app
${CMAKE_SOURCE_DIR}/app/pluginSupport
${OLIVE_INCLUDE_DIRS})
target_link_libraries(olive-render-worker PUBLIC OfxHost)
target_link_libraries(olive-render-worker PRIVATE ${OLIVE_LIBRARIES})
target_compile_options(olive-render-worker PRIVATE ${OLIVE_COMPILE_OPTIONS})
target_compile_definitions(olive-render-worker PRIVATE ${OLIVE_DEFINITIONS})
if (OAK_ENABLE_DYNAMIC_RENDER_BACKEND)
target_compile_definitions(olive-render-worker PRIVATE OAK_ENABLE_DYNAMIC_RENDER_BACKEND)
add_dependencies(olive-render-worker oakgl)
if (TARGET oakvulkan)
add_dependencies(olive-render-worker oakvulkan)
endif ()
endif ()
# The ffmpeg_bridge shared library ships next to the binaries: inside the
# macOS app bundle (Contents/MacOS, resolved via @loader_path), and in the
# standard lib directory on other platforms.
if (APPLE)
set_target_properties(olive-render-worker PROPERTIES
BUILD_RPATH "@loader_path"
INSTALL_RPATH "@loader_path")
elseif (UNIX)
set_target_properties(olive-render-worker PROPERTIES
INSTALL_RPATH "$ORIGIN/../lib")
endif ()
# The editor always needs the worker next to it (macOS bundle POST_BUILD
# copies, Linux install() into the same bin directory)
add_dependencies(olive-editor olive-render-worker)
# Install the render worker alongside the editor on Linux.
if (UNIX AND NOT APPLE)
install(TARGETS olive-render-worker RUNTIME DESTINATION bin)
endif ()
app/render/worker/workermain.cpp → worker/workermain.cpp
View File
app/render/worker/workermain_mac.mm → worker/workermain_mac.mm
View File