Skip to content

Conversation

@hattne
Copy link
Collaborator

@hattne hattne commented Jul 5, 2025

Builds and passes all tests with Fortran (gfortran), Java (native Oracle Java installation, 24.0.1), and Python. Note that cmd.exe has issues with UNC paths, which has implications for Ninja. Furthermore, if the source directory is kept under WSL, there are additional considerations.

@hattne hattne marked this pull request as ready for review July 7, 2025 01:41
hattne added 10 commits July 15, 2025 19:42
…cbf_stx.h from cbf.stx.y

Heed the warning emitted by recent Bison (the api.pure option was
probably introduced in 2.3b from 2008-05-27) and name the previously
anonymous union typedef:ed to YYSTYPE in cbf_lex.h.  The YYSTYPE typedef
is retained in order to preserve the API, even though it may cause
problems for downstream projects that also rely on Bison.  Multiple
targets in a rule appears to be a GNU make extension, but its use was
already implied in Makefile.  Do not include any generated files from
the public headers.
Appears to have been manually added to the Bison-generated output.
Avoids false positive introduced in 79913a7.
Checked-in pycbf.py and pycbf_wrap.c were generated with SWIG 3.0.10 and
interfere with the tests if run from the source directory; _pycbf.pyd is
a 32-bit Windows binary.  Fix Makefile to regenerate the SWIG interface
files from current doc/CBFlib.html (checked-in CBFlib.txt is from 0.9.5,
revised 22 February 2015; regenerating it requires e.g. links) and
rebuild the Python module when necessary.
Remove unused LaTeX output; out-of-sync pycbf.toc may interfere with
LaTeX.  Escape underscores in text mode and do not use minipage for long
listings.  A container must have LaTeX (texlive-latex-recommended in
Ubuntu) in order to build pycbf.pdf.
Explicitly open() text files in UTF-8 from Python; fix Fortran source
generation for consistency.  Passes 157 out of 192 (82%) CTest tests.
Both the compiled and the Python component (e.g. _pycbf.pyd and
pycbf.py, respectively) of the module used to be in
${CMAKE_BINARY_DIR}/pycbf.  Adjust PYTHONPATH for tests accordingly.
Tweak PATH to find CBFlib on Windows, do not explicitely load dependent
libraries from Java.  Collect test program definitions with their
respective modules and cowardly refuse to build modules unless shared
libraries are enabled.
@yayahjb yayahjb self-assigned this Sep 4, 2025
Copy link
Collaborator

@yayahjb yayahjb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reasonable changes

@yayahjb yayahjb merged commit e8f6c62 into dials:main Sep 4, 2025
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants