Skip to content

fix: desktop editors with new msvc build routine #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
rikled wants to merge 2 commits into from
Closed

fix: desktop editors with new msvc build routine #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6fb711e
fix: desktop editors with new msvc build routine
rikled Jun 11, 2026
ed9433d
fix: secret leak in dockerfile
rikled Jun 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .docker/desktop-apps.bake.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

#### DESKTOP-APPS
FROM core-base AS desktop-builder

ARG PRODUCT_VERSION
ARG BUILD_NUMBER
ARG CACHE_BUST=1
Expand Down Expand Up @@ -79,12 +80,17 @@ FROM core-base AS desktop-builder

RUN --mount=type=cache,target=/build-cache-desktop,id=build-cache-desktop-${CACHE_BUST} \
--mount=type=cache,target=/nuget-cache,id=nuget-cache-${CACHE_BUST} \
--mount=type=bind,from=third-party,source=/third_party,target=/third_party_src \
--mount=type=secret,id=nextcloud_user \
--mount=type=secret,id=nextcloud_pass \
export NEXTCLOUD_USER="$(cat /run/secrets/nextcloud_user)" && \
export NEXTCLOUD_PASS="$(cat /run/secrets/nextcloud_pass)" && \
cp -a /third_party_src/. /build-cache-desktop/third_party && \
cd /build-cache-desktop && \
cmake -GNinja -DVCPKG_TARGET_TRIPLET=x64-linux-dynamic \
-DCMAKE_TOOLCHAIN_FILE=/opt/vcpkg/scripts/buildsystems/vcpkg.cmake \
-DVCPKG_MANIFEST_MODE=ON \
-DVCPKG_MANIFEST_DIR="/core" \
-DVCPKG_MANIFEST_FEATURES="desktop-editors" \
-DABOUT_PAGE_APP_NAME="${ABOUT_PAGE_APP_NAME}" \
/desktop-apps/win-linux/ && \
cmake --build . && \
Expand Down
54 changes: 10 additions & 44 deletions win-linux/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,9 @@ set(CMAKE_AUTOUIC ON)
set(CORE_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}/../../core")
set(DESKTOP_SDK_ROOT "${CMAKE_CURRENT_LIST_DIR}/../../desktop-sdk")

set(BUILD_DESKTOP TRUE CACHE INTERNAL "tell common to prepare third party for desktop")
include(${CORE_ROOT_DIR}/common.cmake)

message( "Fetch and build icu (DESKTOPEDITOR VERSION 60)" )
set(ICU_3RDPARTY_DIR "${CORE_ROOT_DIR}/Common/3dParty/icu")
set(ICU_INSTALL_DIR "${EO_CORE_3RD_PARTY_INSTALL_DIR}/icu60")
set(ICU_MAJOR_VER "60")
set(ICU_MINOR_VER "3")
get_filename_component(ICU_3RDPARTY_DIR_ABS "${ICU_3RDPARTY_DIR}" ABSOLUTE)
get_filename_component(ICU_INSTALL_DIR_ABS "${ICU_INSTALL_DIR}" ABSOLUTE)
execute_process(
COMMAND_ECHO STDOUT
COMMAND ./nc-build.sh "${EO_CORE_3RD_PARTY_WORK_DIR}/icu60" "${ICU_INSTALL_DIR}" ${ICU_MAJOR_VER} ${ICU_MINOR_VER}
WORKING_DIRECTORY ${ICU_3RDPARTY_DIR_ABS}
)


if(NOT TARGET hunspell-wrapper)
add_subdirectory(${CORE_ROOT_DIR}/Common/3dParty/hunspell/qt hunspell-wrapper)
Expand Down Expand Up @@ -121,33 +109,11 @@ if(NOT TARGET allthemesgen)
add_subdirectory( "${CORE_ROOT_DIR}/DesktopEditor/allthemesgen" allthemesgen )
endif()

message( "Fetch and build OpenSSL" )
set(OPENSSL_3RDPARTY_DIR "${CORE_ROOT_DIR}/Common/3dParty/openssl")
set(OPENSSL_INSTALL_DIR "${EO_CORE_3RD_PARTY_INSTALL_DIR}/openssl_build_linux_64")
get_filename_component(OPENSSL_3RDPARTY_DIR_ABS "${OPENSSL_3RDPARTY_DIR}" ABSOLUTE)
get_filename_component(OPENSSL_INSTALL_DIR_ABS "${OPENSSL_INSTALL_DIR}" ABSOLUTE)
execute_process(
COMMAND_ECHO STDOUT
COMMAND ./nc-build.sh "${EO_CORE_3RD_PARTY_WORK_DIR}/openssl" "${OPENSSL_INSTALL_DIR}"
WORKING_DIRECTORY ${OPENSSL_3RDPARTY_DIR_ABS}
)

# 2. Find Qt Packages
set(QT_ROOT "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/qt/Qt-5.9.9/gcc_64/")
set(QT_DIR "${QT_ROOT}/lib/cmake/Qt5")
set(Qt5_DIR "${QT_ROOT}/lib/cmake/Qt5")
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Gui Widgets PrintSupport Svg)
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Gui Widgets PrintSupport Svg LinguistTools Multimedia MultimediaWidgets)

if(UNIX)
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS DBus X11Extras)
add_definitions(-DLINUX -D_LINUX -D_X11)
endif()

set(CEF_ROOT "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/cef")
list(APPEND CMAKE_MODULE_PATH "${CEF_ROOT}/cmake")
find_package(CEF REQUIRED)

# 3. Definitions & Global Config
add_definitions(-D__DONT_WRITE_IN_APP_TITLE)
add_definitions(-DAPP_ICON_PATH="./res/icons/desktopeditors-eo.ico")
Expand Down Expand Up @@ -368,15 +334,15 @@ target_include_directories(DesktopEditors PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/../../core/DesktopEditor
${CMAKE_CURRENT_SOURCE_DIR}/../../core/Common
${CMAKE_CURRENT_SOURCE_DIR}/extras/update-daemon/src/classes
${OPENSSL_INSTALL_DIR}/include
${OPENSSL_INSTALL_DIR_ABS}/include
${CMAKE_CURRENT_SOURCE_DIR}/../../core/Common/3dParty/openssl/common
${CORE_ROOT_DIR}/Common/3dParty/openssl/common
)

target_link_directories(DesktopEditors PRIVATE
$<$<CONFIG:Debug>:${CEF_ROOT}/Debug>
$<$<CONFIG:Release>:${CEF_ROOT}/Release>
${ICU_INSTALL_DIR}/include
${ICU_DESKTOP_INSTALL_DIR}/include
)

target_link_libraries(DesktopEditors PRIVATE
Expand All @@ -401,8 +367,8 @@ target_link_libraries(DesktopEditors PRIVATE
PdfFile
DjVuFile
XpsFile
${OPENSSL_INSTALL_DIR_ABS}/lib/libssl.a
${OPENSSL_INSTALL_DIR_ABS}/lib/libcrypto.a
${OPENSSL_LIBSSL}
${OPENSSL_LIBCRYPTO}
-Wl,--end-group

# --- Main CEF Binary ---
Expand All @@ -426,9 +392,9 @@ if(UNIX)
target_link_libraries(DesktopEditors PRIVATE
Qt${QT_VERSION_MAJOR}::DBus
Qt${QT_VERSION_MAJOR}::X11Extras
${ICU_INSTALL_DIR_ABS}/lib/libicuuc.so.${ICU_MAJOR_VER}
${ICU_INSTALL_DIR_ABS}/lib/libicudata.so.${ICU_MAJOR_VER}
${ICU_INSTALL_DIR_ABS}/lib/libicui18n.so.${ICU_MAJOR_VER}
${LIBICUUC_DESKTOP}
${LIBICUDATA_DESKTOP}
${LIBICUI_DESKTOP}
)

target_link_options(DesktopEditors PRIVATE "-Wl,-rpath,$ORIGIN" "-Wl,-rpath,$ORIGIN/converter")
Expand Down Expand Up @@ -473,7 +439,7 @@ install(DIRECTORY "${CEF_RESOURCES_PATH}/"
DESTINATION ${CMAKE_INSTALL_BINDIR}
)

install(DIRECTORY "${ICU_INSTALL_DIR_ABS}/lib/"
install(DIRECTORY "${ICU_DESKTOP_INSTALL_DIR_ABS}/lib/"
DESTINATION ${CMAKE_INSTALL_BINDIR}
FILES_MATCHING PATTERN "lib*.so*"
)
Expand Down Expand Up @@ -519,7 +485,7 @@ install(DIRECTORY "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/boost/linux_64
FILES_MATCHING PATTERN "lib*.so*"
)

install(DIRECTORY "${EO_CORE_3RD_PARTY_INSTALL_DIR}/icu/lib/"
install(DIRECTORY "${ICU_INSTALL_DIR_ABS}/lib/"
DESTINATION ${CMAKE_INSTALL_BINDIR}/converter
FILES_MATCHING PATTERN "lib*.so*"
)
Expand Down