Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 2 additions & 4 deletions .github/config/conan/profiles/android.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ os.api_level={{api_level}}
arch={{arch}}
build_type=Release
compiler=clang
compiler.version=17
compiler.version=19
compiler.cppstd=23
compiler.libcxx=c++_shared

Expand All @@ -32,9 +32,7 @@ tools.android:ndk_path={{android_home}}/ndk/{{ndk_version}}
tools.cmake.cmaketoolchain:extra_variables={'CMAKE_CXX_COMPILER_LAUNCHER': 'ccache', 'CMAKE_C_COMPILER_LAUNCHER': 'ccache'}

[buildenv]
# Cross compile toolchain evn vars are required to build
# libffi, libgettext, libiconv, libxml2 and other autotools packages for Android
# https://github.com/conan-io/conan/issues/16493
# Autotools packages need explicit cross-compilers (conan-io/conan#16493).
AR={{toolchain}}/bin/llvm-ar
AS={{toolchain}}/bin/llvm-as
RANLIB={{toolchain}}/bin/llvm-ranlib
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ The release run heads these entries with the version and opens a fresh

## Unreleased

- Conan packages include the license text. Android profiles identify NDK 28.1
as Clang 19 so dependency package IDs match the compiler.

- PDF incremental writes reject invalid or conflicting object references and
oversized output, report write failures and restore the parser position.

Expand Down
6 changes: 5 additions & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
from pathlib import Path

from conan import ConanFile
from conan.tools.build import check_min_cppstd
from conan.tools.cmake import CMakeToolchain, CMakeDeps, CMake
from conan.tools.files import copy


class OpenDocumentCoreConan(ConanFile):
Expand Down Expand Up @@ -37,7 +40,7 @@ class OpenDocumentCoreConan(ConanFile):
"pugixml/*:header_only": True,
}

exports_sources = ["apple/*", "cli/*", "cmake/*", "jni/*", "python/*", "resources/dist/*", "wasm/*", "src/*", "CMakeLists.txt"]
exports_sources = ["LICENSE", "apple/*", "cli/*", "cmake/*", "jni/*", "python/*", "resources/dist/*", "wasm/*", "src/*", "CMakeLists.txt"]

def config_options(self):
if self.settings.os == "Windows":
Expand Down Expand Up @@ -91,6 +94,7 @@ def build(self):
cmake.build()

def package(self):
copy(self, "LICENSE", self.source_folder, str(Path(self.package_folder) / "licenses"))
cmake = CMake(self)
cmake.install()

Expand Down
Loading