Project config #3156
Project config #3156
Conversation
|
Travis failure is due to |
| DistDirLayout {..} | ||
| where | ||
| distDirectory = projectRootDirectory </> "dist-newstyle" | ||
| --TODO: switch to just dist at some point, or some other new name |
There was a problem hiding this comment.
Might be worth it to change from dist to dist/$arch-$os-$compiler while we're at it for better isolation of build artifacts (see also #2790).
There was a problem hiding this comment.
Hmm, so that's about fully parallel builds of different profiles. In a sense that's a difference of conception for projects vs sandboxes. At least at the moment a project has one configuration, with a single arch and compiler. An obvious future direction is to allow multiple profiles, but those ought to allow arbitrary differences, not just arch,os,compiler, but differences of flags or different instances of the same compiler version or whatever. This would not be too much work to implement provided we only allow one profile to be active at once. Having multiple active at once requires running the solver multiple times and combining the result into a big install plan.
Having a dist that automatically includes certain variables is a quite different approach. I'll have to think about it.
|
Yep, will fix that warning and see if there's any other travis failures. |
|
@23Skidoo so my inclination is to defer a decision about how we manage multiple ways of doing the same build and not overwriting build artefacts, as I think it's a more general question than simply compiler versions (e.g. I want to do Let me know if you're still looking at this PR or if you think its ok to merge (with squashed fixups). |
Fine with me.
Yes, I am, sorry for the delay. |
|
Looks good in general, though there seems to be a lot of duplication with the existing code in the main config module, but I guess there is no way around that at the moment. Having a round trip test would be nice. |
|
Also we should convert the boilerplate instances here and elsewhere to generics once 1.24 is out. |
...is there already an issue to track this task? |
|
May be also worth splitting some parts of |
|
So we could have, for example, |
(cherry picked from commit 7875b10)
(cherry picked from commit 970f5b2)
This reverts commit 727f447. This comment is unnecessary after haskell#3180. [ci skip] (cherry picked from commit 89c24c9)
Fixes haskell#3191. (cherry picked from commit d46e71d)
(cherry picked from commit 61047bd)
Since Cabal makes use of Maps and Sets we need them in place in our Semigroups compat-layer. (cherry picked from commit a03031e)
Ok, that would shorten things a bit and separate some of the repetitive code from the more interesting code. I'm working on further config stuff, so I'll roll this all together. |
Actually it is imported by the |
Ah, that's why |
This implements the suggestions mentioned at haskell#3169 (comment) The main benefit of this change is turning 'ConfigFlags' into a uniform product-type suitable for generic derivation of pointwise `Semigroup`/`Monoid` instances. NB: This changes the `Binary` serialisation of `ConfigFlags` since there's now an additional `Maybe` inserted in `configPrograms`'s type (cherry picked from commit 62c3aa6)
This implements the suggestion from haskell#3196 (comment) (cherry picked from commit 0077e2c)
(cherry picked from commit 3113eb8)
This is preparatory work for implementing haskell#3169 it's kept in a different commit in order to facilitate comparing code-generation. (cherry picked from commit dd5fe69)
This is preparatory work for implementing haskell#3169 it's kept in a different commit in order to facilitate comparing code-generation. (cherry picked from commit 9b38b38)
(cherry picked from commit d137c93)
This commit removes references to the solver log that prevented it from being garbage collected. It also forces evaluation of the current level and variable stack in 'Message.showMessages'. (cherry picked from commit 37f28f2)
(cherry picked from commit 2854bcb)
[ci skip] (cherry picked from commit 4018b83)
(cherry picked from commit e0cd302)
(cherry picked from commit fc00e33)
(cherry picked from commit b345676)
Currently GHC 8.0 has a slightly different error message if it can't find a `.hi` file. It's not clear yet if and how we're going to change the message before GHC 8.0 final. (cherry picked from commit 9c7131a)
(cherry picked from commit b45ecc8)
The flag enable-executable-profiling warns to change it to just enable-profiling. So we'll fix that here too so we don't send people down an old path. (cherry picked from commit c69dfb8)
Fixes haskell#3214. (cherry picked from commit 9accafe)
Don't use './Setup' for building 'cabal-install'.
Exporting the default rendering style allows us to consistently format text without needing to write a Text instance.
Fixes haskell#3157. The wrapText helper is used to format all error messages. Previously, it was only used to format IOException errors; other exceptions would be formatted incorrectly.
The error messages associated with ConfigStateFileError have been reformatted and reworded for clarity.
Fix ConfigStateFileError messages
Getters and setters really need to match up. Detected by parse/print round trip QC tests.
withRepoContext keeps its current type (using GlobalFlags). Added withRepoContext' that takes all the args seprately. Better name suggestions welcome.
The existing approach has been to parse top level fields and then separately parse each top level section, and similarly for pretty printing. A better approach is to follow the pattern for fields and have a section description. Then we just parse or print fields+sections in one call. And as a bonus, secitons can have subsections (and could even do so recursively). This patch just adds the new functionality. No existing config parsing is switched over.
This describes in one place the layout of the new dist dir, as used by the nix-local-build branch. Also a similar approach to describing the layout of the user-wide cabal directory. The idea is that this centralises the description and makes it easier to change and handle systematically (e.g. we have problems currently with some user-wide files not being reolocatable).
One for testing if globs are trivial, as in they're constant strings without the possibility of matching more than one thing. This can help with making better error messages. Another util for matching file globs in the rebuild monad, and automatically monitoring the glob.
We want to reuse the FlagAssignment printer/parser for the config files.
This defines the new cabal.project files and introduces the notion of a project root (and the logic for finding it). Also has support for implicit projects when no cabal.project file is defined. Supports both reading and writing project files or fragments. The printing & parsing round trips correctly. QC tests to follow. This is a key part of the new nix-local-build branch approach, based around projects with clear configuration state held in a project file (or extra files). This has support for file and dirs as packages within a project, including by glob. It supports both globs that much match a target, and optional globs that are allowed to match nothing. It has partial support for local tarball, remote http tarball and remote source repo packages.
Two kinds of round-trip test: * type conversion ProjectConfig -> LegcyProjectConfig and back * ProjectConfig -> print -> parse The latter goes out to the config file format and back. These tests uncovered a number of issues in our general config code.
|
Closing in favour of the new PR #3226. |
New code for review to implement the new project file system for the new nix-style approach.
Sorry, the main config module is quite long so you have to click through in the git web UI.
Fear not, #3129 is not forgotten. I'll do the review comments for those while people are looking at this stuff, they're independent so we can do them concurrently.