basedir #4874

angerman · 2017-11-08T03:19:10Z

Please include the following checklist in your PR:

Patches conform to the coding conventions.
Any changes that could be relevant to users have been recorded in the changelog.
The documentation has been updated, if necessary.
If the change is docs-only, [ci skip] is used to avoid triggering the build bots.

Please also shortly describe how you tested your change. Bonus points for added tests!

23Skidoo · 2017-11-08T09:35:10Z

Cabal/Distribution/Simple/Setup.hs

@@ -332,6 +332,12 @@ data ConfigFlags = ConfigFlags {

    configDistPref :: Flag FilePath, -- ^"dist" prefix
    configCabalFilePath :: Flag FilePath, -- ^ Cabal file to use
+    configBaseDir       :: Flag FilePath, -- ^ The directory containing the


So now takeBaseName configCabalFilePath == configBaseDir doesn't need to hold? I still don't quite understand why you need a new option and can't use takeBaseName $ configCabalFilePath.

You are not bound to have the configCabalFilePath. E.g. given the following invocation:

defaultMainWithHooksNoReadArgs hooks gpd ["--basedir", "/path/to/happiness"]

you do not have the --cabalConfigFilePath.

And I'm not sure we want to force providing the --cabalConfigFilePath? If we can agree that we want to require the --cabalConfigFilePath in those cases. I'm happy to change to takeBaseName.

You are not bound to have the configCabalFilePath.

But this isn't different from the situation when configBaseDir is NoFlag. Your example can be written as defaultMainWithHooksNoReadArgs hooks gpd ["--cabal-file", "/path/to/happiness/happiness.cabal"] with --cabal-file.

You are right. the more verbose solution, might be the less error prone. Let's do it that way.

This requires haskell/cabal/pull/4874

angerman · 2017-11-12T06:02:56Z

Cabal/Distribution/Simple.hs

                 (programInvocation (sh {programOverrideEnv = overEnv}) args')
+                 { progInvokeCwd = Just (baseDir lbi) }


I believe this change breaks on windows. I'm not sure exactly why yet.

angerman · 2017-11-12T14:02:07Z

@hvr, @23Skidoo why did Jenkins not test this one? How can we force a check? Can we have some post to the PR trigger (e.g. [rerun Travis]) trigger a rerun of the CI?

23Skidoo · 2017-11-12T15:26:50Z

@angerman idk, it does this sometimes. Maybe connectivity issues between GH and Travis. Try making a small tweak (so that commit hash gets changed) and force-pushing.

23Skidoo · 2017-11-12T15:29:16Z

@angerman ~~Also, if you have permissions, you can go to Settings -> Webhooks and click "Re-deliver" on the offending ones. I see quite a lot of failed Travis calls there.~~ Oh, wait, Travis integration settings are actually in "Integrations & services", and failed webhook calls were for travis-dedup, which we for some reason still had enabled. Removed that one. Haven't found a way to manually re-deliver Travis calls.

angerman · 2017-11-13T01:45:03Z

Let's see if this does the trick.

angerman · 2017-11-17T07:14:21Z

@23Skidoo, @hvr, while this works for what I'm doing to the GHC build system. I believe there are still some code path's left. Any creative idea how to test this properly and get the sufficient coverage of the cabal codebase?

angerman · 2018-01-18T13:49:11Z

Note to self: need to figure out why test fail.

angerman · 2018-01-22T03:03:27Z

@23Skidoo, @ezyang this also fails with downstream travis.

I'd really like to get this merged. As it's a prerequisite for the relocatable hadrian (building ghc with shake) snowleopard/hadrian#445 PR, and I'm trying to tie up loose ends here.

angerman · 2018-02-08T07:28:18Z

I believe something on master started breaking windows :(

angerman · 2018-02-09T13:04:54Z

Rebased onto #5132

# Conflicts: # Cabal/Distribution/Simple.hs

If we have a cabalFilePath, just invoke the configure script there. Otherwise try to invoke it locally to the CWD. But don't try to shell out in a different directory, that would mess up the paths. In general we want to run /path/to/configure from the bulid directory (e.g. outside of the package folder).

…he package.

angerman · 2018-02-10T09:29:05Z

rebased onto master

angerman · 2018-02-11T10:39:40Z

all green!

angerman · 2018-02-12T11:21:42Z

@23Skidoo can we get this merged now?

23Skidoo · 2018-02-12T11:54:59Z

I'll merge this later today or tomorrow, there are some small changes I want to make. Sorry for the delay, I've been ill.

angerman · 2018-02-13T02:00:27Z

@23Skidoo thanks!

23Skidoo

I have some comments, but basically this is IMO mergeable.

23Skidoo · 2018-02-13T12:55:39Z

Cabal/Distribution/Simple/Configure.hs

+          srcHeaders <- forM relIncDirs $ \dir ->
+            fmap (dir </>) . filter isHeader <$> listDirectory (baseDir lbi </> dir)
+                                                 `catchIO` (\_ -> return [])
+          let commonHeaders = concat genHeaders `intersect` concat srcHeaders


This doesn't catch stuff like #include "foo/foo.h" or #include "../../foo.h". The latter we can ignore I think, for the former we'll need to walk the directory recursively.

23Skidoo · 2018-02-13T12:57:24Z

Cabal/Distribution/Simple.hs

@@ -487,7 +493,13 @@ sanityCheckHookedBuildInfo pkg_descr (_, hookExes)

 sanityCheckHookedBuildInfo _ _ = return ()

+-- | Try to read the 'localBuildInfoFile'
+tryGetBuildConfig :: UserHooks -> Verbosity -> FilePath


Weird, I was quite sure we already had this function somewhere...

23Skidoo · 2018-02-13T13:18:42Z

Cabal/Distribution/Simple.hs

-              getHookedBuildInfo verbosity
+          readHookWithArgs get_verbosity get_dist_pref _ flags = do
+              dist_dir <- findDistPrefOrDefault (get_dist_pref flags)
+              getHookedBuildInfo (dist_dir </> "build") verbosity


I'm not totally keen on the fact that we're hardcoding "build" everywhere. This works with new-build directory structure, right?

23Skidoo · 2018-02-13T13:22:06Z

Cabal/Distribution/Simple.hs

-getHookedBuildInfo :: Verbosity -> IO HookedBuildInfo
-getHookedBuildInfo verbosity = do
-  maybe_infoFile <- defaultHookedPackageDesc
+getHookedBuildInfo :: FilePath -> Verbosity -> IO HookedBuildInfo


We should mention in the changelog/migration guide that this function has changed type.

23Skidoo · 2018-02-13T13:27:27Z

Cabal/Distribution/Simple/Utils.hs

@@ -1536,6 +1536,7 @@ findPackageDesc dir
 tryFindPackageDesc :: FilePath -> IO FilePath
 tryFindPackageDesc dir = either die return =<< findPackageDesc dir

+{-# DEPRECATED defaultHookedPackageDesc "Use findHookedPackageDesc with the proper base directory instead" #-}
 -- |Optional auxiliary package information file (/pkgname/@.buildinfo@)


This should also be mentioned in the changelog.

23Skidoo · 2018-02-13T13:29:01Z

Just waiting for it to go green now...

23Skidoo · 2018-02-14T00:45:33Z

Merged, thanks!

23Skidoo · 2018-02-14T09:08:42Z

Cabal/Distribution/Simple/GHC/Internal.hs

+                                          ++ PD.includeDirs bi
+                                          -- potential includes generated by `configure'
+                                          -- in the build directory
+                                          ++ [buildDir lbi </> dir | dir <- PD.includeDirs bi],


Don't you need to filter out absolute paths here as well?

This reverts commit 783cbe6, reversing changes made to c094940.

ezyang · 2018-04-01T01:20:04Z

Mac OS X regression caused by this: https://ghc.haskell.org/trac/ghc/ticket/14972

In general, the new files in build can cause GHCi to stop working if one of the files/directory unluckily has the same name as a dynamic library (gmp in this case), because then gcc -print-file-name goes insane (but apparently only on OS X)

angerman · 2018-04-01T07:45:03Z

I've created https://phabricator.haskell.org/D4553, which should ensure that what ever gcc --print-file-name returns is verified to be a file prior to passing it on.

angerman changed the title ~~Feature/basedir~~ Feature/basedir [WIP] Nov 8, 2017

23Skidoo reviewed Nov 8, 2017

View reviewed changes

mgsloan mentioned this pull request Nov 8, 2017

Add --basedir flag #4867

Closed

angerman added a commit to angerman/hadrian that referenced this pull request Nov 9, 2017

Provide the cabal configuration with the proper --basedir

94d8ab9

This requires haskell/cabal/pull/4874

angerman force-pushed the feature/basedir branch 2 times, most recently from b37a97d to e0b806f Compare November 10, 2017 14:19

angerman mentioned this pull request Nov 10, 2017

WIP: Relocation based build (inplace free) snowleopard/hadrian#445

Closed

7 tasks

angerman commented Nov 12, 2017

View reviewed changes

angerman force-pushed the feature/basedir branch 4 times, most recently from 25e6776 to b8fe569 Compare November 12, 2017 09:04

angerman closed this Nov 13, 2017

angerman reopened this Nov 13, 2017

angerman force-pushed the feature/basedir branch from 7a1b873 to e5fa845 Compare November 20, 2017 12:50

angerman mentioned this pull request Nov 23, 2017

Allow ${pkgroot} prefix. #4892

Merged

4 tasks

ezyang closed this Dec 30, 2017

ezyang reopened this Dec 30, 2017

angerman mentioned this pull request Jan 6, 2018

new-run should cd to the package directory before running the exe #5001

Closed

angerman changed the title ~~Feature/basedir [WIP]~~ basedir Jan 18, 2018

angerman self-assigned this Jan 19, 2018

angerman force-pushed the feature/basedir branch from e5fa845 to 833bc6d Compare January 19, 2018 08:20

angerman mentioned this pull request Jan 29, 2018

Cabal release for GHC 8.4 #5075

Closed

angerman mentioned this pull request Feb 8, 2018

cabal check should verify that the sdist, doesn't contain generated files #5128

Open

angerman force-pushed the feature/basedir branch from 6b2e2bd to caac29b Compare February 9, 2018 13:03

angerman added 4 commits February 10, 2018 17:27

Adds tryGetBuildInfo

8d88dd9

# Conflicts: # Cabal/Distribution/Simple.hs

Check for duplicate files generated by configure and shipped with t…

3a9830b

…he package.

Cleanup directory compat

767efff

angerman force-pushed the feature/basedir branch from caac29b to 767efff Compare February 10, 2018 09:28

angerman added this to the 2.2 milestone Feb 10, 2018

23Skidoo added 2 commits February 13, 2018 12:42

Move compat bits for 'directory' to D.Compat.Directory.

3ebb984

Comments only.

f69ef8d

23Skidoo reviewed Feb 13, 2018

View reviewed changes

23Skidoo merged commit 783cbe6 into haskell:master Feb 14, 2018

23Skidoo reviewed Feb 14, 2018

View reviewed changes

hvr mentioned this pull request Feb 25, 2018

Cannot find generated header files when building unix-time with Cabal 2.2 #5169

Open

23Skidoo added a commit that referenced this pull request Mar 2, 2018

Revert "Merge pull request #4874 from zw3rk/feature/basedir"

caca78a

This reverts commit 783cbe6, reversing changes made to c094940.

angerman mentioned this pull request Jun 27, 2018

Make Setup.hs configure more CWD-independent. #5397

Merged

4 tasks

quasicomputational mentioned this pull request Jul 9, 2018

Cabal library implicitly depends upon global current working directory #3051

Closed

hvr mentioned this pull request Mar 12, 2019

Wrong current path with custom build-type #5934

Open

mpickering mentioned this pull request Aug 1, 2024

Cabal ignores buildinfo in top-level of directory #10238

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

basedir #4874

basedir #4874

angerman commented Nov 8, 2017 •

edited

Loading

23Skidoo Nov 8, 2017

angerman Nov 8, 2017

23Skidoo Nov 8, 2017

angerman Nov 8, 2017

angerman Nov 12, 2017

angerman commented Nov 12, 2017

23Skidoo commented Nov 12, 2017

23Skidoo commented Nov 12, 2017 •

edited

Loading

angerman commented Nov 13, 2017

angerman commented Nov 17, 2017

angerman commented Jan 18, 2018

angerman commented Jan 22, 2018

angerman commented Feb 8, 2018

angerman commented Feb 9, 2018

angerman commented Feb 10, 2018

angerman commented Feb 11, 2018

angerman commented Feb 12, 2018

23Skidoo commented Feb 12, 2018

angerman commented Feb 13, 2018

23Skidoo left a comment

23Skidoo Feb 13, 2018

23Skidoo Feb 13, 2018

23Skidoo Feb 13, 2018

23Skidoo Feb 13, 2018

23Skidoo Feb 13, 2018

23Skidoo commented Feb 13, 2018

23Skidoo commented Feb 14, 2018

23Skidoo Feb 14, 2018

ezyang commented Apr 1, 2018

angerman commented Apr 1, 2018

		(programInvocation (sh {programOverrideEnv = overEnv}) args')
		{ progInvokeCwd = Just (baseDir lbi) }

basedir #4874

basedir #4874

Conversation

angerman commented Nov 8, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

angerman commented Nov 12, 2017

23Skidoo commented Nov 12, 2017

23Skidoo commented Nov 12, 2017 • edited Loading

angerman commented Nov 13, 2017

angerman commented Nov 17, 2017

angerman commented Jan 18, 2018

angerman commented Jan 22, 2018

angerman commented Feb 8, 2018

angerman commented Feb 9, 2018

angerman commented Feb 10, 2018

angerman commented Feb 11, 2018

angerman commented Feb 12, 2018

23Skidoo commented Feb 12, 2018

angerman commented Feb 13, 2018

23Skidoo left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

23Skidoo commented Feb 13, 2018

23Skidoo commented Feb 14, 2018

Choose a reason for hiding this comment

ezyang commented Apr 1, 2018

angerman commented Apr 1, 2018

angerman commented Nov 8, 2017 •

edited

Loading

23Skidoo commented Nov 12, 2017 •

edited

Loading