Duncan Coutts authored 9 years ago and Mikhail Glushenkov committed 9 years ago

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.

(cherry picked from commit e36c0e7e)

Duncan Coutts authored 9 years ago and Mikhail Glushenkov committed 9 years ago

We want to reuse the FlagAssignment printer/parser for the config files.

(cherry picked from commit d0fb249e)

Duncan Coutts authored 9 years ago and Mikhail Glushenkov committed 9 years ago

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.

(cherry picked from commit 4365bcb1)

Duncan Coutts authored 9 years ago and Mikhail Glushenkov committed 9 years ago

Getters and setters really need to match up.

Detected by parse/print round trip QC tests.

(cherry picked from commit a82af445)

Duncan Coutts authored 9 years ago and Mikhail Glushenkov committed 9 years ago

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.

(cherry picked from commit 324b3240)

Duncan Coutts authored 9 years ago and Mikhail Glushenkov committed 9 years ago

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).

(cherry picked from commit 7907a55c)

Duncan Coutts authored 9 years ago and Mikhail Glushenkov committed 9 years ago

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.

(cherry picked from commit 2f743b6d)

Duncan Coutts authored 9 years ago and Mikhail Glushenkov committed 9 years ago

withRepoContext keeps its current type (using GlobalFlags). Added
withRepoContext' that takes all the args seprately. Better name
suggestions welcome.

(cherry picked from commit 7b280cdd)

Fixes #3229.
(cherry picked from commit 7ab167b8)

Fix ConfigStateFileErrorMessages

The error messages associated with ConfigStateFileError have been
reformatted and reworded for clarity.

Fixes #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.

Exporting the default rendering style allows us to consistently format
text without needing to write a Text instance.

Fixes #3214.

update -prof Check message

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.

Introduce UnresolvedSourcePackage alias

The alias is a shorthand for 'SourcePackage UnresolvedPkgLoc' which is
used all over the place.

Change Cabal's GHC support window to GHC 6.12 or later

Parameterize SourcePackage and ConfiguredPackage on package location

(Try to) add GHC 8.0.1 to the test-matrix

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.

This is a step towards breaking the dependency from the modular
solver on cabal-install.

Make the solver aware of pkg-config constraints

When solving, we now discard plans that would involve packages with a
pkgconfig-depends constraint which is not satisfiable with the current
set of installed packages (as listed by pkg-config --list-all).

This fixes https://github.com/haskell/cabal/issues/3016.

It is possible (in principle, although it should be basically impossible
in practice) that "pkg-config --modversion pkg1 pkg2... pkgN" fails to
execute for various reasons, in particular because N is too large, so
the command line becomes too long for the operating system limits.

If this happens, revert to the previous behavior of accepting any
install plan, regardless of any pkgconfig-depends constraints.

Refactor 'Explore.backjumpInfo' after code review

Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>

[ci skip]

Merge branch 'backjumping-space-leak' of https://github.com/grayjay/cabal into grayjay-backjumping-space-leak

Fix space leaks in dependency solver logging.