Skip to content

Commit d8147f6

Browse files
philderbeastphilderbeast
committed
Rename projects to cabal.*.project
- Rename cabal.bootstrap.project - Rename cabal.meta.project - Rename cabal.validate-libonly.project - Rename cabal.validate.project - Rename cabal.release.project
1 parent d428c5f commit d8147f6

16 files changed

+35
-35
lines changed

‎.github/workflows/quick-jobs.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ubuntu-latest
2121
env:
2222
cabal_build: >-
23-
cabal build --builddir=dist-newstyle-meta --project-file=cabal.project.meta
23+
cabal build --builddir=dist-newstyle-meta --project-file=cabal.meta.project
2424
gen-cabal-macros
2525
gen-paths-module
2626
gen-spdx
@@ -137,6 +137,6 @@ jobs:
137137
run: cabal v2-update
138138
- uses: actions/checkout@v4
139139
- name: Check Release with Pinned Hackage
140-
run: cabal build all --dry-run --project-file=cabal.project.release
140+
run: cabal build all --dry-run --project-file=cabal.release.project
141141
- name: Check Release with Latest Hackage
142-
run: cabal build all --dry-run --project-file=cabal.project.release --index-state="hackage.haskell.org HEAD"
142+
run: cabal build all --dry-run --project-file=cabal.release.project --index-state="hackage.haskell.org HEAD"

‎.github/workflows/validate.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ jobs:
9696
- name: Manually supplied constraints/allow-newer
9797
if: github.event_name == 'workflow_dispatch'
9898
run: |
99-
echo "allow-newer: ${ALLOWNEWER}" >> cabal.project.validate
100-
echo "constraints: ${CONSTRAINTS}" >> cabal.project.validate
99+
echo "allow-newer: ${ALLOWNEWER}" >> cabal.validate.project
100+
echo "constraints: ${CONSTRAINTS}" >> cabal.validate.project
101101
102102
- uses: haskell-actions/setup@v2
103103
id: setup-haskell
@@ -156,7 +156,7 @@ jobs:
156156
- name: Tar cabal head executable
157157
if: matrix.ghc == env.GHC_FOR_RELEASE
158158
run: |
159-
CABAL_EXEC=$(cabal list-bin --builddir=dist-newstyle-validate-ghc-${{ matrix.ghc }} --project-file=cabal.project.validate cabal-install:exe:cabal)
159+
CABAL_EXEC=$(cabal list-bin --builddir=dist-newstyle-validate-ghc-${{ matrix.ghc }} --project-file=cabal.validate.project cabal-install:exe:cabal)
160160
# We have to tar the executable to preserve executable permissions
161161
# see https://github.com/actions/upload-artifact/issues/38
162162
if [[ "${{ runner.os }}" == "Windows" ]]; then
@@ -288,8 +288,8 @@ jobs:
288288
- name: Manually supplied constraints/allow-newer
289289
if: github.event_name == 'workflow_dispatch'
290290
run: |
291-
echo "allow-newer: ${ALLOWNEWER}" >> cabal.project.validate
292-
echo "constraints: ${CONSTRAINTS}" >> cabal.project.validate
291+
echo "allow-newer: ${ALLOWNEWER}" >> cabal.validate.project
292+
echo "constraints: ${CONSTRAINTS}" >> cabal.validate.project
293293
294294
- uses: haskell-actions/setup@v2
295295
id: setup-haskell
@@ -310,14 +310,14 @@ jobs:
310310

311311
- name: Enable statically linked executables
312312
run: |
313-
echo 'executable-static: true' >> cabal.project.validate
313+
echo 'executable-static: true' >> cabal.validate.project
314314
315315
- name: Build
316316
run: sh validate.sh $FLAGS -s build
317317

318318
- name: Tar cabal head executable
319319
run: |
320-
CABAL_EXEC=$(cabal list-bin --builddir=dist-newstyle-validate-ghc-${{ env.GHC_FOR_RELEASE }} --project-file=cabal.project.validate cabal-install:exe:cabal)
320+
CABAL_EXEC=$(cabal list-bin --builddir=dist-newstyle-validate-ghc-${{ env.GHC_FOR_RELEASE }} --project-file=cabal.validate.project cabal-install:exe:cabal)
321321
# We have to tar the executable to preserve executable permissions
322322
# see https://github.com/actions/upload-artifact/issues/38
323323
DIR=$(dirname "$CABAL_EXEC")

‎.gitlab/ci.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,29 +31,29 @@ mkdir -p "$CABAL_DIR"
3131
#
3232
# $PLATFORM comes from CI.
3333
if [ "$(getconf LONG_BIT)" = "32" -o "${PLATFORM:=xxx}" = "x86_64-linux-centos7" ] ; then
34-
echo 'constraints: lukko -ofd-locking' >> cabal.project.release.local
34+
echo 'constraints: lukko -ofd-locking' >> cabal.release.project.local
3535
fi
3636

3737
# In February 2024, cabal started using zlib-0.7.0.0, which uses pkg-config by
3838
# default. The GitLab CI environment doesn't (yet) supply pkg-config, and zlib
3939
# does just fine without it on modern GHCs. That said, the CI environment
4040
# probably *should* have pkg-config installed. See
4141
# https://github.com/haskell/cabal/issues/9774.
42-
echo 'constraints: zlib -pkg-config' >> cabal.project.release.local
42+
echo 'constraints: zlib -pkg-config' >> cabal.release.project.local
4343
# Furthermore, on Windows, zlib claims that libz is shipped with GHC, so it just
4444
# uses @extra-libraries: z@ if pkg-config is False. If you are reading this
4545
# comment, however, this didn't work. Thus we switch to using the bundled libz,
4646
# as was done in zlib <0.7.0.0.
4747
case "$(uname)" in
4848
MSYS_*|MINGW*)
49-
echo 'constraints: zlib +bundled-c-zlib' >> cabal.project.release.local
49+
echo 'constraints: zlib +bundled-c-zlib' >> cabal.release.project.local
5050
;;
5151
esac
5252

5353
args=(
5454
--disable-profiling
5555
--enable-executable-stripping
56-
--project-file=cabal.project.release
56+
--project-file=cabal.release.project
5757
${ADD_CABAL_ARGS}
5858
)
5959

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ cabal build cabal
1212
If not, you aren't able to build the testsuite, so you need to disable the default `cabal.project` that implies configuring the testsuite, e.g., with:
1313

1414
```
15-
cabal build --project-file=cabal.project.release cabal
15+
cabal build --project-file=cabal.release.project cabal
1616
```
1717

1818
> **Note**

‎Makefile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ spdx : $(SPDX_LICENSE_HS) $(SPDX_EXCEPTION_HS)
5858
SPDX_LICENSE_VERSIONS:=3.0 3.2 3.6 3.9 3.10 3.16 3.23
5959

6060
$(SPDX_LICENSE_HS) : templates/SPDX.LicenseId.template.hs cabal-dev-scripts/src/GenUtils.hs cabal-dev-scripts/src/GenSPDX.hs license-list-data/licenses-3.0.json license-list-data/licenses-3.2.json
61-
cabal run --builddir=dist-newstyle-meta --project-file=cabal.project.meta gen-spdx -- templates/SPDX.LicenseId.template.hs $(SPDX_LICENSE_VERSIONS:%=license-list-data/licenses-%.json) $(SPDX_LICENSE_HS)
61+
cabal run --builddir=dist-newstyle-meta --project-file=cabal.meta.project gen-spdx -- templates/SPDX.LicenseId.template.hs $(SPDX_LICENSE_VERSIONS:%=license-list-data/licenses-%.json) $(SPDX_LICENSE_HS)
6262

6363
$(SPDX_EXCEPTION_HS) : templates/SPDX.LicenseExceptionId.template.hs cabal-dev-scripts/src/GenUtils.hs cabal-dev-scripts/src/GenSPDXExc.hs license-list-data/exceptions-3.0.json license-list-data/exceptions-3.2.json
64-
cabal run --builddir=dist-newstyle-meta --project-file=cabal.project.meta gen-spdx-exc -- templates/SPDX.LicenseExceptionId.template.hs $(SPDX_LICENSE_VERSIONS:%=license-list-data/exceptions-%.json) $(SPDX_EXCEPTION_HS)
64+
cabal run --builddir=dist-newstyle-meta --project-file=cabal.meta.project gen-spdx-exc -- templates/SPDX.LicenseExceptionId.template.hs $(SPDX_LICENSE_VERSIONS:%=license-list-data/exceptions-%.json) $(SPDX_EXCEPTION_HS)
6565

6666
# source generation: templates
6767

@@ -75,10 +75,10 @@ TEMPLATE_PATHS:=Cabal/src/Distribution/Simple/Build/PathsModule/Z.hs
7575
templates : $(TEMPLATE_MACROS) $(TEMPLATE_PATHS)
7676

7777
$(TEMPLATE_MACROS) : templates/cabal_macros.template.h cabal-dev-scripts/src/GenCabalMacros.hs
78-
cabal run --builddir=dist-newstyle-meta --project-file=cabal.project.meta gen-cabal-macros -- $< $@
78+
cabal run --builddir=dist-newstyle-meta --project-file=cabal.meta.project gen-cabal-macros -- $< $@
7979

8080
$(TEMPLATE_PATHS) : templates/Paths_pkg.template.hs cabal-dev-scripts/src/GenPathsModule.hs
81-
cabal run --builddir=dist-newstyle-meta --project-file=cabal.project.meta gen-paths-module -- $< $@
81+
cabal run --builddir=dist-newstyle-meta --project-file=cabal.meta.project gen-paths-module -- $< $@
8282

8383
# generated docs
8484
# Use cabal build before cabal run to avoid output of the build on stdout when running
@@ -93,7 +93,7 @@ doc/buildinfo-fields-reference.rst : \
9393

9494
.PHONY: analyse-imports
9595
analyse-imports :
96-
find Cabal-syntax/src Cabal/src cabal-install/src -type f -name '*.hs' | xargs cabal run --builddir=dist-newstyle-meta --project-file=cabal.project.meta analyse-imports --
96+
find Cabal-syntax/src Cabal/src cabal-install/src -type f -name '*.hs' | xargs cabal run --builddir=dist-newstyle-meta --project-file=cabal.meta.project analyse-imports --
9797

9898
# ghcid
9999

@@ -190,7 +190,7 @@ validate-dockerfiles : .docker/validate-8.4.4.dockerfile
190190
validate-dockerfiles : .docker/validate-8.2.2.dockerfile
191191

192192
.docker/validate-%.dockerfile : .docker/validate.dockerfile.zinza cabal-dev-scripts/src/GenValidateDockerfile.hs
193-
cabal run --builddir=dist-newstyle-meta --project-file=cabal.project.meta gen-validate-dockerfile -- $* $< $@
193+
cabal run --builddir=dist-newstyle-meta --project-file=cabal.meta.project gen-validate-dockerfile -- $* $< $@
194194

195195
# This is good idea anyway
196196
# and we have a test relying on this limit being sufficiently small
@@ -229,7 +229,7 @@ tags :
229229
##############################################################################
230230

231231
bootstrap-json-%: phony
232-
cabal build --project-file=cabal.project.bootstrap --with-compiler=ghc-$* --dry-run cabal-install:exe:cabal
232+
cabal build --project-file=cabal.bootstrap.project --with-compiler=ghc-$* --dry-run cabal-install:exe:cabal
233233
cp dist-newstyle/cache/plan.json bootstrap/linux-$*.plan.json
234234
@# -v0 to avoid build output on stdout
235235
cd bootstrap && cabal run -v0 cabal-bootstrap-gen -- linux-$*.plan.json \

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ Ways to build `cabal-install` for everyday use
8484
Git repository, move to its root, and run:
8585
8686
```
87-
cabal install --project-file=cabal.project.release cabal-install
87+
cabal install --project-file=cabal.release.project cabal-install
8888
```
8989
9090
3. _Bootstrapping_:

‎bootstrap/generate_bootstrap_plans‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ run() {
1010
local drv="ghc-$ver"
1111
echo "$ver"
1212
nix build -f "$ghcs_nix" $drv
13-
(cd ../; rm -r dist-bootstrap; cabal --distdir=dist-bootstrap build --project-file=cabal.project.release --dry-run cabal-install:exe:cabal -w bootstrap/result/bin/ghc)
13+
(cd ../; rm -r dist-bootstrap; cabal --distdir=dist-bootstrap build --project-file=cabal.release.project --dry-run cabal-install:exe:cabal -w bootstrap/result/bin/ghc)
1414
jq --sort-keys < ../dist-bootstrap/cache/plan.json > "plan-$ver.json"
1515
cabal run --with-ghc-pkg $PWD/boot_ghc/bin/ghc-pkg -w $PWD/boot_ghc/bin/ghc -v0 cabal-bootstrap-gen -- "plan-$ver.json" | jq --sort-keys | tee "linux-$(echo $ver | tr "_" ".").json"
1616
}

‎cabal-testsuite/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ cabal install doctest --overwrite-policy=always --ignore-project
6565
After that you can run doctests for a component of your choice via the following command:
6666

6767
``` shellsession
68-
cabal repl --with-ghc=doctest --build-depends=QuickCheck --build-depends=template-haskell --repl-options="-w" --project-file="cabal.project.validate" Cabal-syntax
68+
cabal repl --with-ghc=doctest --build-depends=QuickCheck --build-depends=template-haskell --repl-options="-w" --project-file="cabal.validate.project" Cabal-syntax
6969
```
7070

7171
In this example we have run doctests in `Cabal-syntax`. Notice, that some

‎cabal.project.bootstrap‎ renamed to ‎cabal.bootstrap.project‎

File renamed without changes.

‎cabal.project.meta‎ renamed to ‎cabal.meta.project‎

File renamed without changes.

0 commit comments

Comments
 (0)