Skip to content

Commit a39266d

Browse files
mergify[bot]mergify[bot]
authored
Merge pull request #10507 from haskell/print-current-project
Print out which project file we're using by default (fix #8519)
2 parents 890a763 + a6082fc commit a39266d

File tree

182 files changed

+799
-9
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

182 files changed

+799
-9
lines changed

‎cabal-install/src/Distribution/Client/ProjectPlanning.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -399,8 +399,8 @@ rebuildProjectConfig
399399

400400
sequence_
401401
[ do
402-
info verbosity . render . vcat $
403-
text "this build was affected by the following (project) config files:"
402+
notice verbosity . render . vcat $
403+
text "Configuration is affected by the following files:"
404404
: [text "-" <+> docProjectConfigPath path]
405405
| Explicit path <- Set.toList $ projectConfigProvenance projectConfig
406406
]

‎cabal-testsuite/PackageTests/Backpack/Includes2/cabal-external-target.out

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# cabal v2-build
2+
Configuration is affected by the following files:
3+
- cabal.external.project
24
Resolving dependencies...
35
Build profile: -w ghc-<GHCVER> -O1
46
In order, the following will be built:

‎cabal-testsuite/PackageTests/Backpack/Includes2/cabal-external.out

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# cabal v2-build
2+
Configuration is affected by the following files:
3+
- cabal.external.project
24
Resolving dependencies...
35
Build profile: -w ghc-<GHCVER> -O1
46
In order, the following will be built:

‎cabal-testsuite/PackageTests/Backpack/Includes2/cabal-internal-target.out

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# cabal v2-build
2+
Configuration is affected by the following files:
3+
- cabal.internal.project
24
Resolving dependencies...
35
Build profile: -w ghc-<GHCVER> -O1
46
In order, the following will be built:

‎cabal-testsuite/PackageTests/Backpack/Includes2/cabal-internal.out

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# cabal v2-build
2+
Configuration is affected by the following files:
3+
- cabal.internal.project
24
Resolving dependencies...
35
Build profile: -w ghc-<GHCVER> -O1
46
In order, the following will be built:

‎cabal-testsuite/PackageTests/Backpack/Includes2/cov.out

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# cabal test
2+
Configuration is affected by the following files:
3+
- cabal.project
24
Resolving dependencies...
35
Build profile: -w ghc-<GHCVER> -O1
46
In order, the following will be built:

‎cabal-testsuite/PackageTests/Backpack/Includes3/cabal-external.out

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# cabal v2-build
2+
Configuration is affected by the following files:
3+
- cabal.external.project
24
Resolving dependencies...
35
Build profile: -w ghc-<GHCVER> -O1
46
In order, the following will be built:

‎cabal-testsuite/PackageTests/Backpack/Includes3/cabal-internal.out

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# cabal v2-build
2+
Configuration is affected by the following files:
3+
- cabal.internal.project
24
Resolving dependencies...
35
Build profile: -w ghc-<GHCVER> -O1
46
In order, the following will be built:
@@ -18,8 +20,7 @@ Configuring library 'indef' instantiated with
1820
Data.Map = containers-<VERSION>:Data.Map
1921
for I-0.1.0.0...
2022
Preprocessing library 'indef' for I-0.1.0.0...
21-
Building library 'indef' instantiated with
22-
Data.Map = containers-<VERSION>:Data.Map
23+
Building library 'indef' instantiated with Data.Map = containers-<VERSION>:Data.Map
2324
for I-0.1.0.0...
2425
Configuring executable 'exe' for I-0.1.0.0...
2526
Preprocessing executable 'exe' for I-0.1.0.0...

‎cabal-testsuite/PackageTests/Backpack/Includes3/cabal-repo.out

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# cabal v2-update
2+
Configuration is affected by the following files:
3+
- cabal.repo.project
24
Downloading the latest package list from test-local-repo
35
# cabal v2-build
6+
Configuration is affected by the following files:
7+
- cabal.repo.project
48
Resolving dependencies...
59
Build profile: -w ghc-<GHCVER> -O1
610
In order, the following will be built:

‎cabal-testsuite/PackageTests/Backpack/Reexport2/cabal.out

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# cabal v2-build
2+
Configuration is affected by the following files:
3+
- cabal.project
24
Resolving dependencies...
35
Error:
46
Problem with module re-exports:

‎cabal-testsuite/PackageTests/Backpack/T6385/cabal.out

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# cabal v2-update
22
Downloading the latest package list from test-local-repo
33
# cabal v2-build
4+
Configuration is affected by the following files:
5+
- cabal.project
46
Resolving dependencies...
57
Build profile: -w ghc-<GHCVER> -O1
68
In order, the following will be built:

‎cabal-testsuite/PackageTests/Backpack/bkpcabal01/cabal.out

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# cabal v2-build
2+
Configuration is affected by the following files:
3+
- cabal.project
24
Resolving dependencies...
35
Build profile: -w ghc-<GHCVER> -O1
46
In order, the following will be built:

‎cabal-testsuite/PackageTests/BuildAutogenPackageGuard/cabal.out

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# cabal v2-build
2+
Configuration is affected by the following files:
3+
- cabal.project
24
Resolving dependencies...
35
Build profile: -w ghc-<GHCVER> -O1
46
In order, the following will be built:

‎cabal-testsuite/PackageTests/BuildDeps/DepCycle/cabal.out

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# cabal v2-build
2+
Configuration is affected by the following files:
3+
- cabal.project
24
Resolving dependencies...
35
Error:
46
Dependency cycle between the following components:

‎cabal-testsuite/PackageTests/BuildDeps/InternalLibrary1/cabal.out

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# cabal v2-build
2+
Configuration is affected by the following files:
3+
- cabal.project
24
Resolving dependencies...
35
Build profile: -w ghc-<GHCVER> -O1
46
In order, the following will be built:

‎cabal-testsuite/PackageTests/BuildTargets/UseLocalPackage/use-local-version-of-package.out

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# cabal v2-update
22
Downloading the latest package list from test-local-repo
33
# cabal v2-build
4+
Configuration is affected by the following files:
5+
- cabal.project
46
Resolving dependencies...
57
Build profile: -w ghc-<GHCVER> -O1
68
In order, the following will be built:
@@ -11,6 +13,8 @@ Building executable 'my-exe' for pkg-1.0...
1113
# pkg my-exe
1214
local pkg-1.0
1315
# cabal v2-build
16+
Configuration is affected by the following files:
17+
- cabal.project
1418
Resolving dependencies...
1519
Error: [Cabal-7107]
1620
Could not resolve dependencies:

‎cabal-testsuite/PackageTests/BuildTargets/UseLocalPackageForSetup/use-local-package-as-setup-dep.out

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# cabal v2-update
22
Downloading the latest package list from test-local-repo
33
# cabal v2-build
4+
Configuration is affected by the following files:
5+
- cabal.project
46
Resolving dependencies...
57
Error: [Cabal-7107]
68
Could not resolve dependencies:

‎cabal-testsuite/PackageTests/BuildToolDepends/setup.out

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# cabal v2-build
2+
Configuration is affected by the following files:
3+
- cabal.project
24
Resolving dependencies...
35
Build profile: -w ghc-<GHCVER> -O1
46
In order, the following will be built:

‎cabal-testsuite/PackageTests/BuildTools/External/cabal.out

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# cabal v2-build
2+
Configuration is affected by the following files:
3+
- cabal.project
24
Resolving dependencies...
35
Build profile: -w ghc-<GHCVER> -O1
46
In order, the following will be built:

‎cabal-testsuite/PackageTests/BuildTools/Internal/cabal.out

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# cabal v2-build
2+
Configuration is affected by the following files:
3+
- cabal.project
24
Resolving dependencies...
35
Build profile: -w ghc-<GHCVER> -O1
46
In order, the following will be built:

‎cabal-testsuite/PackageTests/CmmSources/cabal.out

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# cabal v2-run
2+
Configuration is affected by the following files:
3+
- cabal.project
24
Resolving dependencies...
35
Build profile: -w ghc-<GHCVER> -O1
46
In order, the following will be built:

‎cabal-testsuite/PackageTests/CmmSourcesDyn/cabal.out

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# cabal v2-run
2+
Configuration is affected by the following files:
3+
- cabal.project
24
Resolving dependencies...
35
Build profile: -w ghc-<GHCVER> -O1
46
In order, the following will be built:

‎cabal-testsuite/PackageTests/CmmSourcesExe/cabal.out

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# cabal v2-run
2+
Configuration is affected by the following files:
3+
- cabal.project
24
Resolving dependencies...
35
Build profile: -w ghc-<GHCVER> -O1
46
In order, the following will be built:

‎cabal-testsuite/PackageTests/ConditionalAndImport/cabal.out

Lines changed: 153 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
# cabal v2-update
22
Downloading the latest package list from test-local-repo
33
# cabal v2-run
4+
Configuration is affected by the following files:
5+
- cabal.project
6+
Configuration is affected by the following files:
7+
- extra.project
8+
imported by: cabal.project
49
Resolving dependencies...
510
Build profile: -w ghc-<GHCVER> -O1
611
In order, the following will be built:
@@ -62,6 +67,15 @@ cyclical import of cyclical-2-out-out-self-b.config;
6267
imported by: cyclical-2-out-out-self.project
6368
# checking that cyclical check doesn't false-positive on same file names in different folders; hoping within a folder and then into a subfolder
6469
# cabal v2-build
70+
Configuration is affected by the following files:
71+
- noncyclical-same-filename-a.config
72+
imported by: noncyclical-same-filename-a.project
73+
Configuration is affected by the following files:
74+
- noncyclical-same-filename-a.project
75+
Configuration is affected by the following files:
76+
- same-filename/noncyclical-same-filename-a.config
77+
imported by: noncyclical-same-filename-a.config
78+
imported by: noncyclical-same-filename-a.project
6579
Resolving dependencies...
6680
Build profile: -w ghc-<GHCVER> -O1
6781
In order, the following will be built:
@@ -71,6 +85,15 @@ Preprocessing library for my-0.1...
7185
Building library for my-0.1...
7286
# checking that cyclical check doesn't false-positive on same file names in different folders; hoping into a subfolder and then back out again
7387
# cabal v2-build
88+
Configuration is affected by the following files:
89+
- noncyclical-same-filename-b.config
90+
imported by: same-filename/noncyclical-same-filename-b.config
91+
imported by: noncyclical-same-filename-b.project
92+
Configuration is affected by the following files:
93+
- noncyclical-same-filename-b.project
94+
Configuration is affected by the following files:
95+
- same-filename/noncyclical-same-filename-b.config
96+
imported by: noncyclical-same-filename-b.project
7497
Up to date
7598
# checking that cyclical check catches a same file name that imports itself
7699
# cabal v2-build
@@ -101,9 +124,139 @@ cyclical import of cyclical-same-filename-out-out-back.config;
101124
imported by: cyclical-same-filename-out-out-back.project
102125
# checking that imports work skipping into a subfolder and then back out again and again
103126
# cabal v2-build
127+
Configuration is affected by the following files:
128+
- hops-0.project
129+
Configuration is affected by the following files:
130+
- hops-2.config
131+
imported by: hops/hops-1.config
132+
imported by: hops-0.project
133+
Configuration is affected by the following files:
134+
- hops-4.config
135+
imported by: hops/hops-3.config
136+
imported by: hops-2.config
137+
imported by: hops/hops-1.config
138+
imported by: hops-0.project
139+
Configuration is affected by the following files:
140+
- hops-6.config
141+
imported by: hops/hops-5.config
142+
imported by: hops-4.config
143+
imported by: hops/hops-3.config
144+
imported by: hops-2.config
145+
imported by: hops/hops-1.config
146+
imported by: hops-0.project
147+
Configuration is affected by the following files:
148+
- hops-8.config
149+
imported by: hops/hops-7.config
150+
imported by: hops-6.config
151+
imported by: hops/hops-5.config
152+
imported by: hops-4.config
153+
imported by: hops/hops-3.config
154+
imported by: hops-2.config
155+
imported by: hops/hops-1.config
156+
imported by: hops-0.project
157+
Configuration is affected by the following files:
158+
- hops/hops-1.config
159+
imported by: hops-0.project
160+
Configuration is affected by the following files:
161+
- hops/hops-3.config
162+
imported by: hops-2.config
163+
imported by: hops/hops-1.config
164+
imported by: hops-0.project
165+
Configuration is affected by the following files:
166+
- hops/hops-5.config
167+
imported by: hops-4.config
168+
imported by: hops/hops-3.config
169+
imported by: hops-2.config
170+
imported by: hops/hops-1.config
171+
imported by: hops-0.project
172+
Configuration is affected by the following files:
173+
- hops/hops-7.config
174+
imported by: hops-6.config
175+
imported by: hops/hops-5.config
176+
imported by: hops-4.config
177+
imported by: hops/hops-3.config
178+
imported by: hops-2.config
179+
imported by: hops/hops-1.config
180+
imported by: hops-0.project
181+
Configuration is affected by the following files:
182+
- hops/hops-9.config
183+
imported by: hops-8.config
184+
imported by: hops/hops-7.config
185+
imported by: hops-6.config
186+
imported by: hops/hops-5.config
187+
imported by: hops-4.config
188+
imported by: hops/hops-3.config
189+
imported by: hops-2.config
190+
imported by: hops/hops-1.config
191+
imported by: hops-0.project
104192
Up to date
105193
# checking conflicting constraints skipping into a subfolder and then back out again and again
106194
# cabal v2-build
195+
Configuration is affected by the following files:
196+
- oops-0.project
197+
Configuration is affected by the following files:
198+
- oops-2.config
199+
imported by: oops/oops-1.config
200+
imported by: oops-0.project
201+
Configuration is affected by the following files:
202+
- oops-4.config
203+
imported by: oops/oops-3.config
204+
imported by: oops-2.config
205+
imported by: oops/oops-1.config
206+
imported by: oops-0.project
207+
Configuration is affected by the following files:
208+
- oops-6.config
209+
imported by: oops/oops-5.config
210+
imported by: oops-4.config
211+
imported by: oops/oops-3.config
212+
imported by: oops-2.config
213+
imported by: oops/oops-1.config
214+
imported by: oops-0.project
215+
Configuration is affected by the following files:
216+
- oops-8.config
217+
imported by: oops/oops-7.config
218+
imported by: oops-6.config
219+
imported by: oops/oops-5.config
220+
imported by: oops-4.config
221+
imported by: oops/oops-3.config
222+
imported by: oops-2.config
223+
imported by: oops/oops-1.config
224+
imported by: oops-0.project
225+
Configuration is affected by the following files:
226+
- oops/oops-1.config
227+
imported by: oops-0.project
228+
Configuration is affected by the following files:
229+
- oops/oops-3.config
230+
imported by: oops-2.config
231+
imported by: oops/oops-1.config
232+
imported by: oops-0.project
233+
Configuration is affected by the following files:
234+
- oops/oops-5.config
235+
imported by: oops-4.config
236+
imported by: oops/oops-3.config
237+
imported by: oops-2.config
238+
imported by: oops/oops-1.config
239+
imported by: oops-0.project
240+
Configuration is affected by the following files:
241+
- oops/oops-7.config
242+
imported by: oops-6.config
243+
imported by: oops/oops-5.config
244+
imported by: oops-4.config
245+
imported by: oops/oops-3.config
246+
imported by: oops-2.config
247+
imported by: oops/oops-1.config
248+
imported by: oops-0.project
249+
Configuration is affected by the following files:
250+
- oops/oops-9.config
251+
imported by: oops-8.config
252+
imported by: oops/oops-7.config
253+
imported by: oops-6.config
254+
imported by: oops/oops-5.config
255+
imported by: oops-4.config
256+
imported by: oops/oops-3.config
257+
imported by: oops-2.config
258+
imported by: oops/oops-1.config
259+
imported by: oops-0.project
107260
Resolving dependencies...
108261
Error: [Cabal-7107]
109262
Could not resolve dependencies:

‎cabal-testsuite/PackageTests/ConditionalAndImport/cabal.test.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ main = cabalTest . withRepo "repo" . recordMode RecordMarked $ do
111111
-- +-- hops/hops-9.config (no further imports so not cyclical)
112112
log "checking that imports work skipping into a subfolder and then back out again and again"
113113
hopping <- cabal' "v2-build" [ "--project-file=hops-0.project" ]
114-
assertOutputContains "this build was affected by the following (project) config files:" hopping
114+
assertOutputContains "Configuration is affected by the following files" hopping
115115
assertOutputContains "- hops-0.project" hopping
116116

117117
assertOutputContains

‎cabal-testsuite/PackageTests/ConfigFile/T8487/cabal.out

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# cabal build
2+
Configuration is affected by the following files:
3+
- cabal.project
24
Resolving dependencies...
35
Build profile: -w ghc-<GHCVER> -O2
46
In order, the following will be built:

0 commit comments

Comments
 (0)