Reorganisation of the source tree

Most of the other users of the fptools build system have migrated to
Cabal, and with the move to darcs we can now flatten the source tree
without losing history, so here goes.

The main change is that the ghc/ subdir is gone, and most of what it
contained is now at the top level.  The build system now makes no
pretense at being multi-project, it is just the GHC build system.

No doubt this will break many things, and there will be a period of
instability while we fix the dependencies.  A straightforward build
should work, but I haven't yet fixed binary/source distributions.
Changes to the Building Guide will follow, too.

1 files changed, 130 insertions, 0 deletions

diff --git a/compiler/ilxGen/tests/Makefile b/compiler/ilxGen/tests/Makefile
new file mode 100644
index 0000000000..423839c9e8
--- /dev/null
+++ b/compiler/ilxGen/tests/Makefile
@@ -0,0 +1,130 @@
+
+TOP = ../../..
+include $(TOP)/mk/boilerplate.mk
+
+WAYS=$(GhcLibWays)
+
+#-----------------------------------------------------------------------------
+# 	Setting the standard variables
+#
+
+HC = $(GHC_INPLACE)
+SRC_HC_OPTS+=-cpp -fglasgow-exts
+
+#-----------------------------------------------------------------------------
+# 
+CORENV_DEBUG=
+CORENV_RETAIL=
+LOCALRUN=./
+ifeq ($(HOSTNAME),MSRC-HILDA)
+CORENV_DEBUG="call devcorb2gen.bat checked"
+CORENV_RETAIL="call devcorb2gen.bat free"
+LOCALRUN=.\\
+endif    
+
+ghc:
+	$(MAKE) -C ../.. 
+
+ilx:
+	$(MAKE) -C $(ILX2IL_HOME) ilxdefault
+
+prel: ilx
+	$(MAKE) -C ../../../lib/std std.$(ilx_way).dll std.$(ilx_way).vlb
+
+#========================================================================
+# 1. From Haskell to ILX and then to IL - see build.mk 
+
+#------------------------------------------------------------------------
+# 2. From IL to .EXE
+
+%.$(ilx_way).exe : %.$(ilx_way).il ../Entry.$(ilx_way).il 
+	cat $*.$(ilx_way).il ../Entry.$(ilx_way).il > $@.tmp
+#	echo "call devcorb2gen free" > tmp.bat
+	echo "ilasm /DEBUG /QUIET /OUT=$@ $@.tmp" >> tmp.bat
+	cmd /c tmp.bat
+
+../Entry.$(hs2ilx_suffix)_o: ../Entry.ilx
+	sed -e "s|ilx std|ilx std.$(hs2ilx_suffix)|g" ../Entry.ilx > $@.tmp
+	mv $@.tmp $@
+
+
+%.$(ilx_way).mvl:  %.$(ilx_way).il
+	(ILVALID_HOME=c:\\devel\\fcom\\src\\ ILVALID_MSCORLIB=mscorlib.vlb $(ILVALID) c:\\devel\\fcom\\src\\bin\\msilxlib$(ilx2il_suffix).vlb $(TOP)/lib/std/std.$(ilx_way).vlb $<) 2>&1
+
+
+#------------------------------------------------------------------------
+# From .HS to .EXE without using ILX
+# Used to run performance comparisons against native code GHC
+
+%.Onot.exe: %.hs
+	$(GHC_INPLACE) -Onot -o $@ $<
+
+%.O.exe: %.hs
+	$(GHC_INPLACE) -O -o $@ $<
+
+WIN_TOP_ABS = $(subst /,\,$(FPTOOLS_TOP_ABS))
+WIN_ILX2IL_HOME = $(subst /,\,$(ILX2IL_HOME))
+
+app.config:
+	echo "<configuration>" > $@
+	echo "<runtime>" >> $@
+	echo "<assemblyBinding xmlns=\"urn:schemas-microsoft-com:asm.v1\">" >> $@
+	echo "<probing privatePath=\"$(WIN_TOP_ABS)\\ghc\\lib\\std;$(WIN_ILX2IL_HOME)\\bin\"/>" >> $@
+	echo "</assemblyBinding>" >> $@
+	echo "</runtime>" >> $@
+	echo "</configuration>" >> $@
+
+%.run: %.exe app.config
+	time -p $<
+
+#------------------------------------------------------------------------
+# Running:
+
+HSstd_cbits.dll: $(DLL_PEN)/HSstd_cbits.dll
+	cp $< $@
+
+%.cordbg.run: HSstd_cbits.dll %.exe
+	cp app.config $@.config
+#	echo "call devcorb2gen fastchecked" > $@.bat
+	echo "$(LOCALRUN)$(subst /,\\,$*).exe 2>&1" >> $@.bat
+	time -p cmd /c $(subst /,\\,$@).bat
+	rm $@.bat
+
+%.debug.run: HSstd_cbits.dll %.exe
+	cp app.config $@.config
+#	echo "call devcorb2gen fastchecked" > $@.bat
+	echo "$(LOCALRUN)$(subst /,\\,$*).exe 2>&1" >> $@.bat
+	time -p cmd /c $(subst /,\\,$@).bat
+	rm $@.bat
+
+%.retail.run: HSstd_cbits.dll %.exe
+	cp app.config $@.config
+#	echo "call devcorb2gen free" > $@.bat
+	echo "$(LOCALRUN)$(subst /,\\,$*).exe 2>&1" >> $@.bat
+	time -p cmd /c $(subst /,\\,$@).bat
+	rm $@.bat
+
+
+%.run: %.exe
+	time -p $<
+
+
+#--------------------
+
+%.mvl: %.nolib.il
+	ILVALID_HOME=$(ILX2IL_HOME) $(ILVALID) $*.nolib.il
+
+ci:
+	(cd $(ILX2IL_HOME); $(CVS) ci -m "")
+	(cd ../..; cvs ci -m "")
+	(cd ../../../lib/std; $(CVS) ci -m "")
+
+upd:
+	(cd $(ILX2IL_HOME); $(CVS) up)
+	(cd ../..; $(CVS) up)
+	(cd ../../../lib/std; $(CVS) up)
+
+
+.PHONY: %.run
+
+include $(TOP)/mk/target.mk