Make Cabal-2.2 behave like Cabal-2.0 related to #5055 #5076
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@23Skidoo ready for the review. This is quick'n'dirty backport of Cabal-2.0 functionality. |
phadej
changed the title
This is not a proper fix, but we are more conservative than is strictly required. I.e. each "branch" must have `type`. Also as `type` is set, then `main-is` (or module) have to be specified, because of `validate*` functions. The `onAllBranches` is wrong. But we can fix (i.e. relax) it for Cabal-2.4 /Note:/ regressions/issue-5055.format: it's broken as there isn't `main-is` `os(windows) conditional branch in the formatted output.
23Skidoo
approved these changes
Jan 31, 2018
| build-depends: | ||
| base >=4.8 && <5 | ||
|
|
||
| if os(windows) |
There was a problem hiding this comment.
... as this is "bug-compatible" behaviour, with cabal-install-2.0. cabal-2.0 formats the input as
name: issue
version: 5055
cabal-version: >=2.0
build-type: Simple
license: BSD3
synopsis: no type in all branches
description:
no type in all branches.
category: Test
executable flag-test-exe
main-is: FirstMain.hs
test-suite flag-cabal-test
type: exitcode-stdio-1.0
main-is: SecondMain.hs
build-depends:
base >=4.8 && <5
default-language: Haskell2010
There is no conditional section at all
| @@ -306,6 +307,16 @@ goSections specVer = traverse_ process | |||
| commonStanzas <- use stateCommonStanzas | |||
| name' <- parseUnqualComponentName pos args | |||
| flib <- lift $ parseCondTree' (foreignLibFieldGrammar name') commonStanzas fields | |||
|
|
|||
| let hasType ts = foreignLibType ts /= foreignLibType mempty | |||
There was a problem hiding this comment.
foreignLibType mempty
Can we write mempty :: ForeignLibType or ForeignLibTypeUnknown instead? Likewise for test suites and benchmarks.
There was a problem hiding this comment.
I'd like to refactor that soon after the branch is cut...
| -- Branches | ||
| ------------------------------------------------------------------------------- | ||
|
|
||
| -- Check that a property holds on all branches of a condition tree |
There was a problem hiding this comment.
Might be worth mentioning that this function is copy-pasted from D.PD.Parse.
|
Merged, thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Please include the following checklist in your PR:
[ci skip]is used to avoid triggering the build bots.Please also shortly describe how you tested your change. Bonus points for added tests!