Build with pdf2htmlEX

.github/config/macos-13-clang-14/conan/profiles/default

@@ -1,3 +1,5 @@
+include(pdf2htmlEX-config)
+
 [settings]
 arch=x86_64
 build_type=Release

.github/config/macos-13-clang-14/conan/profiles/pdf2htmlEX-config

@@ -0,0 +1,6 @@
+[options]
+# @TODO: Fix linker errors caused by the absense of these options
+# Fontforge build failure if GLib built with mount
+glib/*:with_mount=False
+# Fontforge build failure if FreeType built with Brotli
+freetype/*:with_brotli=False

.github/config/macos-14-clang-14/conan/profiles/default

@@ -1,5 +1,7 @@
+include(pdf2htmlEX-config)
+
 [settings]
-arch=x86_64
+arch=armv8
 build_type=Release
 compiler=apple-clang
 compiler.version=14

.github/config/macos-14-clang-14/conan/profiles/pdf2htmlEX-config

@@ -0,0 +1,6 @@
+[options]
+# @TODO: Fix linker errors caused by the absense of these options
+# Fontforge build failure if GLib built with mount
+glib/*:with_mount=False
+# Fontforge build failure if FreeType built with Brotli
+freetype/*:with_brotli=False

.github/config/ubuntu-24.04-clang-16/conan/profiles/default

@@ -1,3 +1,5 @@
+include(pdf2htmlEX-config)
+
 [settings]
 arch=x86_64
 build_type=Release

.github/config/ubuntu-24.04-clang-16/conan/profiles/pdf2htmlEX-config

@@ -0,0 +1,6 @@
+[options]
+# @TODO: Fix linker errors caused by the absense of these options
+# Fontforge build failure if GLib built with mount
+glib/*:with_mount=False
+# Fontforge build failure if FreeType built with Brotli
+freetype/*:with_brotli=False

.github/config/ubuntu-24.04-gcc-12/conan/profiles/default

@@ -1,3 +1,5 @@
+include(pdf2htmlEX-config)
+
 [settings]
 arch=x86_64
 build_type=Release

.github/config/ubuntu-24.04-gcc-12/conan/profiles/pdf2htmlEX-config

@@ -0,0 +1,6 @@
+[options]
+# @TODO: Fix linker errors caused by the absense of these options
+# Fontforge build failure if GLib built with mount
+glib/*:with_mount=False
+# Fontforge build failure if FreeType built with Brotli
+freetype/*:with_brotli=False

.github/config/windows-2022-msvc-1940/conan/profiles/default

@@ -0,0 +1,8 @@
+[settings]
+arch=x86_64
+build_type=Release
+compiler=msvc
+compiler.version=194
+compiler.cppstd=20
+compiler.runtime=dynamic
+os=Windows

.github/workflows/build_test.yml

@@ -27,6 +27,7 @@ jobs:
           - { os: macos-13, compiler: clang-14 }
           - { os: macos-14, compiler: clang-14 }
           - { os: windows-2022, compiler: msvc-1939 }
+          - { os: windows-2022, compiler: msvc-1940 }
     steps:
       - name: checkout
         uses: actions/checkout@v4
@@ -50,7 +51,7 @@ jobs:
         run: pip install conan
 
       - name: conan remote
-        run: conan remote add --index 0 odr https://artifactory.opendocument.app/artifactory/api/conan/conan
+        run: conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan
       - name: conan login
         run: conan remote login odr admin --password ${{ secrets.ARTIFACTORY }}
       - name: conan config
@@ -224,6 +225,7 @@ jobs:
           - { os: macos-13, compiler: clang-14 }
           - { os: macos-14, compiler: clang-14 }
           - { os: windows-2022, compiler: msvc-1939 }
+          - { os: windows-2022, compiler: msvc-1940 }
     steps:
       - name: checkout
         uses: actions/checkout@v4
@@ -247,7 +249,7 @@ jobs:
         run: pip install conan
 
       - name: conan remote
-        run: conan remote add --index 0 odr https://artifactory.opendocument.app/artifactory/api/conan/conan
+        run: conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan
       - name: conan config
         run: conan config install .github/config/${{ matrix.os }}-${{ matrix.compiler }}/conan
 

.github/workflows/publish.yml

@@ -24,7 +24,7 @@ jobs:
         run: pip install --upgrade pip conan
 
       - name: conan remote
-        run: conan remote add --index 0 odr https://artifactory.opendocument.app/artifactory/api/conan/conan
+        run: conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan
       - name: conan login
         run: conan remote login odr admin --password ${{ secrets.ARTIFACTORY }}
       - name: conan config

.github/workflows/tidy.yml

@@ -32,7 +32,7 @@ jobs:
         run: pip install --upgrade pip conan
 
       - name: conan remote
-        run: conan remote add --index 0 odr https://artifactory.opendocument.app/artifactory/api/conan/conan
+        run: conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan
       - name: conan config
         run: conan config install .github/config/${{ matrix.os }}-${{ matrix.compiler }}/conan
       - name: conan install

CMakeLists.txt

@@ -5,8 +5,10 @@ set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
+option(BUILD_SHARED_LIBS "Build using shared libraries" ON)
 option(ODR_TEST "enable tests" OFF)
 option(ODR_CLANG_TIDY "Run clang-tidy static analysis" OFF)
+option(WITH_PDF2HTMLEX "Build with pdf2htmlEX" ON)
 
 # TODO defining global compiler flags seems to be bad practice with conan
 # TODO consider using conan profiles
@@ -187,6 +189,11 @@ target_link_libraries(odr
         utf8::cpp
 )
 
+if(WITH_PDF2HTMLEX)
+    find_package(pdf2htmlEX REQUIRED)
+    target_link_libraries(odr PRIVATE pdf2htmlex::pdf2htmlex)
+endif(WITH_PDF2HTMLEX)
+
 if (EXISTS "${PROJECT_SOURCE_DIR}/.git")
     add_dependencies(odr check_git)
 endif ()

conanfile.py

@@ -18,14 +18,27 @@ class OpenDocumentCoreConan(ConanFile):
     options = {
         "shared": [True, False],
         "fPIC": [True, False],
+        "with_pdf2htmlEX": [True, False],
     }
     default_options = {
         "shared": False,
         "fPIC": True,
+        "with_pdf2htmlEX": True,
     }
 
     exports_sources = ["cli/*", "cmake/*", "src/*", "CMakeLists.txt"]
 
+    def config_options(self):
+        if self.settings.os == "Windows":
+            del self.options.fPIC
+            # @TODO: ideally Windows should just default_options['with_pdf2htmlEX'] = False
+            # But by the time config_options() is executed, default_options is already done parsed.
+            del self.options.with_pdf2htmlEX
+
+    def configure(self):
+        if self.options.shared:
+            self.options.rm_safe("fPIC")
+
     def requirements(self):
         self.requires("pugixml/1.14")
         self.requires("cryptopp/8.8.0")
@@ -34,19 +47,21 @@ def requirements(self):
         self.requires("vincentlaucsb-csv-parser/2.1.3")
         self.requires("uchardet/0.0.7")
         self.requires("utfcpp/4.0.4")
+        if self.options.get_safe("with_pdf2htmlEX"):
+            self.requires("pdf2htmlex/0.18.8.rc1-20240805-git")
 
     def build_requirements(self):
         self.test_requires("gtest/1.14.0")
 
     def validate_build(self):
         if self.settings.get_safe("compiler.cppstd"):
-            check_min_cppstd(self, 17)
+            check_min_cppstd(self, 20)
 
     def generate(self):
         tc = CMakeToolchain(self)
         tc.variables["CMAKE_PROJECT_VERSION"] = self.version
-        tc.variables["BUILD_SHARED_LIBS"] = self.options.shared
         tc.variables["ODR_TEST"] = False
+        tc.variables["WITH_PDF2HTMLEX"] = self.options.get_safe("with_pdf2htmlEX", False)
         tc.generate()
 
         deps = CMakeDeps(self)