Permalink
Commits on Oct 18, 2007
  1. don't fail if xxx_hsc_make.c is gone

    Ross Paterson committed Oct 18, 2007
    The non-GHC hsc2hs deletes it even if the compilation fails.
  2. Update changelog for 1.2.1

    dcoutts committed Oct 18, 2007
Commits on Oct 17, 2007
  1. Bump minor version number to 1.2.1

    dcoutts committed Oct 17, 2007
    We've added a couple minor features since 1.2.0
  2. Use cpp-options rather than abusing ghc-options

    dcoutts committed Oct 17, 2007
    Cabal-1.2 branch version of an equivalent patch in Cabal HEAD
  3. Add a "cpp-options:" field and use it for pre-processing .hs .hsc .ch…

    dcoutts committed Oct 17, 2007
    …s files
    
    This is for pre-processing Haskell modules, not for C code. We already have
    cc-options for that purpose. Up 'til now people have been abusing ghc-options
    for this purpose. Even Cabal itself was guilty of doing that.
  4. Figure out if hsc2hs is using gcc or ghc as it's C compiler

    dcoutts committed Oct 17, 2007
    and pass the appropriate flags on the basis of knowing that.
    This is a hack.
    What we should do longer term is make hsc2hs always use gcc as it's C compiler
    and have Cabal figure out the right flags to pass it, rather than using ghc
    to pass on the appropriate flags to gcc.
Commits on Oct 16, 2007
  1. When parsing ghc-pkg output, only look at the first package.conf file…

    bringert committed Oct 16, 2007
    … for GlobalPackageDB and SpecificPackageDB, and all package.conf files for UserPackageDB.
    
    Before, we would consider user packages when fulfilling dependencies
    for global installs. ghc-pkg will refuse to install packages globally if they
    use user packages. Thus, without this patch, global installs can fail when you have user packages installed.
  2. Change the handling of cpp & ghc flags for hsc2hs

    dcoutts committed Oct 16, 2007
    The hsc2hs that comes with ghc uses ghc as the C compiler. This means we must
    escape the real cc flags. It also means we can ask ghc to add extra include
    dirs that we might need to find includes of dependent packages. This is a bit
    of a hack. In the longer term it'd be better for Cabal to collect the include
    dirs and cc options of dependent packages and to pass them explicitly itself.
Commits on Oct 14, 2007
Commits on Oct 13, 2007
  1. Change --verbosity= option of SetupWrapper (cabal-setup) to --verbose…

    bringert committed Oct 13, 2007
    …=, since that is what the rest of Cabal uses.
  2. Pass -w -v0 to ghc when compiling Setup.{lhs,hs} in SetupWrapper when…

    bringert committed Oct 13, 2007
    … verbosity == silent.
Commits on Oct 12, 2007
  1. Add logging functions notice, info, debug functions and use them cons…

    dcoutts committed Oct 12, 2007
    …istently
    
    We previously had this kind of code all over the place:
    > when (verbosity >= verbose)
    >      (putStrLn "some message")
    We now replace that with:
    > info verbosity "some message"
    Much nicer.
  2. Update documentation on configurations

    dcoutts committed Oct 12, 2007
    Describe the new syntax and make variuous changes to the
    description of the meaning.
Commits on Oct 11, 2007
  1. Use -O2 for compiling .c files when we configure --enable-optimization

    dcoutts committed Oct 11, 2007
    Seems a reasonable default behaviour.
Commits on Oct 6, 2007
  1. Remove commented-out code.

    bringert committed Oct 6, 2007
    Push to 1.2.
  2. Rename parseDescription to parsePackageDescription.

    bringert committed Oct 6, 2007
    This should be pushed to cabal-1.2 to make cabal-install work with 1.2.
Commits on Oct 5, 2007
  1. Expose parseDescription.

    bringert committed Oct 5, 2007
  2. Fix GenericPrackageDescription pretty printing to make it parsable. I…

    bringert committed Oct 5, 2007
    …t still does not include all information.
Commits on Oct 4, 2007
Commits on Sep 26, 2007
  1. Actually -stubdir only works well in ghc-6.8 due to -I search dir mess

    dcoutts committed Sep 26, 2007
    In ghc-6.6 the Foo/Bar.hc files only #include "Bar_stub.h" rather than
    #include "Foo/Bar_stub.h". This means when we set the stubdir so that the
    _stub.h files don't sit next to the .hs file then the include search path
    is not right to find the _stub.h file. In ghc-6.8 this is fixed so that
    it adds the -stubdir path to the include search path when calling gcc.
Commits on Sep 25, 2007
  1. Be more fuzzy with os, arch and impl matching in conditions. Fixes bug

    dcoutts committed Sep 25, 2007
    …#158.
    
    Do all the comparisons case insensitively and add some OS aliases so that
    if os(windows)  works if the System.Info.os is actually "mingw32".
  2. Translate flat files into sectionized files, by duplicating global

    nominolo committed Sep 25, 2007
    dependecies into each non-empty section.  The previous solution dumped
    them into the library section, even if it would have been empty
    otherwise.
Commits on Sep 22, 2007
  1. Fix pre-processing for executables

    dcoutts committed Sep 22, 2007
    The pre-processed files should go into the exe's build dir, not the
    lib's build dir. Also pre-process main modules, fixing bug #14.
Commits on Sep 17, 2007
  1. Move expensive conviguration actions inside branch where they're used

    dcoutts committed Sep 17, 2007
    We only need to configure the compiler and resolve any "Cabal-Version:"
    dependency when we're actually going to compile the Setup.hs program.
    We can otherwise save time by not calling ghc and ghc-pkg unnecessarily.
    (I only noticed this because I've got >150 registered packages which
    causes ghc and ghc-pkg to be very slow to start.)
  2. Pass on all the cabal-setup options to cabal, not just unrecognised ones

    dcoutts committed Sep 17, 2007
    So for example -v and -w get passed on rather than swallowed by cabal-setup
    itself.
  3. Put setup program and setup .o/.hi files into dist/setup

    dcoutts committed Sep 17, 2007
    That way they get cleaned automatically and do not clutter the top dir.
  4. Correct the verbosity range in the "--help" text

    dcoutts committed Sep 17, 2007
    The correct range in 0--3, not 0--2 or 0--5
  5. look in odir for source and .hs files, not buildDir lbi

    dcoutts committed Sep 17, 2007
    odir = buildDir lbi for the lib case, which is why it worked most of the time
    in testing but in the exe case it's a different dir.
  6. Put _stub.{c|h} files under dist/ so they'll get cleaned. Fixes bug #154

    dcoutts committed Sep 17, 2007
    .
    
    Only used with ghc-6.6 and later which supports the -stubdir flag.
    With earlier ghc versions the files still end up in the src dirs and so do not
    get cleaned.
Commits on Sep 12, 2007
  1. use OPTIONS instead of OPTIONS_GHC for now, the latter doesn't work w…

    Simon Marlow committed Sep 12, 2007
    …ith GHC 6.2.x