GitLab

Fixes to the hc-file-bundle

Submitted by: Urban Boquist <boquist@crt.se>

Adapt the dist target a little to work with the nightly build's new
way of building source dists.

It now works by building a link tree to the build tree, and doing
'make dist' on the link tree, to avoid destroying the real build tree.
This just needed a couple of tweaks to the dist target to work.

Towards a complete binary package.

- If we're building GHC, then default to building+installing stage 2.

Add support for gcc-style "make bootstrap" which will build the stage
1, 2 and 3 compilers in the same build tree.

The idea is to simplify building a stage 2 or 3 compiler (now you only
need one build tree), and also speed up the build: there's no need to
compile the libraries more than once, because the stage 1 libraries
are used for stages 2 & 3.

In ghc/compiler, the objects and .hi files are now placed in
subdirectories: ghc/compiler/stage1 has the stage1 objects,
ghc/compiler/stage2 has the stage2 objects, etc.

The story from the top-level (fptools) is this:

  make all 	  works as before (i.e. builds ghc (stage 1),
		  libraries, etc.)

  make stage2     builds the stage 2 compiler
  make stage3     builds the stage 3 compiler

  make bootstrap  does 'make all' followed by 'make stage2'
  make bootstrap3 does 'make all' followed by 'make stage2; make stage3'

In ghc/compiler, the story is now:

  make all	     works as before (i.e. builds stage 1 only)

  make boot          generate build dirs and dependencies for stage 1
  make boot stage=N  generate build dirs and dependencies for stage N

  make stageN
  make stage=N       builds stage N compiler.  Run it in-place using
		    ./stageN/ghc-inplace.

I haven't decided what to do about 'make install' yet, and this still
needs documenting in the Building Guide.  Also, you still get the same
$(GhcHcOpts) for each stage.

.PHONY: package-way-dist

wibble in dist-manifest rule (writing to MANIFEST.tmp isn't necessary
and may hide errors)

s/rm -f/$(RM)

revert part of previous commit; looks like it was accidental

wibble

hc-file-bundle:
  * only include the .hsc-derived .hs files that exist in the build tree.
  * updated to include current happy-derived .hs files

find ~=> $(FIND)

For a binary distribution, install docs using the standard
install-docs target rather than hacky copying (needed now that we use
Haddock for building some of the docs too).

Include directories called 'tests' in source distributions

all: restore old behaviour of exiting upon 'boot' failure in a SUBDIR

Do 'make boot' then 'make all' as separate steps (fixes problem with
parallel make).

Use $(MAKE) rather than literal "make" when making happy-inplace

add missing file to source dist

running binary-dist without having BIN_DIST set is now a no-no, I believe.

hc-file-bundle: removed dangling ParseIface.hs pointer

hc-file-bundle (pt2): sigh, make that PrimopWrappers.hs

hc-file-bundle: new location of PrimWrappers.hs (nee PrelPrimOpWrappers.hs)

updates & fixes to hc-bootstrapping story; from Thomas Nordin

have happy-inplace rule depend on glafp-utils/

If the configure script determined that the build-tree version of happy
is to be used, descend into happy/ and build it, if needs be.

Don't restrict doc building to i386-linux.  please merge.

Add install-docs target to top level.

Wemove WELEASE: thewe is no such fiwe.

Provide finer-grained control for turning off mk/target.mk's
'all', 'boot' and 'install' rules. i.e., instead of having
the variable NO_ALL_TARGETS control the defnition of rules
for all three, NO_ALL_TARGET, NO_BOOT_TARGET, and NO_INSTALL_TARGET
lets you individually control which ones you don't want.

Sub-projects (GC and HDirect, for example) have the need
to turn off the 'boot' rule, which is what motivated this
change.

- don't omit "test" dirs from the source distribution
- remove some backslashes from the sed commands to make them work here

Fix the "find" commands we use to build a source distribution.
Previously, it said things like "-exec path/{}", which doesn't work
on many find's ({} really should only appear by itself in an argument).
Now we pipe the output of find -print to sed and then to sh.  I hope
the piping to sh doesn't break source distribution creation on Win32.

MERGE TO STABLE

a couple of tweaks to the hc-file-bundle target:
  - Add -r option to ${RM} to blow away an existing binary-dist
    temporary directory if present.
  - Fix bogons in the bundle building code.

oops, cut-n-paste removed tabs

The hc-file bundle should contain the .hs files generated from .hsc
files because of a chicken-egg problem with building hsc2hs.

- add missing .gz suffix to -hc.tar file.
- clean up hc-bundle droppings

Add a rule to build an hc-file tar bundle.

Makefile.config should be in a source dist.

never delete configure, even for maintainer-clean.

merge revision 1.52.2.1

Don't forget to copy mk/bootstrap.mk into the source distrib tree.