Euro-Office · Aiiaiiio · Apr 17, 2026 · Apr 17, 2026 · Apr 17, 2026 · Apr 21, 2026
@@ -141,19 +141,17 @@ FROM core-base AS core
     ARG TARGETARCH
     RUN --mount=type=cache,target=/build-cache \
         --mount=type=bind,source=${NUGET_SOURCE_PATH},target=/nuget-cache,rw \
-        VCPKG_TRIPLET=$([ "$TARGETARCH" = "arm64" ] && echo "arm64-linux-dynamic" || echo "x64-linux-dynamic") && \
         mkdir -p ${BUILD_ROOT} && \
         cd /build-cache && \
         cmake -GNinja \
         -DVCPKG_MANIFEST_MODE=ON \
         -DVCPKG_MANIFEST_DIR=/core \
-        -DVCPKG_TARGET_TRIPLET=${VCPKG_TRIPLET} \
         -DCMAKE_TOOLCHAIN_FILE=/opt/vcpkg/scripts/buildsystems/vcpkg.cmake \
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_CXX_FLAGS_RELEASE="-O3 -w" \
         -DCMAKE_C_FLAGS_RELEASE="-O3 -w" \
-        -DEO_CORE_OUTPUT_DIR=./package/bin \
-        -DEO_CORE_TOOLS_DIR=./package/tools \
+        -DEO_CORE_OUTPUT_DIR=/build-cache/package/bin \
+        -DEO_CORE_TOOLS_DIR=/build-cache/package/tools \
         /core && \
         cmake --build . && \
         cp -r package/* ${BUILD_ROOT}
@@ -16,7 +16,7 @@ jobs:
   build-wasm:
     runs-on: [ubuntu-latest, self-hosted]
     container:
-        image: emscripten/emsdk:latest
+        image: emscripten/emsdk:5.0.4
 
     steps:
       - name: Checkout repository
@@ -32,6 +32,22 @@ jobs:
           ref: main
           path: sdkjs/
 
+      - name: Install system dependencies
+        run: |
+          apt-get update
+          apt-get install -y \
+            python3 \
+            python3-dev \
+            build-essential \
+            git \
+            curl \
+            wget \
+            pkg-config \
+            libssl-dev \
+            autoconf \
+            automake \
+            libtool
+
       - name: Verify Emscripten
         run: emcc -v
 

@@ -78,7 +78,7 @@ jobs:
 
     - name: Configure core, build third_party libs (ICU, V8, etc.)
       run: |
-        cmake -GNinja -S . -B build -DVCPKG_TARGET_TRIPLET=x64-linux-dynamic -DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake -DVCPKG_MANIFEST_MODE=ON -DVCPKG_MANIFEST_DIR=.
+        cmake -GNinja -S . -B build -DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake -DVCPKG_MANIFEST_MODE=ON -DVCPKG_MANIFEST_DIR=.
 
     - name: Build core (x2t, docbuilder, etc.)
       run: |

@@ -6,14 +6,10 @@ set(CORE_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}/..")
 
 include(${CORE_ROOT_DIR}/common.cmake)
 
-set(BOOST_ROOT "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/boost/linux_64")
-find_package(Boost REQUIRED COMPONENTS system filesystem regex date_time)
-
 set(OFFICE_UTILS_ROOT_DIR "${CORE_ROOT_DIR}/OfficeUtils")
 set(DESKTOP_EDITOR_ROOT "${CORE_ROOT_DIR}/DesktopEditor")
 set(COMMON_3RDPARTY_ROOT "${CORE_ROOT_DIR}/Common/3dParty")
 
-set(ONLY_LIBXML 1)
 if(NOT TARGET libxml)
     add_subdirectory(${CORE_ROOT_DIR}/DesktopEditor/xml/build/cmake libxml)
 endif()
@@ -26,102 +22,24 @@ if(NOT TARGET UnicodeConverter)
     add_subdirectory(${CORE_ROOT_DIR}/UnicodeConverter UnicodeConverter)
 endif()
 
-
-
-
-message( "Fetch, patch Apple related 3rd-party repos" )
 set(APPLE_3RDPARTY_DIR "${COMMON_3RDPARTY_ROOT}/apple")
 set(APPLE_INSTALL_DIR "${EO_CORE_3RD_PARTY_INSTALL_DIR}/apple")
 get_filename_component(APPLE_3RDPARTY_DIR_ABS "${APPLE_3RDPARTY_DIR}" ABSOLUTE)
 get_filename_component(APPLE_INSTALL_DIR_ABS "${APPLE_INSTALL_DIR}" ABSOLUTE)
-execute_process(
-    COMMAND_ECHO STDOUT
-    COMMAND ./fetch.sh "${APPLE_INSTALL_DIR}"
-    WORKING_DIRECTORY ${APPLE_3RDPARTY_DIR_ABS}
-)
+
 set(REVENGE_LIB_ROOT "${APPLE_INSTALL_DIR}/librevenge")
 set(ODF_LIB_ROOT "${APPLE_INSTALL_DIR}/libodfgen")
 set(ETONYEK_LIB_ROOT "${APPLE_INSTALL_DIR}/libetonyek")
 set(MDDS_LIB_ROOT "${APPLE_INSTALL_DIR}/mdds")
 set(GLM_LIB_ROOT "${APPLE_INSTALL_DIR}/glm")
 
-
-
-
-
 add_library(IWorkFile SHARED
     ${CMAKE_CURRENT_SOURCE_DIR}/IWork.cpp
 
     ${CMAKE_CURRENT_SOURCE_DIR}/IWork.h
 
-    # OfficeUtils.pri
-    ${OFFICE_UTILS_ROOT_DIR}/src/OfficeUtils.cpp
-    ${OFFICE_UTILS_ROOT_DIR}/src/ZipBuffer.cpp
-    ${OFFICE_UTILS_ROOT_DIR}/src/ZipUtilsCP.cpp
+    # Hack: The zlib addon functions are not exported by kernel, so we need to have them here as well.
     ${OFFICE_UTILS_ROOT_DIR}/src/zlib_addon.c
-    ${OFFICE_UTILS_ROOT_DIR}/src/zlib-1.2.11/adler32.c
-    ${OFFICE_UTILS_ROOT_DIR}/src/zlib-1.2.11/compress.c
-    ${OFFICE_UTILS_ROOT_DIR}/src/zlib-1.2.11/contrib/minizip/ioapi.c
-    ${OFFICE_UTILS_ROOT_DIR}/src/zlib-1.2.11/contrib/minizip/ioapibuf.c
-    ${OFFICE_UTILS_ROOT_DIR}/src/zlib-1.2.11/contrib/minizip/miniunz.c
-    ${OFFICE_UTILS_ROOT_DIR}/src/zlib-1.2.11/contrib/minizip/minizip.c
-    ${OFFICE_UTILS_ROOT_DIR}/src/zlib-1.2.11/contrib/minizip/mztools.c
-    ${OFFICE_UTILS_ROOT_DIR}/src/zlib-1.2.11/contrib/minizip/unzip.c
-    ${OFFICE_UTILS_ROOT_DIR}/src/zlib-1.2.11/contrib/minizip/zip.c
-    ${OFFICE_UTILS_ROOT_DIR}/src/zlib-1.2.11/crc32.c
-    ${OFFICE_UTILS_ROOT_DIR}/src/zlib-1.2.11/deflate.c
-    ${OFFICE_UTILS_ROOT_DIR}/src/zlib-1.2.11/gzclose.c
-    ${OFFICE_UTILS_ROOT_DIR}/src/zlib-1.2.11/gzlib.c
-    ${OFFICE_UTILS_ROOT_DIR}/src/zlib-1.2.11/gzread.c
-    ${OFFICE_UTILS_ROOT_DIR}/src/zlib-1.2.11/gzwrite.c
-    ${OFFICE_UTILS_ROOT_DIR}/src/zlib-1.2.11/infback.c
-    ${OFFICE_UTILS_ROOT_DIR}/src/zlib-1.2.11/inffast.c
-    ${OFFICE_UTILS_ROOT_DIR}/src/zlib-1.2.11/inflate.c
-    ${OFFICE_UTILS_ROOT_DIR}/src/zlib-1.2.11/inftrees.c
-    ${OFFICE_UTILS_ROOT_DIR}/src/zlib-1.2.11/trees.c
-    ${OFFICE_UTILS_ROOT_DIR}/src/zlib-1.2.11/uncompr.c
-    ${OFFICE_UTILS_ROOT_DIR}/src/zlib-1.2.11/zutil.c
-
-    ${OFFICE_UTILS_ROOT_DIR}/src/OfficeUtils.h
-    ${OFFICE_UTILS_ROOT_DIR}/src/OfficeUtilsCommon.h
-    ${OFFICE_UTILS_ROOT_DIR}/src/ZipBuffer.h
-    ${OFFICE_UTILS_ROOT_DIR}/src/ZipFolder.h
-    ${OFFICE_UTILS_ROOT_DIR}/src/ZipUtilsCP.h
-    ${OFFICE_UTILS_ROOT_DIR}/src/zlib_addon.h
-    ${OFFICE_UTILS_ROOT_DIR}/src/zlib-1.2.11/contrib/minizip/crypt.h
-    ${OFFICE_UTILS_ROOT_DIR}/src/zlib-1.2.11/contrib/minizip/ioapi.h
-    ${OFFICE_UTILS_ROOT_DIR}/src/zlib-1.2.11/contrib/minizip/ioapibuf.h
-    ${OFFICE_UTILS_ROOT_DIR}/src/zlib-1.2.11/contrib/minizip/mztools.h
-    ${OFFICE_UTILS_ROOT_DIR}/src/zlib-1.2.11/contrib/minizip/unzip.h
-    ${OFFICE_UTILS_ROOT_DIR}/src/zlib-1.2.11/contrib/minizip/zip.h
-
-    # apple.pri
-    ${REVENGE_LIB_ROOT}/src/lib/RVNGBinaryData.cpp
-    ${REVENGE_LIB_ROOT}/src/lib/RVNGCSVSpreadsheetGenerator.cpp
-    ${REVENGE_LIB_ROOT}/src/lib/RVNGHTMLTextGenerator.cpp
-    ${REVENGE_LIB_ROOT}/src/lib/RVNGHTMLTextTableStyle.cpp
-    ${REVENGE_LIB_ROOT}/src/lib/RVNGHTMLTextTextStyle.cpp
-    ${REVENGE_LIB_ROOT}/src/lib/RVNGMemoryStream.cpp
-    ${REVENGE_LIB_ROOT}/src/lib/RVNGOLEStream.cpp
-    ${REVENGE_LIB_ROOT}/src/lib/RVNGProperty.cpp
-    ${REVENGE_LIB_ROOT}/src/lib/RVNGPropertyList.cpp
-    ${REVENGE_LIB_ROOT}/src/lib/RVNGPropertyListVector.cpp
-    ${REVENGE_LIB_ROOT}/src/lib/RVNGRawDrawingGenerator.cpp
-    ${REVENGE_LIB_ROOT}/src/lib/RVNGRawGeneratorBase.cpp
-    ${REVENGE_LIB_ROOT}/src/lib/RVNGRawPresentationGenerator.cpp
-    ${REVENGE_LIB_ROOT}/src/lib/RVNGRawSpreadsheetGenerator.cpp
-    ${REVENGE_LIB_ROOT}/src/lib/RVNGRawTextGenerator.cpp
-    ${REVENGE_LIB_ROOT}/src/lib/RVNGSVGDrawingGenerator.cpp
-    ${REVENGE_LIB_ROOT}/src/lib/RVNGSVGPresentationGenerator.cpp
-    ${REVENGE_LIB_ROOT}/src/lib/RVNGString.cpp
-    ${REVENGE_LIB_ROOT}/src/lib/RVNGStringVector.cpp
-    ${REVENGE_LIB_ROOT}/src/lib/RVNGTextDrawingGenerator.cpp
-    ${REVENGE_LIB_ROOT}/src/lib/RVNGTextPresentationGenerator.cpp
-    ${REVENGE_LIB_ROOT}/src/lib/RVNGTextSpreadsheetGenerator.cpp
-    ${REVENGE_LIB_ROOT}/src/lib/RVNGTextTextGenerator.cpp
-    ${REVENGE_LIB_ROOT}/src/lib/RVNGZipStream.cpp
-    ${REVENGE_LIB_ROOT}/src/lib/RVNGDirectoryStream.cpp
-    ${REVENGE_LIB_ROOT}/src/lib/RVNGStreamImplementation.cpp
 
     ${ODF_LIB_ROOT}/src/DocumentElement.cxx
     ${ODF_LIB_ROOT}/src/FilterInternal.cxx
@@ -290,47 +208,6 @@ add_library(IWorkFile SHARED
     ${ETONYEK_LIB_ROOT}/src/lib/IWORKFormula.cpp
     ${ETONYEK_LIB_ROOT}/src/lib/IWORKTable.cpp
 
-
-
-    ${REVENGE_LIB_ROOT}/src/lib/RVNGHTMLTextTableStyle.h
-    ${REVENGE_LIB_ROOT}/src/lib/RVNGHTMLTextTextStyle.h
-    ${REVENGE_LIB_ROOT}/src/lib/RVNGMemoryStream.h
-    ${REVENGE_LIB_ROOT}/src/lib/RVNGOLEStream.h
-    ${REVENGE_LIB_ROOT}/src/lib/RVNGRawGeneratorBase.h
-    ${REVENGE_LIB_ROOT}/src/lib/RVNGZipStream.h
-    ${REVENGE_LIB_ROOT}/src/lib/librevenge_internal.h
-    ${REVENGE_LIB_ROOT}/inc/librevenge-generators/RVNGCSVSpreadsheetGenerator.h
-    ${REVENGE_LIB_ROOT}/inc/librevenge-generators/RVNGHTMLTextGenerator.h
-    ${REVENGE_LIB_ROOT}/inc/librevenge-generators/RVNGRawDrawingGenerator.h
-    ${REVENGE_LIB_ROOT}/inc/librevenge-generators/RVNGRawPresentationGenerator.h
-    ${REVENGE_LIB_ROOT}/inc/librevenge-generators/RVNGRawSpreadsheetGenerator.h
-    ${REVENGE_LIB_ROOT}/inc/librevenge-generators/RVNGRawTextGenerator.h
-    ${REVENGE_LIB_ROOT}/inc/librevenge-generators/RVNGSVGPresentationGenerator.h
-    ${REVENGE_LIB_ROOT}/inc/librevenge-generators/RVNGTextDrawingGenerator.h
-    ${REVENGE_LIB_ROOT}/inc/librevenge-generators/RVNGTextPresentationGenerator.h
-    ${REVENGE_LIB_ROOT}/inc/librevenge-generators/RVNGTextSpreadsheetGenerator.h
-    ${REVENGE_LIB_ROOT}/inc/librevenge-generators/RVNGTextTextGenerator.h
-    ${REVENGE_LIB_ROOT}/inc/librevenge-generators/librevenge-generators-api.h
-    ${REVENGE_LIB_ROOT}/inc/librevenge-generators/librevenge-generators.h
-    ${REVENGE_LIB_ROOT}/inc/librevenge-stream/RVNGDirectoryStream.h
-    ${REVENGE_LIB_ROOT}/inc/librevenge-stream/RVNGStream.h
-    ${REVENGE_LIB_ROOT}/inc/librevenge-stream/librevenge-stream-api.h
-    ${REVENGE_LIB_ROOT}/inc/librevenge-stream/librevenge-stream.h
-    ${REVENGE_LIB_ROOT}/inc/librevenge-stream/RVNGStreamImplementation.h
-    ${REVENGE_LIB_ROOT}/inc/librevenge/RVNGBinaryData.h
-    ${REVENGE_LIB_ROOT}/inc/librevenge/RVNGDrawingInterface.h
-    ${REVENGE_LIB_ROOT}/inc/librevenge/RVNGPresentationInterface.h
-    ${REVENGE_LIB_ROOT}/inc/librevenge/RVNGProperty.h
-    ${REVENGE_LIB_ROOT}/inc/librevenge/RVNGPropertyList.h
-    ${REVENGE_LIB_ROOT}/inc/librevenge/RVNGPropertyListVector.h
-    ${REVENGE_LIB_ROOT}/inc/librevenge/RVNGSVGDrawingGenerator.h
-    ${REVENGE_LIB_ROOT}/inc/librevenge/RVNGSpreadsheetInterface.h
-    ${REVENGE_LIB_ROOT}/inc/librevenge/RVNGString.h
-    ${REVENGE_LIB_ROOT}/inc/librevenge/RVNGStringVector.h
-    ${REVENGE_LIB_ROOT}/inc/librevenge/RVNGTextInterface.h
-    ${REVENGE_LIB_ROOT}/inc/librevenge/librevenge-api.h
-    ${REVENGE_LIB_ROOT}/inc/librevenge/librevenge.h
-
     ${ODF_LIB_ROOT}/inc/libodfgen/OdfDocumentHandler.hxx
     ${ODF_LIB_ROOT}/inc/libodfgen/OdgGenerator.hxx
     ${ODF_LIB_ROOT}/inc/libodfgen/OdpGenerator.hxx
@@ -532,11 +409,15 @@ add_library(IWorkFile SHARED
     ${ETONYEK_LIB_ROOT}/src/lib/libetonyek_xml.h
 )
 
-set_default_options(IWorkFile)
+add_cpp_sources_from_dir_recurive( IWorkFile ${REVENGE_LIB_ROOT}/src/lib )
+add_cpp_sources_from_dir_recurive( IWorkFile ${REVENGE_LIB_ROOT}/inc )
+
+set_default_options( IWorkFile )
+add_libxml( IWorkFile ${CORE_ROOT_DIR}/DesktopEditor/xml TRUE )
 
-if(WIN32)
-    target_sources(IWorkFile PRIVATE
-        ${OFFICE_UTILS_ROOT_DIR}/src/zlib-1.2.11/contrib/minizip/iowin32.c # OfficeUtils.pri
+if( NOT MSVC )
+    target_compile_options(IWorkFile PRIVATE
+        $<$<COMPILE_LANGUAGE:CXX>:-include iostream>
     )
 endif()
 
@@ -551,7 +432,7 @@ target_include_directories(IWorkFile PRIVATE
 
     # apple.pri
     ${APPLE_INSTALL_DIR}
-    ${APPLE_3RDPARTY_DIR}/headers
+    ${APPLE_3RDPARTY_DIR_ABS}/headers
     ${REVENGE_LIB_ROOT}/inc
     ${ODF_LIB_ROOT}/inc
     ${ETONYEK_LIB_ROOT}/inc
@@ -570,11 +451,12 @@ endif()
 target_compile_definitions(IWorkFile PRIVATE
     IWORK_USE_DYNAMIC_LIBRARY
     BUILD_ZLIB_AS_SOURCES # OfficeUtils.pri
+    ZLIB_DLL
 )
 
 # static libs
 target_link_libraries(IWorkFile PUBLIC
-    libxml
+    # libxml
     Boost::system
     Boost::filesystem
     Boost::regex
@@ -589,4 +471,4 @@ target_link_libraries(IWorkFile PUBLIC
 
 copy_artifacts_to_folder("IWorkFile" "${EO_CORE_OUTPUT_DIR}")
 
-copy_boost_libs(IWorkFile)
+declare_victory( IWorkFile )
@@ -6,7 +6,6 @@ set(CORE_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}")
 
 include(${CORE_ROOT_DIR}/common.cmake)
 
-# platform-specific compile flags
 if(EMSCRIPTEN)
 
     add_subdirectory( "${CORE_ROOT_DIR}/OfficeUtils/js" zlib )
@@ -15,6 +14,7 @@ if(EMSCRIPTEN)
     add_subdirectory( "${CORE_ROOT_DIR}/Common/3dParty/hunspell" spell )
     add_subdirectory( "${CORE_ROOT_DIR}/DesktopEditor/fontengine/js" fonts )
     add_subdirectory( "${CORE_ROOT_DIR}/DesktopEditor/graphics/pro/js/" drawingfile )
+
 else()
 
     add_subdirectory( "${CORE_ROOT_DIR}/X2tConverter/build/cmake" x2t )
@@ -25,50 +25,4 @@ else()
     add_subdirectory( "${CORE_ROOT_DIR}/PdfFile/Resources/CMapMemory" cmapbin )
     add_subdirectory( "${CORE_ROOT_DIR}/Test/Applications/x2tTester" x2ttester )
 
-    #[[
-    set( ALL_ARTIFACTS
-        UnicodeConverter
-        kernel
-        kernel_network
-        Fb2File
-        PdfFile
-        HtmlFile2
-        EpubFile
-        XpsFile
-        OFDFile
-        DjVuFile
-        DocxRenderer
-        doctrenderer
-        IWorkFile
-        HWPFile
-        graphics
-        x2tlib
-        allfontsgen
-        allthemesgen
-        pluginsmanager
-        docbuilder
-        x2t
-    )
-
-    add_custom_target(copy_artifacts ALL
-        COMMENT "Copying all artifacts into ${EO_CORE_OUTPUT_DIR}"
-    )
-
-    add_dependencies(copy_artifacts ${ALL_ARTIFACTS})
-
-    foreach(artifact ${ALL_ARTIFACTS})
-        add_custom_command(TARGET copy_artifacts POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E make_directory "${EO_CORE_OUTPUT_DIR}"
-            COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${artifact}> "${EO_CORE_OUTPUT_DIR}/"
-            COMMENT "Copying ${artifact} to ${EO_CORE_OUTPUT_DIR}"
-        )
-    endforeach()
-
-    add_custom_command(TARGET copy_artifacts POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E make_directory "${EO_CORE_OUTPUT_DIR}"
-        COMMAND /bin/sh -c "cp -P \"${EO_CORE_3RD_PARTY_INSTALL_DIR}/icu/lib\"/*.so* \"${EO_CORE_OUTPUT_DIR}/\""
-        COMMENT "Copying ICU libs to ${EO_CORE_OUTPUT_DIR}"
-    )
-    ]]
-
 endif()
@@ -0,0 +1 @@
+__pycache__