[Axiom-developer] Building Axiom twice

[Waldek Hebisch]

The patch below eliminates the second build of Axiom and switches
tests to use AXIOMsys.  I also changed creation of target directories
to make it more logical. 

Remark1: We probably should make target directories at before starting
the proper build.  ATM we depend on previous stages to create target
directories which is error prone when we change build order -- in the
patch below I tried to create target directories when needed, but
this gets messy very quickly.

Remark2. From my point of view the stamp stuff in the main Makefile
is not doing anything usefull, Gaby may know what it was intended to
archive.

Remark3. For readability I removed diffs to generated files.

Remark4. ATM I can not test the patch properly, due to test breakage
on build-improvements that I reported earlier.


diff -ru build-improvements.bb/Makefile.pamphlet 
build-improvements/Makefile.pamphlet
--- build-improvements.bb/Makefile.pamphlet     2006-11-21 00:10:38.000000000 
+0100
+++ build-improvements/Makefile.pamphlet        2006-11-21 02:27:34.000000000 
+0100
@@ -263,10 +263,6 @@
 all-recursive: @axiom_required_build_utils@
 
 all-ax:
-       @ echo 1 making a ${SYS} system, PART=${PART} SUBPART=${SUBPART}
-       @ echo 2 Environment ${ENV}
-       @ $(MAKE) stamp-rootdirs
-       @ ${ENV} $(MAKE) $(src_stamp)
        @echo 3 finished system build on `date` | tee >lastBuildDate
 
 all-bootsys: $(lsp_stamp)
@@ -279,9 +275,6 @@
 <<noweb>>
 <<install>>
 
-$(src_stamp): $(lsp_stamp)
-       cd $(build_srcdir) && $(ENV) $(MAKE)
-
 $(lsp_stamp): $(lib_stamp)
        cd $(build_lspdir) && $(ENV) $(MAKE)
 
diff -ru build-improvements.bb/src/etc/Makefile.pamphlet 
build-improvements/src/etc/Makefile.pamphlet
--- build-improvements.bb/src/etc/Makefile.pamphlet     2006-11-21 
00:10:37.000000000 +0100
+++ build-improvements/src/etc/Makefile.pamphlet        2006-11-21 
21:36:04.000000000 +0100
@@ -13,6 +13,7 @@
 \section{The axiom command}
 <<axiomcmd>>=
 $(axiom_target_bindir)/axiom: $(srcdir)/axiom
+       $(mkinstalldirs) $(axiom_target_bindir)
        @echo 1 making $@ from $<
        @ $(INSTALL_SCRIPT) $< $@
        @chmod +x $(axiom_target_bindir)/axiom
@@ -79,6 +80,7 @@
 $(axiom_target_bindir)/asq: ${MID}/asq.c
        @echo 4 making $(axiom_target_bindir)/asq from ${MID}/asq.c
        @( cd ${MID} ; ${CC} ${CCF} -o asq asq.c )
+       $(mkinstalldirs) $(axiom_target_bindir)
        @ $(INSTALL_PROGRAM) ${MID}/asq $(axiom_target_bindir)
 
 ${MID}/asq.c: $(srcdir)/asq.c.pamphlet
diff -ru build-improvements.bb/src/input/Makefile.pamphlet 
build-improvements/src/input/Makefile.pamphlet
--- build-improvements.bb/src/input/Makefile.pamphlet   2006-11-21 
00:10:26.000000000 +0100
+++ build-improvements/src/input/Makefile.pamphlet      2006-11-21 
02:34:35.000000000 +0100
@@ -97,7 +97,7 @@
 
 .SUFFIXES: .input .out
  
-TESTSYS=  ${OBJ}/${SYS}/bin/interpsys
+TESTSYS= $(axiom_target_bindir)/AXIOMsys 
  
 IN=    $(axiom_src_srcdir)/input
 
diff -ru build-improvements.bb/src/interp/Makefile.pamphlet 
build-improvements/src/interp/Makefile.pamphlet
--- build-improvements.bb/src/interp/Makefile.pamphlet  2006-11-21 
00:10:26.000000000 +0100
+++ build-improvements/src/interp/Makefile.pamphlet     2006-11-21 
19:36:29.000000000 +0100
@@ -993,7 +993,7 @@
        @ echo 4 ${DEPSYS} created
 @
 
-\section{Building SAVESYS and AXIOMSYS}
+\section{Building SAVESYS}
 
 GCL likes to tell you when it has replaced a function call by a 
 tail-recursive call. This happens when the last form in a function
@@ -1007,8 +1007,6 @@
 Doing otherwise causes havoc.
 
 <<savesys>>=
-$(SAVESYS): $(axiom_build_bindir)
-
 ${OUT}/makeint.lisp:   ${DEPSYS} ${OBJS} ${OUT}/bookvol5.$(OBJEXT) 
${OUT}/util.$(OBJEXT) \
                 nocompil.lisp sys-pkg.lisp \
                ${OUTINTERP} ${OCOBJS} ${OPOBJS} ${BROBJS} 
${OUT}/obey.$(OBJEXT) \
@@ -1051,12 +1049,12 @@
        @ echo '#+:akcl (si::gbc-time 0)' >> ${OUT}/makeint.lisp
 
 ${SAVESYS}: ${OUT}/makeint.lisp
+       $(mkinstalldirs) $(axiom_build_bindir)
        @echo '(progn (gbc t) (load "${OUT}/makeint.lisp") (gbc t) 
(user::spad-save "$@"))' | ${LISPSYS}
        @ echo 6 ${SAVESYS} created
-       $(mkinstalldirs) $(axiom_target_bindir)
 @
 
-\section{Building SAVESYS and AXIOMSYS}
+\section{Building AXIOMSYS}
 
 We want to cache database data in the final image, so we dump it only
 after databases are build (triggered from \File{etc/Makefile.pamphlet}).
@@ -1069,6 +1067,7 @@
 axiomsys: ${AXIOMSYS}
 
 ${AXIOMSYS}: ${OUT}/makeint.lisp
+       $(mkinstalldirs) $(axiom_target_bindir)
        @echo '(progn (gbc t) (load "${OUT}/makeint.lisp") (gbc t)' \
           '(user::spad-save "$@"))' | DAASE=$(axiom_targetdir) ${LISPSYS}
        @ echo 6a ${AXIOMSYS} created

-- 
                              Waldek Hebisch
address@hidden