Skip to content

Commit b23da7f

Browse files
committed
Update doc footer per #205
Also update the doc build script to use `uv` if present. That's nicer because you don't have to manually create a python venv or install depencies. Removed old unused footer, and marked ofx-header and ofx-footer as unused. Signed-off-by: Gary Oberbrunner <[email protected]>
1 parent 18e69e3 commit b23da7f

File tree

8 files changed

+29
-40
lines changed

8 files changed

+29
-40
lines changed

Documentation/build.sh

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,37 +22,44 @@ if [ ! -f genPropertiesReference.py ] ; then
2222
exit 1
2323
fi
2424

25-
if ! command -v sphinx-build > /dev/null 2>&1 ; then
26-
echo "Python can't import required modules; did you set up the prereqs?"
27-
echo "Check the README.md."
28-
exit 1
25+
if command -v uvx > /dev/null 2>&1; then
26+
USE_UV=1
27+
SPHINX_BUILD="uv run --with-requirements pipreq.txt sphinx-build"
28+
UV_RUN="uv run"
29+
else
30+
USE_UV=
31+
SPHINX_BUILD="sphinx-build"
32+
UV_RUN=""
2933
fi
3034

3135
rm -rf build
3236

3337
# Generate references
3438
EXPECTED_ERRS="unable to resolve reference|explicit link request|found in multiple"
35-
python genPropertiesReference.py \
39+
$UV_RUN python genPropertiesReference.py \
3640
-i ../include -o sources/Reference/ofxPropertiesReference.rst -r \
3741
> /tmp/ofx-doc-build.out 2>&1
38-
egrep -v "$EXPECTED_ERRS" /tmp/ofx-doc-build.out || true
42+
grep -v -E "$EXPECTED_ERRS" /tmp/ofx-doc-build.out || true
3943

4044
# Build the Doxygen docs
4145
EXPECTED_ERRS="malformed hyperlink target|Duplicate explicit|Definition list ends|unable to resolve|could not be resolved"
4246
cd ../include
4347
doxygen ofx.doxy > /tmp/ofx-doc-build.out 2>&1
44-
egrep -v "$EXPECTED_ERRS" /tmp/ofx-doc-build.out || true
48+
grep -v -E "$EXPECTED_ERRS" /tmp/ofx-doc-build.out || true
4549
cd -
4650

4751
# Use breathe.apidoc to collect the Doxygen API docs
4852
rm -rf sources/Reference/api
49-
python -m breathe.apidoc -p 'ofx_reference' -m --force -g class,interface,struct,union,file,namespace,group -o sources/Reference/api doxygen_build/xml
50-
53+
if [[ $USE_UV ]]; then
54+
$UV_RUN --with breathe python -m breathe.apidoc -p 'ofx_reference' -m --force -g class,interface,struct,union,file,namespace,group -o sources/Reference/api doxygen_build/xml
55+
else
56+
python -m breathe.apidoc -p 'ofx_reference' -m --force -g class,interface,struct,union,file,namespace,group -o sources/Reference/api doxygen_build/xml
57+
fi
5158

5259
# Build the Sphinx docs
5360
EXPECTED_ERRS='Explicit markup ends without|Duplicate C.*declaration|Declaration is|cpp:func targets a member|undefined label'
54-
sphinx-build -b html sources build > /tmp/ofx-doc-build.out 2>&1
55-
egrep -v "$EXPECTED_ERRS" /tmp/ofx-doc-build.out || true
61+
$SPHINX_BUILD -b html sources build > /tmp/ofx-doc-build.out 2>&1
62+
grep -v -E "$EXPECTED_ERRS" /tmp/ofx-doc-build.out || true
5663

5764
echo "Documentation build complete."
5865
echo "Open file:///$PWD/build/index.html in your browser"

Documentation/genPropertiesReference.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SPDX-License-Identifier: BSD-3-Clause
22

3-
import os,sys, getopt,re
3+
import os,sys,getopt
44

55
badlyNamedProperties = ["kOfxImageEffectFrameVarying", "kOfxImageEffectPluginRenderThreadSafety"]
66

Documentation/sources/Reference/ofxPropertiesReference.rst

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,7 @@ Properties Reference
4747

4848
.. doxygendefine:: kOfxImageEffectPropColourManagementAvailableConfigs
4949

50-
.. doxygendefine:: kOfxImageEffectColourManagementBasic
51-
52-
.. doxygendefine:: kOfxImageEffectColourManagementConfig
53-
54-
.. doxygendefine:: kOfxImageEffectColourManagementCore
55-
56-
.. doxygendefine:: kOfxImageEffectColourManagementFull
57-
58-
.. doxygendefine:: kOfxImageEffectColourManagementNone
59-
60-
.. doxygendefine:: kOfxImageEffectColourManagementOCIO
50+
.. doxygendefine:: kOfxImageEffectPropColourManagementConfig
6151

6252
.. doxygendefine:: kOfxImageEffectPropColourManagementStyle
6353

@@ -93,6 +83,8 @@ Properties Reference
9383

9484
.. doxygendefine:: kOfxImageEffectPropMetalRenderSupported
9585

86+
.. doxygendefine:: kOfxImageEffectPropNoSpatialAwareness
87+
9688
.. doxygendefine:: kOfxImageEffectPropOCIOConfig
9789

9890
.. doxygendefine:: kOfxImageEffectPropOCIODisplay

Documentation/sources/conf.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@
1111

1212
import subprocess, os, shutil
1313
project = 'OpenFX'
14-
copyright = '2024, Contributors to the OpenFX Project'
14+
copyright = '''2025, OpenFX a Series of LF Projects, LLC.
15+
For web site terms of use, trademark policy and other project policies please see https://lfprojects.org/'''
1516
author = 'Contributors to the OpenFX Project'
16-
release = '1.4'
17+
release = '1.5'
1718

1819
read_the_docs_build = os.environ.get('READTHEDOCS', None) == 'True'
1920
# -- General configuration ---------------------------------------------------

include/DocSrc/footer.html

Lines changed: 0 additions & 13 deletions
This file was deleted.

include/DocSrc/ofx_footer.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<!-- HTML footer for doxygen 1.8.6-->
2+
<!-- NOTE: this is not used in OpenFX. Final docs are generated via sphinx. -->
23
<!-- start footer part -->
34
<!--BEGIN GENERATE_TREEVIEW-->
45
<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->

include/DocSrc/ofx_header.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<!-- HTML header for doxygen 1.8.6-->
2+
<!-- NOTE: this is not used in OpenFX. Final docs are generated via sphinx. -->
23
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
34
<html xmlns="http://www.w3.org/1999/xhtml">
45
<head>

include/ofx.doxy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ DOXYFILE_ENCODING = UTF-8
3232
# title of most generated pages and in a few other places.
3333
# The default value is: My Project.
3434

35-
PROJECT_NAME = "OFX"
35+
PROJECT_NAME = "OpenFX"
3636

3737
# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
3838
# could be handy for archiving the generated documentation or if some version
3939
# control system is used.
4040

41-
PROJECT_NUMBER = "1.4+"
41+
PROJECT_NUMBER = "1.5+"
4242

4343
# Using the PROJECT_BRIEF tag one can provide an optional one line description
4444
# for a project that appears at the top of each page and should give viewer a

0 commit comments

Comments
 (0)