Tue Jul 31 00:40:26 CEST 2007 Thomas Schilling <[EMAIL PROTECTED]>
* Display a more helpful error message, when unknown fields are
noticed.
New patches:
[Display a more helpful error message, when unknown fields are
Thomas Schilling <[EMAIL PROTECTED]>**20070730224026
noticed.
] {
hunk ./Distribution/PackageDescription.hs 1092
-parseFields descrs ini fields = foldM (parseField descrs) ini fields
+parseFields descrs ini fields =
+ do (a, unknowns) <- foldM (parseField descrs) (ini, []) fields
+ when (not (null unknowns)) $ do
+ warning $ render $
+ text "Unknown fields:" <+> commaSep (reverse unknowns) $+$
+ text "Fields allowed in this section:" $$
+ nest 4 (commaSep $ map fieldName descrs)
+ return a
+ where
+ commaSep = fsep . punctuate comma . map text
hunk ./Distribution/PackageDescription.hs 1103
-parseField :: [FieldDescr a] -> a -> Field -> ParseResult a
-parseField ((FieldDescr name _ parse):fields) a (F line f val)
- | name == f = parse line val a
- | otherwise = parseField fields a (F line f val)
+parseField :: [FieldDescr a] -> (a,[String]) -> Field -> ParseResult (a, [String])
+parseField ((FieldDescr name _ parse):fields) (a, us) (F line f val)
+ | name == f = parse line val a >>= \a' -> return (a',us)
+ | otherwise = parseField fields (a,us) (F line f val)
hunk ./Distribution/PackageDescription.hs 1108
-parseField [] a (F _ ('x':'-':_) _) = return a
-parseField [] a (F _ f _) = do
- warning $ "Unknown field '" ++ f ++ "'"
- return a
+parseField [] (a,us) (F _ ('x':'-':_) _) = return (a, us)
+parseField [] (a,us) (F _ f _) = do
+ return (a, f:us)
}
Context:
[Fix self-compile warnings.
Thomas Schilling <[EMAIL PROTECTED]>**20070730220537]
[Fix haddock markup
Ian Lynagh <[EMAIL PROTECTED]>**20070729233545
I haven't checked that it looks right, but it is now accepted by haddock.
]
[Pass ghc -package flags when using it as a C compiler in GHCMakefile
Ian Lynagh <[EMAIL PROTECTED]>**20070729152803
This means we get the CPP include directories included.
]
[Add a missing case in updateCfg
Ian Lynagh <[EMAIL PROTECTED]>**20070729105910]
[Resolve conflicts
Ian Lynagh <[EMAIL PROTECTED]>**20070729105854]
[Fix conflicts. Fix for changed argument to 'preprocessSources'.
Thomas Schilling <[EMAIL PROTECTED]>**20070728223322]
[Rename field.
Thomas Schilling <[EMAIL PROTECTED]>**20070728223102]
[Change HUnit module path to Test.HUnit (the default now).
Thomas Schilling <[EMAIL PROTECTED]>**20070728221453]
[Add note to 'clean' that it could be simpler, but for compatibility
Thomas Schilling <[EMAIL PROTECTED]>**20070728221342
reasons isn't (for now).
]
[Let sdist command run the preprocessors itself. This way we don't
Thomas Schilling <[EMAIL PROTECTED]>**20070728221237
have to put stuff into the source tree.
]
[Store resolved package description in local build info.
Thomas Schilling <[EMAIL PROTECTED]>**20070728221102
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.
]
[Export 'flattenPackageDescription'.
Thomas Schilling <[EMAIL PROTECTED]>**20070728215155]
[Minor documentation fix.
Thomas Schilling <[EMAIL PROTECTED]>**20070728214859]
[Modify test case.
Thomas Schilling <[EMAIL PROTECTED]>**20070728214825]
[Add function 'flattenPackageDescription'.
Thomas Schilling <[EMAIL PROTECTED]>**20070728214746]
[Avoid reporting the same missing dependecy twice.
Thomas Schilling <[EMAIL PROTECTED]>**20070728214645]
[Add documentation
Thomas Schilling <[EMAIL PROTECTED]>**20070728214541]
[Add documentation
Thomas Schilling <[EMAIL PROTECTED]>**20070728214444]
[Add/Fix test cases
Thomas Schilling <[EMAIL PROTECTED]>**20070728214410]
[Minor. Moved some code.
Thomas Schilling <[EMAIL PROTECTED]>**20070719222541]
[Add function 'ignoreCondition'.
Thomas Schilling <[EMAIL PROTECTED]>**20070719222444]
[Re-enable and extend test case.
Thomas Schilling <[EMAIL PROTECTED]>**20070719222341]
[Filter duplicate dependencies.
Thomas Schilling <[EMAIL PROTECTED]>**20070719222233]
[Adopt new CondTree data structure.
Thomas Schilling <[EMAIL PROTECTED]>**20070719125305
'finalizePackageDescription' now also takes dependencies of
executables into account.
]
[Change CondTree data structure to something more flexible.
Thomas Schilling <[EMAIL PROTECTED]>**20070719124655
This also requires some interface changes.
]
[Add simpler representation of a .cabal file with conditions.
Thomas Schilling <[EMAIL PROTECTED]>**20070717203942]
[Preprocessor output never gets written back to the source dir.
Thomas Schilling <[EMAIL PROTECTED]>**20070717174026
'preprocessSources' now gets an additional flag to determine whether
to process all sources (for building) or only platform independent
ones (for sdist).
]
[Add resolved package description to 'LocalBuildInfo'.
Thomas Schilling <[EMAIL PROTECTED]>**20070716204325]
[Fix removed import by importing a required accessor only.
Thomas Schilling <[EMAIL PROTECTED]>**20070716204238]
[Add tags target to generate a tags file using 'hasktags'. (Unix only)
Thomas Schilling <[EMAIL PROTECTED]>**20070716203015]
[Rename 'PreparedPackageDescription' to 'GenericPackageDescription'
Thomas Schilling <[EMAIL PROTECTED]>**20070716200427]
[Remove unused dependency.
Thomas Schilling <[EMAIL PROTECTED]>**20070716200215]
[Move configured_cabal to 'dist' directory.
Thomas Schilling <[EMAIL PROTECTED]>**20070716154146]
[Bugfix by Ian Lynagh: Cabal can't have a Cabal-Version header; it breaks bootstrapping
Thomas Schilling <[EMAIL PROTECTED]>**20070716151535]
[Partial bugfix to allow traditional .cabal files without a library but
Thomas Schilling <[EMAIL PROTECTED]>**20070628112301
global build dependencies. The correct solution is to add global
dependencies to each executable and implement dependency resolution
for executables.
The current workaround is to add the dependencies to the library, but
disable building of the library.
]
[Take advantage of configurations to build Cabal itself and fix bootstrapping problem.
Thomas Schilling <[EMAIL PROTECTED]>**20070628081438]
[Re-add configurations module to .cabal file. (Got removed on update.)
Thomas Schilling <[EMAIL PROTECTED]>**20070623204706]
[Properly fix tests.
Thomas Schilling <[EMAIL PROTECTED]>**20070623203939]
[Disable (comment out) tests for now. Break due to changed interface.
Thomas Schilling <[EMAIL PROTECTED]>**20070623203121]
[Fix typo.
Thomas Schilling <[EMAIL PROTECTED]>**20070623202333]
[Add proper handling of configurations to configure command.
Thomas Schilling <[EMAIL PROTECTED]>**20070623202017]
[Fix warnings.
Thomas Schilling <[EMAIL PROTECTED]>**20070623201723]
[Adjust to new package reading interface.
Thomas Schilling <[EMAIL PROTECTED]>**20070623201546]
[Downcase flagnames. Re-add config flags (were removed due to update).
Thomas Schilling <[EMAIL PROTECTED]>**20070623201455]
[Fix warnings.
Thomas Schilling <[EMAIL PROTECTED]>**20070623201254]
[Fix warnings, add documentation and changes in response to some
Thomas Schilling <[EMAIL PROTECTED]>**20070623201135
interface changes.
]
[Make explicit that reading package descriptions isn't supported here, ATM.
Thomas Schilling <[EMAIL PROTECTED]>**20070623200701]
[Fixed warning
Thomas Schilling <[EMAIL PROTECTED]>**20070623200522]
[Fixed warnings, added documentation, and changed os and arch names to
Thomas Schilling <[EMAIL PROTECTED]>**20070623200453
simple strings.
]
[Add helpers for reading and writing the file to hold a configured cabal-file.
Thomas Schilling <[EMAIL PROTECTED]>**20070618195710]
[Add commandline support for specifying defaults for flags.
Thomas Schilling <[EMAIL PROTECTED]>**20070618195449]
[Compatibility parsing and working configurations.
Thomas Schilling <[EMAIL PROTECTED]>**20070618195329]
[Pretty printing of conditions and CondTrees. Non-dependency
Thomas Schilling <[EMAIL PROTECTED]>**20070614125031
information of CondTrees is now a modifier. Move CondTree resolution functionality.
]
[Prototypical configurations
Thomas Schilling <[EMAIL PROTECTED]>**20070613184332]
[add line numbers to all field times
Thomas Schilling <[EMAIL PROTECTED]>**20070613173548]
[add flag as a section
Thomas Schilling <[EMAIL PROTECTED]>**20070613172416]
[added docs
Thomas Schilling <[EMAIL PROTECTED]>**20070613172309]
[fixed typo
Thomas Schilling <[EMAIL PROTECTED]>**20070613172230]
[Abstracted variables out of conditions. Generalized simplification
Thomas Schilling <[EMAIL PROTECTED]>**20070613172114
function to accept an arbitrary partial assignment of these
variables.
]
[Added Configuration parsing and simplification.
Thomas Schilling <[EMAIL PROTECTED]>**20070529210344]
[Extended low-level parsing routines to also allow labelled blocks and if-blocks.
Thomas Schilling <[EMAIL PROTECTED]>**20070529205958]
[Added documentation.
Thomas Schilling <[EMAIL PROTECTED]>**20070528211221]
[Use the right output directory when building C sources for executables
Duncan Coutts <[EMAIL PROTECTED]>**20070726213309]
[Use our own GetOpt if __GLASGOW_HASKELL__ >= 606 only
Ian Lynagh <[EMAIL PROTECTED]>**20070724213112
Used to be if __GLASGOW_HASKELL__ >= 604, but the 6.4 branch had a bug
which looks likely to be the cause of GHC build failures we're seeing:
- procNextOpt (NonOpt x) RequireOrder = ([],x:rest,us,[])
+ procNextOpt (NonOpt x) RequireOrder = ([],x:rest,[],[])
]
[-Wall police
Duncan Coutts <[EMAIL PROTECTED]>**20070724172023]
[Update user guide about haddock --css --hyperlink-source --hscolour-css
Duncan Coutts <[EMAIL PROTECTED]>**20070724160742
The haddock --css flag is new. The old --hscolour=[path] flag got split
into two flags: --hyperlink-source and --hscolour-css=path
]
[Remove a couple bits of unused code and imports
Duncan Coutts <[EMAIL PROTECTED]>**20070724110732]
[use nhc-Options rather than deprecated nhc98-Options
Duncan Coutts <[EMAIL PROTECTED]>**20070724110703]
[Hugs build: track change to install-includes
Ross Paterson <[EMAIL PROTECTED]>**20070724101816]
[Rename --hscolour to --hyperlink-source and add haddock --css flag
Duncan Coutts <[EMAIL PROTECTED]>**20070723190026
So now --hyperlink-source controles wether or not we run hscolour and
get haddock to link to the sources. The new flag --hscolour-css can
be used to override the css file that hscolour uses.
Also, the new flag --css can override the css file that haddock uses.
]
[Merges from hscolour patch and make it work with haddock-0.8
Duncan Coutts <[EMAIL PROTECTED]>**20070723180602
Some minor changes due to changes since the hscolour patch was written.
Make it work with haddock-0.8 by using %{MODULE} rather than %{FILE}
and generate output file names to match (ie not using the original file
extension, just using the module name for the output file).
]
[HsColour support
Roberto Zunino <[EMAIL PROTECTED]>**20070530194747
Integration of Cabal, HsColour, and Haddock.
(Also fixes bug #102)
]
[Remove ContextStack extension
Ian Lynagh <[EMAIL PROTECTED]>**20070709132341
Seems to be based on GHC's -fcontext-stack flag, which takes an integer
argument.
]
[Remove InlinePhase extension
Ian Lynagh <[EMAIL PROTECTED]>**20070708172919
As far as I can tell
(a) The -finline-phase flag stopped actually being accepted by GHC
sometime between GHC 4.08.2 and GHC 5.04.3
(b) It took an Int argument
]
[Add KindSignatures extension
Ian Lynagh <[EMAIL PROTECTED]>**20070708120616]
[Add the MagicHash extension
Ian Lynagh <[EMAIL PROTECTED]>**20070708111043]
[TAG 2007-06-29
Ian Lynagh <[EMAIL PROTECTED]>**20070629112545]
Patch bundle hash:
9a913401786c7df5e27a241c79a4724eac217905
_______________________________________________
cabal-devel mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cabal-devel
