Skip to content

Remove config files generation from Makefiles #234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Apr 23, 2025

Conversation

Julow
Copy link
Contributor

@Julow Julow commented Apr 26, 2024

This generates the config files and ocsigen_config_static.ml using an OCaml script called from Dune rules. This allows to remove several Makefiles and allows building more of the project using Dune.

src/files/ocsigenserver.conf/options.ml is generated from the configure script but is also included in the source tree with default values that allow to build a bigger part of the project without running the configure script.

Julow added 3 commits March 25, 2025 15:27
This makes the config files generation compatible with a dune rule.
This will allow to generate this file from a different build system.
ocsigen_config_static.ml is generated from a dune rule and automatically
registered into the library.

ocsigenserver.conf.sample and local/etc/ocsigenserver.conf are generated
and promoted into the worktree with dune rules.

Dependencies are computed from Dune. For example, changing the generator
script or changing options.ml with ./configure will trigger a rebuild.
@Julow Julow force-pushed the makefile-remve-config-gen branch from df5642c to 562b8a3 Compare March 25, 2025 14:32
@Julow
Copy link
Contributor Author

Julow commented Mar 25, 2025

I rebased this PR, which is ready for review.

I needed this work to be able to run dune build @ocaml-index, which is a prerequisite to doing the direct-style code transformation.

Only src/server/Makefile remains.
@Julow Julow force-pushed the makefile-remve-config-gen branch from 562b8a3 to c6c3dcf Compare March 25, 2025 15:14
@Julow Julow force-pushed the makefile-remve-config-gen branch from c6c3dcf to 55ffc15 Compare March 25, 2025 16:02
@Julow Julow force-pushed the makefile-remve-config-gen branch from c0f87c1 to b4dece9 Compare April 7, 2025 13:46
@smorimoto smorimoto merged commit da9ee6e into ocsigen:master Apr 23, 2025
10 checks passed
@Julow
Copy link
Contributor Author

Julow commented Apr 23, 2025

Thanks!

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