Skip to content

Commit

Permalink
readme/install-system-caller: revise origin again
Browse files Browse the repository at this point in the history
This amends 9ca64b9.
  • Loading branch information
mara004 committed Nov 9, 2023
1 parent 51da8a6 commit a7e5aa3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,11 @@ pypdfium2 includes helpers to simplify common use cases, while the raw PDFium/ct
# Reminder: you'll want to use the pypdfium2-team fork of ctypesgen
ctypesgen --library pdfium --runtime-libdirs $MY_LIBDIRS --headers $MY_INCLUDE_DIR/fpdf*.h -o src/pypdfium2_raw/bindings.py --strip-build-path=. --no-srcinfo [-D $MY_FLAGS]
# Write the version file (substitute placeholders accordingly)
# Write the version file (fill the placeholders).
# Note, this is not a mature interface yet and might change!
# major/minor/build/patch: integers forming the pdfium version being packaged
# n_commits/hash: git describe like post-tag info (0/null for release commit)
# origin: a string to identify the build, consisting of loader strategy (e.g. system, bundled, custom) and binary provider (e.g. pdfium-binaries, distro name) separated by a slash (e.g. "system/debian" if using system pdfium provided by debian)
# origin: a string to identify the build, consisting of binary source and package provider (e.g. "system/debian", "pdfium-binaries/debian")
# flags: a comma-delimited list of pdfium feature flag strings (e.g. "V8", "XFA") - may be empty for default build
cat >"src/pypdfium2_raw/version.json" <<END
{
Expand All @@ -109,7 +110,7 @@ pypdfium2 includes helpers to simplify common use cases, while the raw PDFium/ct
"patch": $PDFIUM_PATCH,
"n_commits": $POST_TAG_COMMIT_COUNT,
"hash": $POST_TAG_HASH,
"origin": "$LOADER_STRATEGY/$BINARY_PROVIDER",
"origin": "$ORIGIN",
"flags": [$MY_FLAGS]
}
END
Expand Down
2 changes: 1 addition & 1 deletion setupsrc/pypdfium2_setup/packaging_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@ def build_pl_suffix(version, use_v8):
def parse_pl_spec(pl_spec, need_prepare=True):

# FIXME targets integration is very inflexible, need to restructure!
# In the future, we'll want to handle origin here using the "$LOADER_STRATEGY/$BINARY_PROVIDER" format. In particular, the system target needs a way to pass through the provider.
# TODO add way to pass through package provider with system target

if pl_spec.startswith("prepared!"):
_, pl_spec = pl_spec.split("!", maxsplit=1)
Expand Down

0 comments on commit a7e5aa3

Please sign in to comment.