Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: haskell/cabal
...
head fork: haskell/cabal
This comparison is big! We’re only showing the most recent 250 commits
Commits on Jul 17, 2007
@nominolo nominolo Add simpler representation of a .cabal file with conditions. 3baa403
Commits on Jul 19, 2007
@nominolo nominolo Change CondTree data structure to something more flexible.
This also requires some interface changes.
0f13d24
@nominolo nominolo Adopt new CondTree data structure.
'finalizePackageDescription' now also takes dependencies of
executables into account.
a361158
@nominolo nominolo Filter duplicate dependencies. 77fc5bd
@nominolo nominolo Re-enable and extend test case. 7e6a0b5
@nominolo nominolo Add function 'ignoreCondition'. 6ebd02f
@nominolo nominolo Minor. Moved some code. 0dc8f86
Commits on Jul 28, 2007
@nominolo nominolo Add/Fix test cases 4d1b573
@nominolo nominolo Add documentation 17bb612
@nominolo nominolo Add documentation 44126f7
@nominolo nominolo Avoid reporting the same missing dependecy twice. 6adc754
@nominolo nominolo Add function 'flattenPackageDescription'. 23552c6
@nominolo nominolo Modify test case. 773fd0f
@nominolo nominolo Minor documentation fix. 91ea87f
@nominolo nominolo Export 'flattenPackageDescription'. 5ce6e3a
@nominolo nominolo Store resolved package description in local build info.
The clean and sdist commands need to use a flattened representation of
the original description.  Note the notes for
flattenPackageDescription for some problems with this approach.
51cefc6
@nominolo nominolo Let sdist command run the preprocessors itself. This way we don't
have to put stuff into the source tree.
7f490df
@nominolo nominolo Add note to 'clean' that it could be simpler, but for compatibility
reasons isn't (for now).
5dc3051
@nominolo nominolo Change HUnit module path to Test.HUnit (the default now). a9edcfe
@nominolo nominolo Rename field. 9869998
@nominolo nominolo Fix conflicts. Fix for changed argument to 'preprocessSources'. f42fcb5
Commits on Jul 29, 2007
@igfoo igfoo Resolve conflicts a4f2171
@igfoo igfoo Add a missing case in updateCfg 9d426d0
@igfoo igfoo Pass ghc -package flags when using it as a C compiler in GHCMakefile
This means we get the CPP include directories included.
e1a35ec
@igfoo igfoo Fix haddock markup
I haven't checked that it looks right, but it is now accepted by haddock.
3165ccf
Commits on Jul 30, 2007
@nominolo nominolo Fix self-compile warnings. 456a265
@nominolo nominolo Display a more helpful error message, when unknown fields are
noticed.
dc8e02b
@nominolo nominolo Add line numbers to unknown fields error message. 5cb7e95
@nominolo nominolo Fix order of warnings. cf51359
Commits on Jul 31, 2007
@dcoutts dcoutts -Wall police bfde7f9
@dcoutts dcoutts Move the haddock code out into it's own module
It removes about 250 loc from Distribution.Simple
06ea4fd
Commits on Aug 01, 2007
Simon Marlow FIX compilation with GHC 6.2.x c3b9f37
@dcoutts dcoutts extraArgs should override args in command lines
besides, the order was inconsistent within the same function between the
UserSpecified and FoundOnSystem cases.
9afc99d
@nominolo nominolo Cleanup. fix line length cef1fe4
@dcoutts dcoutts Make all the pre-processors use the Program abstraction b649c6b
@dcoutts dcoutts Clean up calling of ar, make it use Program abstraction 83d3a09
@dcoutts dcoutts Clean up cpphs/ghc -cpp preprocessor code
Now better separated and uses Program better.
Also no longer needs internal lookupProgram' utils function.
4dc2bcd
@dcoutts dcoutts Add programPath :: Program -> FilePath
At the moment it's a partial function, but we should change that by having
a distinction between an abstract program and a configured program.
433a263
@dcoutts dcoutts Simplify rawSystemProgram using programPath b5ecc50
@dcoutts dcoutts Make the Compiler abstraction use the Program abstraction
So out with compilerPath :: FilePath, in with compilerProg :: Program
Similarly for compilerPkgTool.
Lots of knock-on changes due to this, including converting many more uses of
rawSystemExit to rawSystemProgram.
17f855d
@igfoo igfoo Cabal now depends on teh containers package 614fc40
Commits on Aug 02, 2007
@dcoutts dcoutts Add readVersion convenience function to Distribution.Version
So it's merely readVersion :: String -> Maybe Version
Having to use readP_to_S parseVersion all over the place is annoying.
d3e1c9b
@dcoutts dcoutts Fix name of flag in error message 4153264
@nominolo nominolo Add impl(...) conditional to configurations.
You can now use expressions like impl( ghc >= 6.6.1 ) in conditionals
in .cabal files.
a39bff3
@dcoutts dcoutts Remove redundant configure flags, missed bits of previous refactoring. 7347bed
@dcoutts dcoutts Tidy some imports/exports 9575ce5
@dcoutts dcoutts Add version field to Program and add findProgram(AndVersion) utilities
findProgram and findProgramAndVersion construct Program values
The latter makes it easier to parse output of --version calls.
The idea is that we should carry the version number along with the program
if we know it, so we can later decide version-dependent args without having
to do more IO to find the program version, eg see use_optP_P & haddockVersion.
cd73e20
@dcoutts dcoutts Alter version parse error message to make it clearer ee06505
@dcoutts dcoutts Put the haddock and hscolour version numbers in the global ProgramCon…
…figuration

We do this during the configure step and then later we don't have to run
haddock & hscolour again to find out their version numbers.
This also eliminates some annoying module interdependencies.
Eventually the Program abstraction ought to include the ability for programs
to discover their own version numbers so it can be done more modularly.
0cc69c4
@dcoutts dcoutts Remove Distribution.Simple.Configure.findProgram as it's no longer used 3050cfe
@dcoutts dcoutts Change Compiler's compilerVersion fild to compilerId
Of type PackageIdentifier rather than Version.
b30d91f
@dcoutts dcoutts -Wall police 28f0428
Commits on Aug 03, 2007
@dcoutts dcoutts Move the SetupWrapper module under Distribution.Simple
It's really a wrapper around the simple build system.
6c59749
@nominolo nominolo Add documentation for Cabal Configurations. 271331d
@nominolo nominolo Fix tab in Cabal.cabal. 3b72df8
@nominolo nominolo Disallow tabs .cabal files with new syntax bc3b239
@nominolo nominolo Fix printing of 'impl' checks. 1223080
@nominolo nominolo Fix import path to HUnit. 256ff59
@nominolo nominolo Change error message for tabs used as indentation to something more
helpful.
e2ddc6b
@dcoutts dcoutts Clean up rather un-sbstract use of Compiler in configure 7f82d9b
@dcoutts dcoutts Move compiler-specific code for configurion into compiler modules
There's slightly more code overally but it's no longer incomprehensible
because it's not all mixed together for all the different compilers.
63f6c50
@nominolo nominolo Split up make target for documentation generation. Allows to build
the user's guide separately from the Haddock documentation.
86c7273
Commits on Aug 04, 2007
@dcoutts dcoutts Fix haddock markup for finalizePackageDescription ffd90c7
@dcoutts dcoutts Make the writing registration script message less silly c5cb9e2
@dcoutts dcoutts Add message saying where haddock docs got put
And make the similar message for sdist respect the verbosity
d17dcdd
@dcoutts dcoutts Less confusing haddock command output when there are no libs in the p…
…ackage

It says:
> No documentation was generated as this package does not contain a library.
> Perhaps you want to use the haddock command with the --executables flag.
87cb085
@dcoutts dcoutts Improve hangling of the title and prolog for haddock docs
Only include ": " in the title if it has a synopsis to use as subtitle
Use the description as the prolog, or if that's empty we use the synopsis.
Do the same for executables, fixing bug #142.
d2341a3
@dcoutts dcoutts Remove compilerBinaryName, use compilerId instead 1666bd2
@dcoutts dcoutts Try and simplify cleaning by always removing dist
so we don't have to individually track all the files we create
we still have to delete a few files outside of the build dir sadly
the configuration is still preserved if you specify --save-configure
f009a8b
@dcoutts dcoutts Put the generated haddock-prolog file under dist eec66d2
@dcoutts dcoutts normalise the input and output file names when pre-processing
eg so we don't call cpp with ././src/blah -o ./dist/blah
since those ././ can end up in error messages.
8f4b5f6
@dcoutts dcoutts Correct the location of the haddock dir in inplace registrations 2a072e9
@dcoutts dcoutts Add setup register --gen-pkg-config flag for distros that want that.
It generates the actual file to be passed to the compiler's package program.
This is obviously compiler-specific.
1b4e999
@dcoutts dcoutts Don't complain about AllRightsReserved licenses
That can be done in hackage when people try to upload. Fixes bug #127.
9a77071
@igfoo igfoo Add TypeFamilies extension dc48982
@igfoo igfoo extensionToGHCFlag is now version dependent, and uses -XFoo flags for…
… >=6.7
04ee4f6
@igfoo igfoo Add StandaloneDeriving extension 52ebc69
Commits on Aug 05, 2007
@igfoo igfoo Pattern match on an OS datatype rather than using ifdef everywhere 19f18f1
@igfoo igfoo Ask the compiler what languages it supports, when possible 2add559
Commits on Aug 06, 2007
@nominolo nominolo Allow querying for the wildcard version range. 84cb848
@nominolo nominolo No longer fail to parse packages without any library or executable
sections.  Issue a warning instead.  (The previous error message
"Unexpected end of file" was not very helpful.)
51c3106
@nominolo nominolo Cosmetic cleanup (fix line length) 187a93d
@nominolo nominolo Warn if no Cabal-version field is specified, but new syntax is used.
This isn't quite exact.  Ideally, we'd like to have something like
isEmptyRange (specified-range && >= 1.2) but implementing isEmptyRange
is non-trivial, so we'll go with this imperfect solution until we need
that feature elsewhere.
111dc03
Commits on Aug 07, 2007
@dcoutts dcoutts Make things build with ghc-6.6.x rather than just ghc HEAD
filepath-1.0 does not export dropDrive
fd74664
@dcoutts dcoutts Remove use of cpp in Distribution.System
base it off of the System.Info.os string rather than cpp defs
5381bf0
@dcoutts dcoutts Remove more os-specific cppery
The only difference for this one was / vs \\ path separators
ced9785
@nominolo nominolo Re-enable and update unit tests. 5866b29
@nominolo nominolo Fix translation of deprecated fields. Add test case. 441968b
@nominolo nominolo Fix error message. 275eab3
@nominolo nominolo Add a little documentation. f026a91
@dcoutts dcoutts Use String rather than importing a module just to misuse a String typ…
…e alias
09c41cb
@dcoutts dcoutts Add compilerExtensions field to Compiler and make each compiler fill …
…it in

It's just a list of supported extensions and the corresponding compiler flags.
For most compilers this is currently just a static list. For ghc 6.7 and above
we query ghc to find the list of language extensions it supports.
In each case the code has moved out into the compiler-specific modules and the
core code treats it generically.
The extensionsToFlags function has been split into two:
extensionsToFlags which now returns the flags for the supported extensions and
unsupportedExtensions which does what it says it does. This is because the two
roles of the previous function were always used separately, never together.
d255513
@dcoutts dcoutts remove unused local vars cfa1b6c
@dcoutts dcoutts Oops, fix deprecated Distribution.Extension module
it no longer exports the internal per-compiler extension to flags functions
as they are no longer exist and the equivalents are internal.
2c619c2
Commits on Aug 08, 2007
Magnus Jonsson Parse the output of ghc --supported-languages correctly 98bcf34
@dcoutts dcoutts Never generate empty language extension flags
Needed because some compilers support some language extensions by default
so need no flag to turn those extensions on.
28cdd22
Commits on Aug 09, 2007
Simon Marlow fix build with GHC 6.2.x 5cab857
Esa Ilari Vuokko Use existing parsers to handle ghc-pkg field output c5e5063
Commits on Aug 11, 2007
Esa Ilari Vuokko Explicit imports 62a7a3b
Esa Ilari Vuokko Clean up import ordering and format 06db111
Commits on Aug 12, 2007
@dcoutts dcoutts update ghc-pkg field parse error message f62e2d3
Commits on Aug 14, 2007
@dcoutts dcoutts ghc only supports the -x flag in 6.6 and above 2fd17f2
@dcoutts dcoutts Refactor the code for managing installation directories
New types for the collection of installation directory templates and a
separate type for the collection of actual real install FilePaths.
The templates are represented with a PathTemplate adt.
Dir templates can now be relative to each other, eg $htmldir to $docdir
Default install dir templates are now specified compactly in one place.
Adding new dirs should be considerably simpler than previously.
This patch should not actualy change where anything is installed.
91ffc0f
Esa Ilari Vuokko Reorder, make explicit and beautify imports b2f27e8
Esa Ilari Vuokko Warning police: provide fallback pattern match 55ad9e9
Esa Ilari Vuokko Warning police: Remove unused statement and import b7ca62e
Esa Ilari Vuokko Warning police: Add type signatures and rename arg d8c5f3b
Esa Ilari Vuokko Fix Paths_pkg.hs generation 4e00464
Commits on Aug 16, 2007
@dcoutts dcoutts Add configure --docdir flag which defaults to "$datadir/doc/$pkgid"
Fixes bug #140
90fd132
Esa Ilari Vuokko Make 'make tests' runnable again cea6ac2
Esa Ilari Vuokko Split ConfVar into ConfFlag and ConfVar c28e79a
Commits on Aug 17, 2007
@dcoutts dcoutts Add some extra functions to Compat.Map that we'll need later 45fa5e1
@dcoutts dcoutts Rewrite the Program abstraction and the ProgramConfiguration database
Also make the follow on changes to everything that uses Program.
The notion of a program is now split into the abstract notion of a program
that we know about and might be able to configure, and a configured program
that we can actually run. The ProgramConfiguration database is similarly
split. We still keep user-supplied loation and arguments and use them when
we configure programs. The abstract Program now has functions to search for
the program on the system and for finding the version number. This allows
for more generic configuration of programs.
717acac
@dcoutts dcoutts Add a sanity check that the ghc and ghc-pkg versions should be equal
This was easy to do now that Programs know how to find their version numbers.
9f72d0b
@dcoutts dcoutts Make configure much less verbose by default and give useful output wi…
…th -v

This actually brings it into line with the other commands which do not produce
much output by default. It is very very quiet by default now though.
To make the -v output nice we have to lower the verbosity one notch in places.
4372e19
@dcoutts dcoutts Trivial reformatting b7ec438
@dcoutts dcoutts We don't need a short option configure flag for selecting nhc
I don't think we need one for ghc either, but perhaps we shouldn't remove
that immediately as people might be using it. It's safe to remove -n now
becuase nobody is relying on it as nhc support is still incomplete.
5834c5c
Commits on Aug 19, 2007
@RossPaterson RossPaterson Hugs: get dropDrive from current version of filepath aa20bc7
@RossPaterson RossPaterson tweak #if's to avoid treating non-GHC as old GHC d1afb8f
Commits on Aug 22, 2007
@dcoutts dcoutts The prologue.txt is not needed for anything
The text from the description is now used for haddock
52a2795
@dcoutts dcoutts The prologue.txt is not needed for anything
The text from the description is now used for haddock
ea20af9
Commits on Aug 23, 2007
@dcoutts dcoutts Fix register --gen-script
It's still useless on Windows.
ed2efd0
@dcoutts dcoutts Swap haddock inplace/install dirs that were accidentally the wrong wa…
…y round
e4c1020
@dcoutts dcoutts Don't include the massive list of --with-prog --prog-args flags in he…
…lp text

Instead have just two generic ones in the help text and at the bottom,
list the programs that the flags apply to.
This still needs to be properly word wrapped to fit in 80 cols (as does the
rest of the help text).
c5e7b74
@dcoutts dcoutts Make the GetOpt help text fit in 80 cols by wrapping the description
And reduce the padding slightly.
The configure help text look slightly less terrible now, though we've still
got too many long flags and short flags with long arg names so there's not
really enough width for the description so it wraps in too many cases.
9c4a879
@dcoutts dcoutts Wrap the configure help text program list and rename the prog arg tem…
…plates

Use "--with-PROG=" rather than "--with-<program>" since the other subsitution
bits like ARGS, PATH etc are upper case contractions. So it's more consistent.
e40af20
@dcoutts dcoutts Hack to supress a warning when building Cabal
Normally we'd warn if using a new format cabal file and a cabal-version >= 1.2
field is not specified in the cabal file. However we cannot do this for cabal
itself or we'd not be able to bootstrap. So we just supress the warning for
the package "Cabal".
c02050c
@dcoutts dcoutts Add a "build-tools:" field to the cabal file format
It's the same format as the build-depends, eg:
build-tools: cpphs, c2hs >= 0.15
During the configure step we try to configure the listed programs and
if a version range is specified then we check that it is satisfied.
2eef2a7
Commits on Aug 24, 2007
@dcoutts dcoutts Remove unused --enable-haddock-use-packages flags
The feature they controled had been removed but
the --enable/disable flag had not been removed.
d688edb
@dcoutts dcoutts Document lots of flags and the new build-tools: field
Document the following options:
--enable-library-for-ghci / --disable-library-for-ghc
--enable-library-vanilla / --disable-library-vanilla
--enable-split-objs / --disable-split-objs
--jhc
--save-configure
--with-PROG= --PROG-args=
--gen-pkg-config=
915ad19
@dcoutts dcoutts Look for install-includes in . first, then in include-dirs
Since .h files listed in install-includes need not be in the include-dirs
search path at all.
4be726f
@dcoutts dcoutts Only create includes and bin dirs if necessary
For includes, don't list the include dir in the package registration
info unless we're actually going to install some include files.
So we should create fewer pointless empty directories. See bug #97.
c9a0378
@dcoutts dcoutts Add install-includes .h files to the sdist tarball d5a809d
@dcoutts dcoutts Update documentation on install-includes field ba520cd
@dcoutts dcoutts Install any license file 480ac0b
@clefru clefru Import FilePath.dropDrive for hugs and GHC>6.6. In all other cases, p…
…rovide our own.
e56b169
@clefru clefru Add docDirTemplate for inplace package config files 9f22c78
@clefru clefru Add --enable-shared as configure argument, and ghc-shared-options as …
….cabal field
3cabc53
@clefru clefru Add mkSharedLibName to D.Simple.Utils for DSO filename mangling 79c0aa3
@nominolo nominolo Remove the use of 'normalise' since it is currently broken (normalise
"./" => "/"!) and we don't need it that much, right now.
2e31e57
@clefru clefru Move GHC Makefile's .depend into dist/build aa516f2
@dcoutts dcoutts Change installation layout on Windows slightly
Make Haskell part of the default $prefix and make docs relative
to $prefix rather than $datadir which is fixed for libs.
Make the default fixed lib $datadir be Program Files\Haskell rather
than Common Files.
468a662
Commits on Aug 25, 2007
@dcoutts dcoutts remove unused imports 1159b8f
@dcoutts dcoutts correct copy'n'pasted comment 38b5c4f
@dcoutts dcoutts Use dllExtension rather than reimplementing it locally f3c31c7
Commits on Aug 26, 2007
@dcoutts dcoutts Move several modules under .Simple
Compiler, Program, PreProcess and Setup are really part of the Simple
build system.
Also move a couple GHC modules under Simple.GHC.*
1791f3b
Commits on Aug 28, 2007
@clefru clefru Add dynlibdir to InstallDirs 3d062e6
@dcoutts dcoutts Move defaultCompilerFlavor into Distribution.Compiler f275e0d
@dcoutts dcoutts Rename searchPath to findProgramOnPath e6d7cfc
@igfoo igfoo Rejig the register code a bit 7d2b30c
Commits on Aug 29, 2007
@dcoutts dcoutts More register cleanups to do with ghc-pkg args bb1d5d1
@dcoutts dcoutts Don't use the compilerProg and compilerPkgTool, use the ProgramConfig…
…uration

Except for reporting, we use the ProgramConfiguration directly.
Less duplication of information this way.
790138f
@dcoutts dcoutts Add rawSystemProgramStdout, the Program variant of rawSystemStdout 3857d0e
@dcoutts dcoutts Make getInstalledPackages use ProgramConfiguration rather than Compiler
These should be moved into the GHC and JHC modules, possibly with some
unifying version if that make sense.
624bfb1
@dcoutts dcoutts Remove compilerProg & compilerPkgTool from Compiler
This info is redundant since the compiler-specific code knows what
programs to run and it can get that from the ProgramConfiguration.
fb6500e
@dcoutts dcoutts Reorder configure message about what compiler we're using e3e460c
@igfoo igfoo Define delete in Distribution/Compat/Map.hs
Fixes the build with old GHCs.
455a171
Commits on Aug 30, 2007
@dcoutts dcoutts Make checking program versions not produce error spew
Redirect stderr to /dev/null (or NUL on windows) and throw an exception
like rawSystemExit does rather than calling die which prints an unhelpful
message before throwing an exception. It's not an overall failure to not
be able to establish the version of a program, since we check later if we
actually have any requirement for any particular version anyway.
So for example this makes running configure with an old version of c2hs
that doesn't grok --numeric-version not produce unhelpful output that
make people think that configure failed.
633bb46
@dcoutts dcoutts Install license file into docdir rather than datadir 8046c81
@dcoutts dcoutts for c2hs, look for .chi files in dist/build rather than hs-src-dirs
Since when we run c2hs we put .chi files into dist/build so that's also
where we should be looking for them.
2cbc2d2
Commits on Aug 31, 2007
@RossPaterson RossPaterson track renaming of GHCMakefile.in 441eb61
@RossPaterson RossPaterson fix 'Make checking program versions not produce error spew' for non-GHC 3dd90a7
@dcoutts dcoutts Update user guide on Windows installation paths, and add default for …
…docdir
6479bdb
@dcoutts dcoutts Display the appropriate install messages for lib vs exes
Don't confuse users by suggesting that we're installing libs when we're
actually only installing exes, or vica-versa.
46d2eb7
@dcoutts dcoutts Refactor the internal handling of the "--user" flag into a PackageDB …
…type

PackageDB can be user/global or a specific package db. The latter option is
not exposed in the user interface anywhere.
Also move the getInstalledPackages into the per-compiler modules with a
non-compiler-specific wrapper left in Distribution.Simple.Configure
a4f4729
@dcoutts dcoutts Add util function allBuildInfo :: PackageDescription -> [BuildInfo]
The 'BuildInfo' for the library (if there is one and it's buildable)
and all the buildable executables. Useful for gathering dependencies.
24a5f7d
@dcoutts dcoutts Move build-tools into the lib/exe stanzas and update configure
configure now has to gather the required build tools from the BuildInfo
of the lib and exes.
f22c77f
@dcoutts dcoutts Add a pkgconfig-depends: field to the .cabal file f7b16a6
@dcoutts dcoutts Use pkg-config to check for the packages specified in "pkgconfig-depe…
…nds:"

And fill out the includeDirs, extraLibs, extraLibDirs, ccOptions and ldOptions
with the results from pkg-config --cflags --libs
47d9dd8
@dcoutts dcoutts Update the user guide on where the build-tools: field lives
It's now part of the build information rather than package description,
which is as it should be.
04d24b9
@dcoutts dcoutts Document the new "pkgconfig-depends:" field abd5cf3
@igfoo igfoo Don't pass docdir to ./configure, as older autoreconfs don't support it acf92f9
Commits on Sep 01, 2007
@RossPaterson RossPaterson Maintainer is now cabal-devel@haskell.org ed2d767
@dcoutts dcoutts Don't use normalise when parsing configure arguments fed5e4d
@dcoutts dcoutts Add --prog-arg= and make --prog-args parse quotes
So this provides two ways of passing options that contain embeded spaces:
--foo-args='--bar --baz="path with spaces in"'
--foo-arg=--bar --foo-arg=--baz="path with spaces in"
all args passed this way are collected in order.
1bc7ca9
@dcoutts dcoutts Pass --configure-option= options to configure in the right order
in the same order as they were passed to cabal configure on the command line
1136b18
Commits on Sep 02, 2007
@dcoutts dcoutts Change --configure-option= to --configure-arg=
For consitency with other flags.
d8ff538
@igfoo igfoo Suppress some warnings d3c29d9
@igfoo igfoo Warning supression for Windows 0f004d6
@dcoutts dcoutts Change --configure-option= to --configure-arg=
For consitency with other flags.
5ea435a
@dcoutts dcoutts Rename --prog-args to --prog-options
amd --prog-arg to --prog-arg and update the user guide.
3720d00
Commits on Sep 03, 2007
@dcoutts dcoutts Remove register --with-hc-pkg flag
It was just a hack for the benefit of ghc and we don't need it now.
a026873
@dcoutts dcoutts Make userSpecifyArgs update the args even if the prog is configured a…
…lready
f30bdfe
@dcoutts dcoutts Generalise build --ghc-option flag to --prog-option for any prog
and remove makefile --ghc-option flag as it's not used (as far as I can see).
It works generically by updating the ProgramConfiguration rather than the
previous ad-hoc implementation. This feature is generally only useful for
hackers who want to pass extra args to a progam during the build step
(probably as a one-off) without having to reconfigure.
6ca3be1
@dcoutts dcoutts Fix haddock markup
Thanks to int-e for reporting
632696b
@dcoutts dcoutts Oops, fix Distribution.Make ac89930
@dcoutts dcoutts Remove unused helper function
Ok to remove, it never appeared in any release.
c57feac
Simon Marlow make this buildable with GHC 6.2.x 58a6836
Commits on Sep 05, 2007
@dcoutts dcoutts Rewrite the parser for the configuration structure to allow laout or …
…braces

Joint work with Thomas Schilling.
The sections and indeed fields (and if/else) can now use either explicit
brace {} style layout or indentation eg:
> library
>   exposed-modules: Blah
or
> library {
>   exposed-modules:
> }
layout style can be nested within explict braces style and vica versa.
Also add some more checks and relax the tab checks.
Unrecognised sections, like unrecognised fields, are not fatal errors,
so we could add sections in future without breaking old cabal.
ffc8157
Commits on Sep 06, 2007
@dcoutts dcoutts Update authors list in LICENSE and remove duplicate copyright file
We currently have 39 different authors, all those with a significant number
of patches are listed as copyright holders in the LICENSE file.
5627043
@dcoutts dcoutts Update changelog 14784b9
@dcoutts dcoutts Use layout rather than braces {} for sections in our own .cabal file
Since we can and we want to set a good example.
b77c441
@dcoutts dcoutts Fix haddock markup 4da27e1
@dcoutts dcoutts Bump version number to 1.2.0 34abfe0
@dcoutts dcoutts note need to use -i when bootstrapping ghc, and update coders list b87ca33
@dcoutts dcoutts Remove now-empty dependencies dir
Not needed since cabal-install moved to another repo.
f2b480f
@dcoutts dcoutts TAG 1.2.0 6ffb2e2
Malcolm.Wallace nhc-options should be spelled nhc98-options 50609e0
Malcolm.Wallace Fix various mispellings of nhc98. c75898f
Malcolm.Wallace spell nhc98-options correctly 1280873
@igfoo igfoo TAG 2007-09-06 8d74a23
Malcolm.Wallace fix broken #ifdefs for nhc98 49586d0
Malcolm.Wallace fix type clash: Data.Version -> Distribution.Version 256a57e
Commits on Sep 11, 2007
@igfoo igfoo Don't forcibly append "pkgName (package pkg_descr)" to htmldir 6821345
Commits on Sep 12, 2007
@igfoo igfoo Add a --htmldir flag dd1b4c3
@igfoo igfoo Add htmlDirTemplate to inplaceDirs d9f2da4
@igfoo igfoo Fix haddockDir 7b6b86a
@dcoutts dcoutts Use confgurations to help build Cabal for ghc-6.2.x
Replacing a long-standing comment telling people how to do it manually.
fc2490f
@dcoutts dcoutts Don't create empty data dirs. Fixes bug #153.
Patch contributed by Sven Panne.
319bbb8
Simon Marlow use OPTIONS instead of OPTIONS_GHC for now, the latter doesn't work w…
…ith GHC 6.2.x
68ffb0a
Commits on Sep 13, 2007
@igfoo igfoo Add a boring file 7dae1b1
@nominolo nominolo Display warning if sections are found within other sections. This
most likely represents an error (missing colon after field name).

This patch is only for the Cabal 1.2 branch; the proper fix requires
more complex changes.
b1edd8c
Commits on Sep 17, 2007
@dcoutts dcoutts Put _stub.{c|h} files under dist/ so they'll get cleaned. Fixes bug #154
.

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.
6fc6431
@dcoutts dcoutts look in odir for source and .hs files, not buildDir lbi
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.
e064c5c
@dcoutts dcoutts Correct the verbosity range in the "--help" text
The correct range in 0--3, not 0--2 or 0--5
30885b9
@dcoutts dcoutts Put setup program and setup .o/.hi files into dist/setup
That way they get cleaned automatically and do not clutter the top dir.
107074d
@dcoutts dcoutts Pass on all the cabal-setup options to cabal, not just unrecognised ones
So for example -v and -w get passed on rather than swallowed by cabal-setup
itself.
cf96959
@dcoutts dcoutts Note in .cabal file that we're using a custom build-type ad731ff
@dcoutts dcoutts Move expensive conviguration actions inside branch where they're used
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.)
ee135f8
Commits on Sep 20, 2007
@dcoutts dcoutts Add a Distribution.Setup module that re-exports Distribution.Simple.S…
…etup

Many Setup.hs files import Distribution.Setup so this unbreaks them.
It's marked DEPRECATED so will generate a warning for scripts that use it.
This patch is only going to the cabal-1.2 branch, not HEAD.
79e4cc6
@igfoo igfoo Remove some now-unecessary cleaning that causes problems for haskell-src
The code that removes .hs files in the source tree generated from .y files
had a comment:
    XXX: This is actually no longer necessary, but we keep it, so that
    clean works correctly on packages built with an older version of Cabal
This was causing problems for source distributions that include such
generated files (including haskell-src in extralibs).
8a1a83d
Commits on Sep 22, 2007
@dcoutts dcoutts Fix pre-processing for executables
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.
c5c6616
Commits on Sep 23, 2007
@igfoo igfoo Fix warnings 115af2d
Commits on Sep 24, 2007
@dcoutts dcoutts Don't generate links when dependent docs not installed. Fixes bug #157.
Generates a warning rather than failing as before.
a7971d1
Commits on Sep 25, 2007
@nominolo nominolo Translate flat files into sectionized files, by duplicating global
dependecies into each non-empty section.  The previous solution dumped
them into the library section, even if it would have been empty
otherwise.
a1cfad6
@nominolo nominolo Improve error messages for failed sanity checks. ceabbae
@dcoutts dcoutts Be more fuzzy with os, arch and impl matching in conditions. Fixes bug
…#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".
5eff542
Commits on Sep 26, 2007
@dcoutts dcoutts The -stubdir flag is supported in ghc-6.6 not just 6.6.1 d01d5f2
@dcoutts dcoutts Actually -stubdir only works well in ghc-6.8 due to -I search dir mess
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.
af7c668
Commits on Oct 04, 2007
bjorn Haddock comment for the available dependencies argument to finalizePa…
…ckageDescription.
72b5866
Commits on Oct 05, 2007
bjorn Fix GenericPrackageDescription pretty printing to make it parsable. I…
…t still does not include all information.
4cb3075
bjorn Expose parseDescription. 02f6cfd
Commits on Oct 06, 2007
bjorn Rename parseDescription to parsePackageDescription.
This should be pushed to cabal-1.2 to make cabal-install work with 1.2.
24ec03b
bjorn Remove commented-out code.
Push to 1.2.
78eed0c
Commits on Oct 11, 2007
@dcoutts dcoutts Use -O2 for compiling .c files when we configure --enable-optimization
Seems a reasonable default behaviour.
bd1ad15
Commits on Oct 12, 2007
@dcoutts dcoutts Update documentation on configurations
Describe the new syntax and make variuous changes to the
description of the meaning.
85b9639
@dcoutts dcoutts Add logging functions notice, info, debug functions and use them cons…
…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.
78f0de1
Commits on Oct 13, 2007
bjorn Pass -w -v0 to ghc when compiling Setup.{lhs,hs} in SetupWrapper when…
… verbosity == silent.
09fdeb6
bjorn Change --verbosity= option of SetupWrapper (cabal-setup) to --verbose…
…=, since that is what the rest of Cabal uses.
e181ffa
bjorn Pass -c (silent create) to ar when verbosity < normal. fc3012c
Commits on Oct 14, 2007
@dcoutts dcoutts Move ghcVerbosity function into GHC module to share code 424cb23
Commits on Oct 16, 2007
@dcoutts dcoutts Change the handling of cpp & ghc flags for hsc2hs
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.
3f22d91
bjorn When parsing ghc-pkg output, only look at the first package.conf file…
… 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.
aaadf6f
Commits on Oct 17, 2007
@dcoutts dcoutts Figure out if hsc2hs is using gcc or ghc as it's C compiler
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.
50d87f8
@dcoutts dcoutts Add a "cpp-options:" field and use it for pre-processing .hs .hsc .ch…
…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.
692bc72
@dcoutts dcoutts Use cpp-options rather than abusing ghc-options
Cabal-1.2 branch version of an equivalent patch in Cabal HEAD
181b9af
@dcoutts dcoutts Bump minor version number to 1.2.1
We've added a couple minor features since 1.2.0
59c4f1a
Commits on Oct 18, 2007
@dcoutts dcoutts Update changelog for 1.2.1 ae39153
@dcoutts dcoutts Correct the spelling of mingw32 in os alias list
Doh!
53e5638
@RossPaterson RossPaterson don't fail if xxx_hsc_make.c is gone
The non-GHC hsc2hs deletes it even if the compilation fails.
50e8ff9