...
 
Commits (2)
...@@ -89,7 +89,7 @@ gen-extra-source-files-lib : ...@@ -89,7 +89,7 @@ gen-extra-source-files-lib :
# analyse-imports # analyse-imports
analyse-imports : phony 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-actions : .github/workflows/artifacts.yml github-actions : .github/workflows/artifacts.yml
...@@ -123,7 +123,7 @@ doctest : ...@@ -123,7 +123,7 @@ doctest :
# This is not run as part of validate.sh (we need hackage-security, which is tricky to get). # This is not run as part of validate.sh (we need hackage-security, which is tricky to get).
doctest-cli : doctest-cli :
doctest -D__DOCTEST__ --fast cabal-install/Distribution doctest -D__DOCTEST__ --fast cabal-install/src
# tests # tests
...@@ -225,7 +225,7 @@ weeder : ...@@ -225,7 +225,7 @@ weeder :
# tags # tags
.PHONY : tags .PHONY : tags
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 # documentation
############################################################################## ##############################################################################
......
...@@ -149,7 +149,7 @@ executable cabal ...@@ -149,7 +149,7 @@ executable cabal
-- On AIX, some legacy BSD operations such as flock(2) are provided by libbsd.a -- On AIX, some legacy BSD operations such as flock(2) are provided by libbsd.a
if os(aix) if os(aix)
extra-libraries: bsd extra-libraries: bsd
hs-source-dirs: . hs-source-dirs: src
other-modules: other-modules:
-- this modules are moved from Cabal -- this modules are moved from Cabal
-- they are needed for as long until cabal-install moves to parsec parser -- they are needed for as long until cabal-install moves to parsec parser
......
...@@ -141,7 +141,7 @@ library cabal-lib-client ...@@ -141,7 +141,7 @@ library cabal-lib-client
if impl(ghc < 8.8) if impl(ghc < 8.8)
ghc-options: -Wnoncanonical-monadfail-instances ghc-options: -Wnoncanonical-monadfail-instances
hs-source-dirs: . hs-source-dirs: src
exposed-modules: exposed-modules:
-- this modules are moved from Cabal -- this modules are moved from Cabal
-- they are needed for as long until cabal-install moves to parsec parser -- they are needed for as long until cabal-install moves to parsec parser
......
...@@ -149,7 +149,7 @@ executable cabal ...@@ -149,7 +149,7 @@ executable cabal
-- On AIX, some legacy BSD operations such as flock(2) are provided by libbsd.a -- On AIX, some legacy BSD operations such as flock(2) are provided by libbsd.a
if os(aix) if os(aix)
extra-libraries: bsd extra-libraries: bsd
hs-source-dirs: . hs-source-dirs: src
other-modules: other-modules:
-- this modules are moved from Cabal -- this modules are moved from Cabal
-- they are needed for as long until cabal-install moves to parsec parser -- they are needed for as long until cabal-install moves to parsec parser
......
...@@ -419,7 +419,7 @@ Flag lukko ...@@ -419,7 +419,7 @@ Flag lukko
{% if dev %} {% if dev %}
library cabal-lib-client library cabal-lib-client
{% useblock componentCommon %} {% useblock componentCommon %}
hs-source-dirs: . hs-source-dirs: src
{% useblock buildInfo %} {% useblock buildInfo %}
library cabal-install-solver-dsl library cabal-install-solver-dsl
...@@ -457,7 +457,7 @@ executable cabal ...@@ -457,7 +457,7 @@ executable cabal
other-modules: Paths_cabal_install other-modules: Paths_cabal_install
{% else %} {% else %}
hs-source-dirs: . hs-source-dirs: src
{% useblock buildInfo %} {% useblock buildInfo %}
{% endif %} {% endif %}
{############################################################################} {############################################################################}
......