[Fwd: [Maxima-commits] CVS: maxima/src Makefile.am,1.3,1.4]



This change is worth pointing out to the list. I've switched the build
system to two stages: compile, then load and save. It isn't much slower
and it avoids some frustrating errors I've seen in the past.

--Jim

Date: Wed, 27 Mar 2002 11:00:30 -0800
From: James Amundson <amundson at users>
Subject: [Maxima-commits] CVS: maxima/src Makefile.am,1.3,1.4
To: maxima-commits@lists.sourceforge.net

Update of /cvsroot/maxima/maxima/src
In directory usw-pr-cvs1:/tmp/cvs-serv8087

Modified Files:
	Makefile.am 
Log Message:
Important change. Formerly, we used one lisp invocation to compile the
system and save the image. We use to lisp invocations: one to compile,
another to load and save.

Before this change, eval-when problems could cause the code to compile
differently depending on whether it was a fresh or incremental
build. After the change all code will be loaded the same way before
images are saved whether or not a given file needed to be compiled.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/maxima/maxima/src/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.am	7 Jan 2002 19:29:33 -0000	1.3
+++ Makefile.am	27 Mar 2002 19:00:28 -0000	1.4
@@ -11,7 +11,12 @@
 
 binary-clisp/maxima.mem:
 	LISPTYPE=clisp ; export LISPTYPE ;\
-	$(RUNLISP) -i ../lisp-utils/defsystem -x '(funcall (intern "OPERATE-ON-SYSTEM" :mk) "maxima" :compile :verbose t)' -f user::run -d binary-clisp/maxima
+	$(RUNLISP) -i ../lisp-utils/defsystem \
+        -x '(funcall (intern "OPERATE-ON-SYSTEM" :mk) "maxima" :compile :verbose t)' && \
+        $(RUNLISP) -i ../lisp-utils/defsystem \
+        -x '(funcall (intern "OPERATE-ON-SYSTEM" :mk) "maxima" :load :verbose t)' \
+        -f user::run -d binary-clisp/maxima
+
 
 install-clisp:
 	$(mkinstalldirs) $(DESTDIR)$(verpkglibdir)/binary-clisp
@@ -41,7 +46,11 @@
 
 binary-cmucl/maxima.core:
 	LISPTYPE=cmucl ; export LISPTYPE ;\
-	$(RUNLISP) -i ../lisp-utils/defsystem -x '(funcall (intern "OPERATE-ON-SYSTEM" :mk) "maxima" :compile :verbose t)' -f user::run -d binary-cmucl/maxima
+	$(RUNLISP) -i ../lisp-utils/defsystem \
+        -x '(funcall (intern "OPERATE-ON-SYSTEM" :mk) "maxima" :compile :verbose t)' && \
+        $(RUNLISP) -i ../lisp-utils/defsystem \
+        -x '(funcall (intern "OPERATE-ON-SYSTEM" :mk) "maxima" :load :verbose t)' \
+        -f user::run -d binary-cmucl/maxima
 
 install-cmucl:
 	$(mkinstalldirs) $(DESTDIR)$(verpkglibdir)/binary-cmucl
@@ -72,7 +81,11 @@
 binary-gcl/maxima:
 	test -d binary-gcl || mkdir binary-gcl
 	LISPTYPE=gcl ; export LISPTYPE ;\
-	$(RUNLISP) -x '(load "../lisp-utils/defsystem.lisp")(funcall (intern "OPERATE-ON-SYSTEM" :mk) "maxima" :compile :verbose t)' -f user::run -d binary-gcl/maxima
+	$(RUNLISP) \
+        -x '(load "../lisp-utils/defsystem.lisp")(funcall (intern "OPERATE-ON-SYSTEM" :mk) "maxima" :compile :verbose t)' && \
+        $(RUNLISP) \
+        -x '(load "../lisp-utils/defsystem.lisp")(funcall (intern "OPERATE-ON-SYSTEM" :mk) "maxima" :load :verbose t)' \
+        -f user::run -d binary-gcl/maxima
 
 install-gcl:
 	$(mkinstalldirs) $(DESTDIR)$(verpkglibdir)/binary-gcl