Merge build systems in subdirectories of otherlibs.#788
Merge build systems in subdirectories of otherlibs.#788damiendoligez merged 6 commits intoocaml:trunkfrom
Conversation
|
(For the reader: this is mostly about moving code around to ensure that everything is in Makefile and that Makefile.nt is always trivial; most of the sharing was already done before.) Would it be possible to further factorize the post-processing of .depend (to produce .depend.nt) in the common in otherlibs/Makefile? For the Windows-specific directories, I'd suggest ensuring that calling |
|
A more ambitious approach would be to ensure that the Makefile in otherlibs/unix and otherlibs/graph could be used even under Windows and in that case automatically delegate to otherlibs/win32unix and otherlibs/win32graph to produce the required artifacts. These win32-specific directories could then be moved e.g. to otherlibs/unix/win32 and otherlibs/graph/win32 to make it clear that they are really alternative implementations of the same library. This might allow some more sharing between the build instructions for the Unix and Windows variants. |
635a4be to
b2bf242
Compare
|
Alain Frisch (2016/08/30 15:30 -0700):
Sure. It has been done. The depend target has also been factorized and
Could these be implemented in separate commits? |
|
A |
Yes, of course. |
b2bf242 to
3b2aeec
Compare
|
Alain Frisch (2016/08/31 00:45 -0700):
Ah indeed, sorry. It would actually be possible to make sure .depend is not included when So my suggestion would be to renounce to the factorizatio commit for What do you think? |
|
I don't understand the specific issue with win32graph, but would like to say:
|
Yes, ok. |
3b2aeec to
255c2f3
Compare
|
Alain Frisch (2016/08/31 03:14 -0700):
So this factorization commit is now gone. I added a note in otherlibs/win32unix suming up our discussion but I |
|
Xavier Leroy (2016/08/31 02:07 -0700):
I can take care of that if you like. I'd just need to make sure what it |
Since these directories are built only on Windows, they contained only a Makefile.nt. For each directory, this commit moves the content of its Makefile.nt to Makefile and creates a Makefile.nt that includes the corresponding Makefile.
255c2f3 to
d3eff85
Compare
|
Alain Frisch (2016/08/31 00:48 -0700):
Done in win32unix. I didn't touch win32graph yet, in case it is decided |
Merge build systems in subdirectories of otherlibs.
Fix selectgen `effects_of` for `Cdls_get`
…full screen (ocaml#788) * remove stray w-full on package docs sidebar * adds a background-blurring overlay when the sidebar is open Co-authored-by: Sabine Schmaltz <[email protected]>
Nothing needed to be done in the directories that are built only on Unix.