summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Scott <ryan.gl.scott@gmail.com>2021-01-31 08:51:19 -0500
committerMarge Bot <ben+marge-bot@smart-cactus.org>2021-02-01 14:05:31 -0500
commit5464845a012bf174cfafe03aaeb2e47150e7efb5 (patch)
treed2132dcea672bb45fdb0345cc72d3cd38069e7b3
parentd4bcd37f15a59cea22fbaef280cd85cac20872bf (diff)
downloadhaskell-5464845a012bf174cfafe03aaeb2e47150e7efb5.tar.gz
Add driver/ghci/ghci-wrapper.cabal to .gitignore
After commit 55ef3bdc28681a22ceccf207707c49229f9b7559, running `./configure` now generates a `driver/ghci/ghci-wrapper.cabal` file from `driver/ghci/ghci-wrapper.cabal.in`, which pollutes the `git` tree: ``` $ git status On branch master Your branch is up to date with 'origin/master'. Untracked files: (use "git add <file>..." to include in what will be committed) driver/ghci/ghci-wrapper.cabal nothing added to commit but untracked files present (use "git add" to track) ``` Since `driver/ghci/ghci-wrapper.cabal` is autogenerated, the sensible thing to do is to add it to `.gitignore`. While I was in town, I also added the standard `*.in` file disclaimer to `driver/ghci/ghci-wrapper.cabal.in`. [ci skip]
-rw-r--r--.gitignore1
-rw-r--r--driver/ghci/ghci-wrapper.cabal.in5
2 files changed, 5 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 1d296980e5..aa47ad2953 100644
--- a/.gitignore
+++ b/.gitignore
@@ -125,6 +125,7 @@ _darcs/
/docs/users_guide/utils.pyc
/driver/ghci/ghc-pkg-inplace
/driver/ghci/ghci-inplace
+/driver/ghci/ghci-wrapper.cabal
/driver/ghci/ghci.res
/driver/ghci/cwrapper.c
/driver/ghci/cwrapper.h
diff --git a/driver/ghci/ghci-wrapper.cabal.in b/driver/ghci/ghci-wrapper.cabal.in
index c0053e9834..2616223ada 100644
--- a/driver/ghci/ghci-wrapper.cabal.in
+++ b/driver/ghci/ghci-wrapper.cabal.in
@@ -1,3 +1,6 @@
+-- WARNING: ghci-wrapper.cabal is automatically generated from ghci-wrapper.cabal.in by
+-- ./configure. Make sure you are editing ghci-wrapper.cabal.in, not ghci-wrapper.cabal.
+
Name: ghci-wrapper
Version: @ProjectVersion@
Copyright: XXX
@@ -23,4 +26,4 @@ Executable ghci
C-Sources:
ghci.c
-- the following get copied from ../utils by hadrian
- getLocation.c isMinTTY.c cwrapper.c \ No newline at end of file
+ getLocation.c isMinTTY.c cwrapper.c