Skip to content

configure.php: prepare PhD auxiliary-file generation for move to php/phd - #318

Merged
alfsb merged 1 commit into
php:masterfrom
lacatoire:drop-phd-generation
Aug 3, 2026
Merged

configure.php: prepare PhD auxiliary-file generation for move to php/phd#318
alfsb merged 1 commit into
php:masterfrom
lacatoire:drop-phd-generation

Conversation

@lacatoire

@lacatoire lacatoire commented Jul 8, 2026

Copy link
Copy Markdown
Member

Prepares moving PhD auxiliary-file generation (version.xml, sources.xml, fileModHistory.php) out to php/phd, without removing anything yet so this can land independently.

  • Add phd_conf_json(), which serializes the build state into doc-base/temp/phd-conf.json as a hand-off consumed by php/phd.
  • Fix the --history-file option, which set SOURCES_FILE instead of HISTORY_FILE.
  • Keep the existing phd_acronym()/php_history()/phd_sources()/phd_version() functions for now; their removal (and the matching .gitignore cleanup) depends on Add genphdfiles.php: generate PhD auxiliary files from doc-base phd#261.

Supersedes the previous full-removal approach on this branch.

@alfsb

alfsb commented Jul 8, 2026

Copy link
Copy Markdown
Member

Wow! That is exactly what I was thinking of. Paint me very impressed.

The moved files are mentioned in .gitignore, so they can also be removed here. My long term plan is to shrink this file to only temp/.

@alfsb

alfsb commented Jul 8, 2026

Copy link
Copy Markdown
Member

I think the doc-base side is ok. You can merge here at your earliest convenience, and yet, let this open a few days, for comments and/or reviews. I will do a heads up no Discord, to be sure.

@alfsb alfsb mentioned this pull request Jul 8, 2026
47 tasks
@alfsb

alfsb commented Jul 10, 2026

Copy link
Copy Markdown
Member

If the PhD side goes without indications of reviews or merging, then I will change this side, keep the hand-off file and PhD functions and merge in one week's time. These are some performance and doc-ext changes that are easier to do without worrying of git conflicts risk.

@alfsb

alfsb commented Jul 25, 2026

Copy link
Copy Markdown
Member

As PhD side shows no sign of being merged, I tried to checkout, rebase and push directly into this PR, but failed. @lacatoire , please consider rebasing and hard reseting this into master HEAD, and then applying the changes of https://github.com/alfsb/doc-base/tree/pr318.

The generation of version.xml, sources.xml and fileModHistory.php is
is to be removed (phd_acronym, php_history, phd_sources, phd_version)
and delegated in php/phd via a doc-base/temp/phd-conf.json handoff.

Also fixes the --history-file option, which set SOURCES_FILE instead of
HISTORY_FILE.
@lacatoire
lacatoire force-pushed the drop-phd-generation branch from 6976b36 to 49ed1d6 Compare August 3, 2026 07:12
@lacatoire lacatoire changed the title Move PhD auxiliary-file generation out to php/phd configure.php: prepare PhD auxiliary-file generation for move to php/phd Aug 3, 2026
@alfsb
alfsb merged commit e2f719c into php:master Aug 3, 2026
12 checks passed
@alfsb

alfsb commented Aug 3, 2026

Copy link
Copy Markdown
Member

Thanks for the update. Merged it as is, so as to avoid more conflicts in future, and to allow the PhD side to be developed independently.

@lacatoire
lacatoire deleted the drop-phd-generation branch August 3, 2026 14:59
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