Ian Lynagh [Thu, 28 Aug 2008 19:15:12 +0000 (19:15 +0000)]
Use the right ghc-pkg when installing the rts package
Ian Lynagh [Thu, 28 Aug 2008 18:24:47 +0000 (18:24 +0000)]
When installing, we can't rely on the ghc-pkg we just installed to work
If DESTDIR is defined, then on *nix machines ghc-pkg is a script that
doesn't point to the right path. Therefore we use the ghc-pkg binary
directly.
Ian Lynagh [Thu, 28 Aug 2008 18:21:48 +0000 (18:21 +0000)]
Tweaks for installs into a DESTDIR
Ian Lynagh [Thu, 28 Aug 2008 15:14:29 +0000 (15:14 +0000)]
Handle the html target in compiler/ and ghc/
Ian Lynagh [Thu, 28 Aug 2008 14:23:20 +0000 (14:23 +0000)]
Turn on optimisation for stage2 when validating
This brings my validate down from 22mins to 16 mins.
Compiling stage2 takes longer, but we gain a faster haddock, faster
running of the tests, and faster building of the utils to be installed.
Ian Lynagh [Thu, 28 Aug 2008 14:22:10 +0000 (14:22 +0000)]
haddock 2 doc fixes
Ian Lynagh [Thu, 28 Aug 2008 13:23:16 +0000 (13:23 +0000)]
Remove an erroneous comma from the Makefile
Ian Lynagh [Thu, 28 Aug 2008 12:50:18 +0000 (12:50 +0000)]
Disambiguate some names in haddock comments
Ian Lynagh [Thu, 28 Aug 2008 12:48:14 +0000 (12:48 +0000)]
Update the build system to handle building and using haddock2
One side-effect of this is that we need to build the install-utils with
stage2 rather than stage1 as we need the ghc package.
Ian Lynagh [Thu, 28 Aug 2008 12:47:21 +0000 (12:47 +0000)]
Fix a haddock2 failure
Ian Lynagh [Thu, 28 Aug 2008 12:46:08 +0000 (12:46 +0000)]
Don't check that we have found haddock
We now use an in-tree haddock instead
Ian Lynagh [Wed, 27 Aug 2008 18:50:24 +0000 (18:50 +0000)]
Don't fail if libraries/bootstrapping already exists
Ian Lynagh [Wed, 27 Aug 2008 18:27:31 +0000 (18:27 +0000)]
When haddocking the libraries, tell Cabal where haddock is
We can't do it when configuring, because we haven't built haddock yet
Ian Lynagh [Thu, 14 Aug 2008 11:22:21 +0000 (11:22 +0000)]
Build haddock with the stage1 compiler
Ian Lynagh [Wed, 13 Aug 2008 22:01:58 +0000 (22:01 +0000)]
Teach darcs-all about absolute repos, and add haddock to packages
simonpj@microsoft.com [Thu, 28 Aug 2008 12:52:11 +0000 (12:52 +0000)]
Improve documentation of stolen syntax
This patch adds a section that summarises what syntax is stolen by
which flags. The section is at the end of the "syntactic extensions"
section of the manual.
simonpj@microsoft.com [Thu, 28 Aug 2008 12:10:06 +0000 (12:10 +0000)]
Fix Trac #2529: derived read for prefix constructor operators
simonpj@microsoft.com [Wed, 27 Aug 2008 15:33:22 +0000 (15:33 +0000)]
Fix Trac #745: improve error recoevery for type signatures
It turns out that fixing Trac #745 is easy using mapAndRecoverM,
and tidies up the code nicely in several places. Hurrah.
simonpj@microsoft.com [Wed, 27 Aug 2008 15:30:51 +0000 (15:30 +0000)]
Fix Trac #2538: better error messages when validating types
This fix solely concerns error messages, and uses a bit of contextual
information to suggest plausible flags.
It was rather more fiddly to implement than I expected. Oh well.
simonpj@microsoft.com [Wed, 27 Aug 2008 15:27:28 +0000 (15:27 +0000)]
Fix Trac #2520: duplicate symbols
The problem here was that were were quantifying over an *External* Name,
which causes no end of confusion. See Note [Const rule dicts] in DsBinds.
The fix is very easy, I'm happy to say.
simonpj@microsoft.com [Wed, 27 Aug 2008 15:25:40 +0000 (15:25 +0000)]
Only specialise on dictionaries that have some interesting structure
I discovered by accident that we were generating utterly useless
specialisations. See Note [Interesting dictionary arguments] in Specialise.
This patch used SimplUtils.interestingArg to restrict specialisation to
cases where the dictionary acutally has some information to give us.
simonpj@microsoft.com [Wed, 27 Aug 2008 15:19:26 +0000 (15:19 +0000)]
Better documentation for -XLiberalTypeSynonyms, and steal forall keyword
In my travels through the front end I discoverd that -XLiberalTypeSynonyms is
rather thinly described. Furthermore, it alleges that you can write a
forall on the RHS of a type synonym decl, so that means it should enable
the forall keyword.
Simon Marlow [Wed, 27 Aug 2008 10:24:14 +0000 (10:24 +0000)]
re-fix of #1205, fix #2542
New form of :load in GHCi:
> :load *A
forces A to be loaded as byte-code. See the manual for details. The
previous behaviour for specifying filenames vs. module names on the
command line and in :load has been restored.
The Target datatype has a new Bool field, which is True if the target
is allowed to be loaded from compiled code, or False otherwise, so
this functionality is available via the GHC API. guessTarget
understands the *-prefix form for specifying targets.
simonpj@microsoft.com [Wed, 27 Aug 2008 09:05:44 +0000 (09:05 +0000)]
Improve documentation of MagicHash and primitive types generally (Trac #2547)
Ian Lynagh [Tue, 26 Aug 2008 18:56:41 +0000 (18:56 +0000)]
Give locations of flag warnings/errors
Ian Lynagh [Tue, 26 Aug 2008 18:26:29 +0000 (18:26 +0000)]
Remove a now-redundant comment
Ian Lynagh [Tue, 26 Aug 2008 15:56:12 +0000 (15:56 +0000)]
Separate the static flag parser from the static global variables
This allows us to avoid a module import loop:
CmdLineParser -> SrcLoc -> Outputable -> StaticFlags -> CmdLineParser
Ian Lynagh [Tue, 26 Aug 2008 14:44:52 +0000 (14:44 +0000)]
Move pprFastFilePath from SrcLoc to Outputable
simonpj@microsoft.com [Tue, 26 Aug 2008 12:21:21 +0000 (12:21 +0000)]
Fix flaggery for RULES (cf Trac #2497)
This patch executes the plan described in the discussion in Trac #2497.
Specficially:
* Inside a RULE, switch on the forall-as-keyword in the lexer,
unconditionally. (Actually this is done by an earlier patch.)
* Merge the -XScopedTypeVariables and -XPatternSignatures flags,
and deprecate the latter. Distinguishing them isn't senseless,
but it's jolly confusing.
* Inside a RULE, switch on -XScopedTypeVariables unconditionally.
* Change -frewrite-rules to -fenable-rewrite-rules; deprecate the former.
Internally the DynFlag is now Opt_EnableRewriteRules.
There's a test in typecheck/should_compile/T2497.hs
Simon Marlow [Wed, 20 Aug 2008 13:29:11 +0000 (13:29 +0000)]
always treat 'forall' and '.' as reserved keywords inside RULES pragmas
simonpj@microsoft.com [Fri, 22 Aug 2008 13:34:27 +0000 (13:34 +0000)]
Fix a nasty float-in bug
This is a long-standing bug in FloatIn, which I somehow managed to
tickle (it's actually surprisingly hard to provoke which is why
it has not shown up before).
The problem was that we had a specialisation like this:
let
f_spec = ...
in let
{-# RULE f Int = f_spec #-}
f = ...
in
<body>
The 'f_spec' binding was being floated inside the binding for 'f',
which makes the RULE invalid becuase 'f_spec' isn't in scope.
We just need to add the free variables of the RULE in the right
places...
simonpj@microsoft.com [Thu, 21 Aug 2008 12:31:00 +0000 (12:31 +0000)]
Make rule printing wobble less
a) When generating specialisations, include the types in the name
of the rule, to avoid having rules with duplicate names.
(The rule name is used to put rules in canonical order for
fingerprinting.)
b) In Specialise and SpecConstr use a new function Rules.pprRulesForUser
to print rules in canonical order. This reduces unnecessary wobbling
in test output, notably in T2486
Ian Lynagh [Mon, 25 Aug 2008 21:41:24 +0000 (21:41 +0000)]
syb is now in its own package
Ian Lynagh [Mon, 25 Aug 2008 19:43:52 +0000 (19:43 +0000)]
Fix "runghc foo" where the program is foo.hs or foo.lhs
Ian Lynagh [Mon, 25 Aug 2008 19:09:12 +0000 (19:09 +0000)]
When making bindists, check that we know where we are
Ian Lynagh [Mon, 25 Aug 2008 18:32:47 +0000 (18:32 +0000)]
Fix the ghci script; fixes trac #2485
Ian Lynagh [Mon, 25 Aug 2008 15:42:49 +0000 (15:42 +0000)]
Update .darcs-boring for the new libraries, plus some other odds and ends
Ian Lynagh [Mon, 25 Aug 2008 14:59:08 +0000 (14:59 +0000)]
Read the packages file in strictly in darcs-all and push-all
This fixes a problem where darcs tries to update it while perl has it
open. On Windows this fails. Spotted by Claus Reinke.
Ian Lynagh [Mon, 25 Aug 2008 14:33:56 +0000 (14:33 +0000)]
Remove the InstallShield directory; it is no longer used
Ian Lynagh [Mon, 25 Aug 2008 14:32:14 +0000 (14:32 +0000)]
Remove the now-unused WindowsInstaller directory
Ian Lynagh [Mon, 25 Aug 2008 14:16:53 +0000 (14:16 +0000)]
Set datadir=libdir; fixes trac #2541
GHC needs package.conf and things like unlit to be in the same place
Ian Lynagh [Mon, 25 Aug 2008 12:09:07 +0000 (12:09 +0000)]
Get everything building with base 4 in the HEAD
Some things were using the base3 compat library.
Ian Lynagh [Sun, 24 Aug 2008 23:38:21 +0000 (23:38 +0000)]
Change references to the old BIN_DIST_TARBALL to the new BIN_DIST_TAR_BZ2
Ian Lynagh [Sun, 24 Aug 2008 17:51:06 +0000 (17:51 +0000)]
Fix the "have we got all the bootlibs" check
The packages file has an extra component (for "darcs" or "git") so we need
to take that into account when grepping.
Ian Lynagh [Sun, 24 Aug 2008 13:50:52 +0000 (13:50 +0000)]
concurrent, unique, timeout have now been split off from base
Ian Lynagh [Sun, 24 Aug 2008 13:50:32 +0000 (13:50 +0000)]
Actually tar up Windows bindists
Ian Lynagh [Sun, 24 Aug 2008 02:01:56 +0000 (02:01 +0000)]
getopt is now split off from base
Ian Lynagh [Sat, 23 Aug 2008 22:29:41 +0000 (22:29 +0000)]
st is now split off from base
Ian Lynagh [Thu, 21 Aug 2008 23:13:49 +0000 (23:13 +0000)]
Ignore install-docs in compiler/Makefile and ghc/Makefile
Ian Lynagh [Thu, 21 Aug 2008 22:35:37 +0000 (22:35 +0000)]
Fix making bindists
We were looking for executable things, but not requiring that they were
files. So we were adding lots of directories (and thus their contents)
to the bindists, massively inflating their size.
Ian Lynagh [Thu, 21 Aug 2008 17:31:02 +0000 (17:31 +0000)]
mk/cabal.mk now turns on -Wall
Ian Lynagh [Thu, 21 Aug 2008 17:30:51 +0000 (17:30 +0000)]
Fix warnings in runghc
Ian Lynagh [Thu, 21 Aug 2008 15:39:14 +0000 (15:39 +0000)]
Make some utils -Wall clean
Ian Lynagh [Thu, 21 Aug 2008 12:01:28 +0000 (12:01 +0000)]
unix is now warning-free
Ian Lynagh [Thu, 21 Aug 2008 11:06:20 +0000 (11:06 +0000)]
Fix references to exceptions from the RTS
We now need to make sure that they have been toException'd.
Also, the RTS doesn't know about the Deadlock exception any more.
Ian Lynagh [Thu, 21 Aug 2008 10:59:14 +0000 (10:59 +0000)]
It doesn't look like HSprel.def is used any more
Ian Lynagh [Thu, 21 Aug 2008 00:16:08 +0000 (00:16 +0000)]
base (and base3-compat) is no warning-free
Ian Lynagh [Wed, 20 Aug 2008 13:41:41 +0000 (13:41 +0000)]
Don't put symlinks in bindists, but the files they point at instead
Ian Lynagh [Mon, 18 Aug 2008 20:28:45 +0000 (20:28 +0000)]
Fix making it possible to build without the NCG
If
GhcWithNativeCodeGen = NO
then we don't build the NCG modules, and we define OMIT_NATIVE_CODEGEN
Ian Lynagh [Sun, 17 Aug 2008 21:08:51 +0000 (21:08 +0000)]
Comment fix
Ian Lynagh [Sun, 17 Aug 2008 21:02:26 +0000 (21:02 +0000)]
Remove GHC_TOP; we don't actually use it
Ian Lynagh [Sun, 17 Aug 2008 14:00:05 +0000 (14:00 +0000)]
We need to give make some more clues
Otherwise it can't work out how to make in ghc/ any more.
Ian Lynagh [Sun, 17 Aug 2008 12:33:11 +0000 (12:33 +0000)]
Change how we know whether or not we are validating
We now set Validating=YES in mk/are-validating.mk rather than on the
commandline. This means that if you build a tree with validate then
just running make in it will use the validate flags.
"make distclean" removes mk/are-validating.mk, putting us back in
standard build mode.
Ian Lynagh [Sun, 17 Aug 2008 12:10:00 +0000 (12:10 +0000)]
Don't clean the multi-stage stuff unless CLEAN_ALL_STAGES is YES
Ian Lynagh [Sun, 17 Aug 2008 11:42:02 +0000 (11:42 +0000)]
When making in compiler/, automatically make in ghc/ when we are done
Ian Lynagh [Sun, 17 Aug 2008 11:41:32 +0000 (11:41 +0000)]
Don't do the stage1 re-linking hack if we have GHC >= 6.9
Ian Lynagh [Sun, 17 Aug 2008 11:31:28 +0000 (11:31 +0000)]
Avoid scary "Package contains no library to register" message in installPackage
We only call register if we actually have a library to be registered
Simon Marlow [Thu, 21 Aug 2008 15:55:49 +0000 (15:55 +0000)]
Don't use the cc-options from packages when compiling .hc files
Now that we don't include any header files in .hc apart from our own,
the cc-options from packages are at best superfluous, so don't pass
them.
We still pass them to .c compilations, although I've just made changes
to Cabal so that cc-options from a .cabal file are not copied into the
InstalledPackageInfo. Most uses of cc-options in Cabal are clearly
intended to be local to the package, but they were being propagated
everywhere, almost certainly unintentionally.
The way is left open for Cabal to allow packages to specify cc-options
that get propagated in the future, if we find a use case for this.
simonpj@microsoft.com [Thu, 21 Aug 2008 12:35:02 +0000 (12:35 +0000)]
Improve error message when 'forall' is not a keyword
Simon Marlow [Thu, 21 Aug 2008 10:04:36 +0000 (10:04 +0000)]
move directory after Win32/unix
simonpj@microsoft.com [Thu, 21 Aug 2008 07:49:24 +0000 (07:49 +0000)]
Fix Haddock comments in TcGenDeriv
Simon Marlow [Wed, 20 Aug 2008 12:54:46 +0000 (12:54 +0000)]
Fix compacting GC on 64-bit machines
Some old experimental change leaked in with the parallel GC patches,
it seems
simonpj@microsoft.com [Wed, 20 Aug 2008 12:07:51 +0000 (12:07 +0000)]
Fix Trac #2456: eliminate duplicate bindings when deriving
Condsider deriving two overlapping Data declarations for the same type
deriving instance Data (T A)
deriving instance Data (T B)
We were getting duplicate bindings for the data-con and tycon auxiliary
bindings for T. This patch fixes the problem by doing these two decls
the same way as we do con2tag etc.
(Why might you want such instances; see Trac #2456.)
simonpj@microsoft.com [Wed, 20 Aug 2008 12:07:28 +0000 (12:07 +0000)]
Elaborate for-all message slightly
Simon Marlow [Tue, 19 Aug 2008 10:14:37 +0000 (10:14 +0000)]
set $(BOOTSTRAPPING_PACKAGE_CONF_HC_OPTS) automatically based on $(HC)
This fixes nofib
simonpj@microsoft.com [Tue, 19 Aug 2008 12:30:16 +0000 (12:30 +0000)]
Fix Trac #2518: add hs-boot files as an infelicty
Simon Marlow [Mon, 18 Aug 2008 11:35:55 +0000 (11:35 +0000)]
use System.FilePath's isSearchPathSeparator instead of our own
Simon Marlow [Mon, 18 Aug 2008 11:33:45 +0000 (11:33 +0000)]
FIX #2521: trailing colon in GHC_PACKAGE_PATH
This was broken in the System.FilePath switchover, since filepath's
splitSearchPath doesn't do what we want (it ignores empty
components on Windows, and treats them as "." on Unix). So we use our
own hand-rolled version, just like GHC.
Simon Marlow [Mon, 18 Aug 2008 11:24:34 +0000 (11:24 +0000)]
Test for and reject duplicate dependencies (#2330)
Ian Lynagh [Sat, 16 Aug 2008 15:21:35 +0000 (15:21 +0000)]
When doing :l, abandon all breakpoints before we unload everything
I'm not 100% sure if this is the right fix, but it seems sensible and
stops break008 segfaulting for me on amd64/Linux.
Ian Lynagh [Sat, 16 Aug 2008 13:09:10 +0000 (13:09 +0000)]
Comment fixes; trac #2468
Ian Lynagh [Thu, 14 Aug 2008 17:30:13 +0000 (17:30 +0000)]
Stop dph/dph-{par,seq} reconfiguring themselves all the time
Ian Lynagh [Wed, 13 Aug 2008 21:58:44 +0000 (21:58 +0000)]
Follow changes in Cabal
Ian Lynagh [Fri, 15 Aug 2008 11:49:39 +0000 (11:49 +0000)]
When distcleaning in utils/, distclean (rather then merely clean) the utils
Ian Lynagh [Tue, 12 Aug 2008 23:25:44 +0000 (23:25 +0000)]
Only clean utils/pwd/pwd when distcleaning, not when cleaning
Otherwise "make clean" in utils leaves us without a pwd, and lots of bad
things happen.
Ian Lynagh [Tue, 12 Aug 2008 23:24:46 +0000 (23:24 +0000)]
In cabal.mk, clean is no longer identical to distclean
distclean will now also remove files listed in EXTRA_DISTCLEAN
simonpj@microsoft.com [Thu, 14 Aug 2008 15:26:48 +0000 (15:26 +0000)]
Improve -fwarn-orphans documentation (thanks to Tim)
Simon Marlow [Thu, 14 Aug 2008 12:53:48 +0000 (12:53 +0000)]
Fix #2441 (unregister/expose/hide packages in non-first package databases)
Simon Marlow [Thu, 14 Aug 2008 12:53:12 +0000 (12:53 +0000)]
add --no-user-package-conf
Simon Marlow [Wed, 13 Aug 2008 14:47:07 +0000 (14:47 +0000)]
move INPLACE_DATA_DIR into mk/config.mk and share it
Simon Marlow [Wed, 13 Aug 2008 14:37:38 +0000 (14:37 +0000)]
FIX #1963: use Cabal's writeFileAtomic to write the new package.conf
This depends on #2298 also being fixed, which I'll do shortly
Simon Marlow [Wed, 13 Aug 2008 14:34:36 +0000 (14:34 +0000)]
FIX #2492: ghc-pkg insists on having HOME environment variable set
Simon Marlow [Wed, 13 Aug 2008 14:25:55 +0000 (14:25 +0000)]
FIX #2491 (ghc-pkg unregister should complain about breaking dependent packages)
Simon Marlow [Tue, 12 Aug 2008 14:16:06 +0000 (14:16 +0000)]
put back -fwarn-depcrecations
It was replaced by -fwarn-warnings-deprecations, but I think we want
to keep it for backwards compatibility. I'm not sure we want to
deprecate it either...
dias@eecs.harvard.edu [Wed, 13 Aug 2008 10:53:06 +0000 (10:53 +0000)]
add special globbing file for Windows to ghc-pkg.cabal
simonpj@microsoft.com [Wed, 13 Aug 2008 09:45:06 +0000 (09:45 +0000)]
Improve error message for deprecated flags (Trac #2513)
simonpj@microsoft.com [Wed, 13 Aug 2008 08:28:28 +0000 (08:28 +0000)]
Improve docs for orphan decls (thanks Yitzchak Gale)
Simon Marlow [Mon, 11 Aug 2008 14:41:58 +0000 (14:41 +0000)]
fix cut-and-pasto
Simon Marlow [Mon, 11 Aug 2008 14:38:31 +0000 (14:38 +0000)]
build base3-compat
Simon Marlow [Tue, 5 Aug 2008 13:37:02 +0000 (13:37 +0000)]
Don't warn if 'import Prelude' doesn't import anything
... even if Prelude doesn't come from the base package (it might come from
a old backwards-compatible version of base, for example).