Skip to content

Commit

Permalink
Move cabal-install source to src/
Browse files Browse the repository at this point in the history
  • Loading branch information
phadej committed Jul 20, 2020
1 parent 95c5e40 commit 179eb29
Show file tree
Hide file tree
Showing 181 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ gen-extra-source-files-lib :

# analyse-imports
analyse-imports : phony
find Cabal/src cabal-install/Distribution -type f -name '*.hs' | xargs cabal v2-run --builddir=dist-newstyle-meta --project-file=cabal.project.meta analyse-imports --
find Cabal/src cabal-install/src -type f -name '*.hs' | xargs cabal v2-run --builddir=dist-newstyle-meta --project-file=cabal.project.meta analyse-imports --

# github actions
github-actions : .github/workflows/artifacts.yml
Expand Down Expand Up @@ -123,7 +123,7 @@ doctest :

# This is not run as part of validate.sh (we need hackage-security, which is tricky to get).
doctest-cli :
doctest -D__DOCTEST__ --fast cabal-install/Distribution
doctest -D__DOCTEST__ --fast cabal-install/src

# tests

Expand Down Expand Up @@ -225,7 +225,7 @@ weeder :
# tags
.PHONY : tags
tags :
hasktags -b Cabal/src Cabal/Cabal-described/src cabal-install/Distribution cabal-testsuite/src
hasktags -b Cabal/src Cabal/Cabal-described/src cabal-install/src cabal-testsuite/src

# documentation
##############################################################################
Expand Down
2 changes: 1 addition & 1 deletion cabal-install/cabal-install.cabal.dev
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ library cabal-lib-client
if impl(ghc < 8.8)
ghc-options: -Wnoncanonical-monadfail-instances

hs-source-dirs: .
hs-source-dirs: src
exposed-modules:
-- this modules are moved from Cabal
-- they are needed for as long until cabal-install moves to parsec parser
Expand Down
2 changes: 1 addition & 1 deletion cabal-install/cabal-install.cabal.zinza
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ Flag lukko
{% if dev %}
library cabal-lib-client
{% useblock componentCommon %}
hs-source-dirs: .
hs-source-dirs: src
{% useblock buildInfo %}

library cabal-install-solver-dsl
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 179eb29

Please sign in to comment.