From: Matt Birkholz <matt@birkholz.chandler.az.us>
Date: Thu, 30 May 2013 00:13:07 +0000 (-0700)
Subject: Merge branch 'master' into Gtk
X-Git-Tag: mit-scheme-pucked-9.2.12~493
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=bfa03f35ce4f7b7f64cdbba54333393450715797;p=mit-scheme.git

Merge branch 'master' into Gtk
---

bfa03f35ce4f7b7f64cdbba54333393450715797
diff --cc src/Makefile.in
index ab8cce9b2,73d138d5a..8cd2e806e
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@@ -78,18 -78,166 +78,173 @@@ all: @ALL_TARGET
  
  check:
  	./microcode/scheme --library lib --batch-mode \
 -	  --load ../tests/check.scm --eval '(%exit)'
 +	  --load ../tests/check </dev/null
 +	@if [ -d ../doc/gtk ]; then \
 +	  echo ./microcode/scheme --load ../doc/gtk/check; \
 +	  ./microcode/scheme --library lib --batch-mode \
 +	    --load ../doc/gtk/check </dev/null; \
 +	else \
 +	  echo "; Warning: Gtk documentation not checked."; \
 +	fi
  
- all-native: compile-microcode
- 	@$(top_srcdir)/etc/compile.sh "$(MIT_SCHEME_EXE)" --batch-mode
- 	$(MAKE) build-bands build-ffis
+ all-native: lib/runtime.com
+ all-native: lib/all.com
+ all-native: compile-compiler
+ all-native: compile-cref
+ all-native: compile-ffi
+ all-native: compile-imail
+ all-native: compile-runtime
+ all-native: compile-sf
+ all-native: compile-sos
+ all-native: compile-ssp
+ all-native: compile-star-parser
+ all-native: compile-win32
+ all-native: compile-xml
+ 
+ lib/runtime.com: compile-runtime
+ lib/runtime.com: microcode/scheme
+ 	(. etc/functions.sh && get_fasl_file && cd runtime \
+ 	  && (echo '(disk-save "../lib/runtime.com")' \
+ 	       | ../microcode/scheme --batch-mode --library ../lib \
+ 	           --fasl "$${FASL}"))
+ 
+ lib/compiler.com: compile-compiler
+ lib/compiler.com: lib/runtime.com
+ lib/compiler.com: microcode/scheme
+ 	(echo '(begin' && \
+ 	 echo '  (load-option (quote COMPILER))' && \
+ 	 echo '  (disk-save "lib/compiler.com"))') \
+ 	| ./microcode/scheme --batch-mode --library lib --band runtime.com
+ 
+ lib/all.com: compile-compiler
+ lib/all.com: compile-edwin
+ lib/all.com: compile-sf
+ lib/all.com: lib/runtime.com
+ lib/all.com: microcode/scheme
+ 	(echo '(begin' && \
+ 	 echo '  (load-option (quote COMPILER))' && \
+ 	 echo '  (load-option (quote EDWIN))' && \
+ 	 echo '  (disk-save "lib/all.com"))') \
+ 	| ./microcode/scheme --batch-mode --library lib --band runtime.com
+ 
+ microcode/scheme: compile-microcode
+ 
+ .PHONY: compile-cref
+ compile-cref:
+ 	echo '(begin (load "etc/compile.scm") (compile-dir "cref"))' \
+ 	| '$(MIT_SCHEME_EXE)' --batch-mode
+ 
+ .PHONY: syntax-runtime
+ syntax-runtime: compile-cref
+ 	(echo '(begin' && \
+ 	 echo '  (load "etc/compile.scm")' && \
+ 	 echo '  (with-working-directory-pathname "cref"' && \
+ 	 echo '    (lambda () (load "make")))' && \
+ 	 echo '  (with-working-directory-pathname "runtime"' && \
+ 	 echo '    (lambda ()' && \
+ 	 echo '      (load "runtime.sf")' && \
+ 	 echo '      (echo-cref-output "runtime"))))') \
+ 	| '$(MIT_SCHEME_EXE)' --batch-mode
+ 
+ .PHONY: compile-runtime
+ compile-runtime: syntax-runtime
+ 	(echo '(with-working-directory-pathname "runtime"' && \
+ 	 echo '  (lambda () (load "runtime.cbf")))') \
+ 	| '$(MIT_SCHEME_EXE)' --batch-mode
+ 
+ .PHONY: compile-sf
+ compile-sf: compile-cref
+ compile-sf: syntax-runtime
+ 	(echo '(begin' && \
+ 	 echo '  (load "etc/compile.scm")' && \
+ 	 echo '  (with-working-directory-pathname "cref"' && \
+ 	 echo '    (lambda () (load "make")))' && \
+ 	 echo '  (compile-dir "sf"))') \
+ 	| '$(MIT_SCHEME_EXE)' --batch-mode
+ 
+ .PHONY: compile-star-parser
+ compile-star-parser: compile-cref
+ compile-star-parser: syntax-runtime
+ 	(echo '(begin' && \
+ 	 echo '  (load "etc/compile.scm")' && \
+ 	 echo '  (with-working-directory-pathname "cref"' && \
+ 	 echo '    (lambda () (load "make")))' && \
+ 	 echo '  (compile-dir "star-parser"))') \
+ 	| '$(MIT_SCHEME_EXE)' --batch-mode
+ 
+ .PHONY: syntax-compiler
+ syntax-compiler: compile-sf
+ syntax-compiler: lib/runtime.com
+ syntax-compiler: microcode/scheme
+ 	(echo '(begin' && \
+ 	 echo '  (load-option (quote SF))' && \
+ 	 echo '  (with-working-directory-pathname "compiler"' && \
+ 	 echo '    (lambda () (load "compiler.sf"))))') \
+ 	| ./microcode/scheme --batch-mode --library lib --band runtime.com
+ 
+ .PHONY: compile-compiler
+ compile-compiler: syntax-compiler
+ 	(echo '(with-working-directory-pathname "compiler"' && \
+ 	 echo '  (lambda () (load "compiler.cbf")))') \
+ 	| '$(MIT_SCHEME_EXE)' --batch-mode
+ 
+ .PHONY: bootstrap-toolchain
+ bootstrap-toolchain: lib/compiler.com
+ bootstrap-toolchain: microcode/scheme
+ BOOTSTRAP_TOOLCHAIN = \
+ 	./microcode/scheme --batch-mode --library lib --band compiler.com \
+ 	  --eval '(load "etc/compile.scm")'
+ 
+ .PHONY: syntax-edwin
+ syntax-edwin: bootstrap-toolchain
+ syntax-edwin: compile-xml
+ 	(echo '(with-working-directory-pathname "edwin"' && \
+ 	 echo '  (lambda ()' && \
+ 	 echo '    (load "edwin.sf")' && \
+ 	 echo '    (echo-cref-output "edwin")))') \
+ 	| $(BOOTSTRAP_TOOLCHAIN)
+ 
+ .PHONY: compile-edwin
+ compile-edwin: bootstrap-toolchain
+ compile-edwin: syntax-edwin
+ 	(echo '(with-working-directory-pathname "edwin"' && \
+ 	 echo '  (lambda () (load "edwin.cbf")))') \
+ 	| $(BOOTSTRAP_TOOLCHAIN)
+ 
+ .PHONY: compile-ffi
+ compile-ffi: bootstrap-toolchain
+ compile-ffi: compile-cref
+ 	echo '(compile-dir "ffi")' | $(BOOTSTRAP_TOOLCHAIN)
+ 
+ .PHONY: compile-imail
+ compile-imail: bootstrap-toolchain
+ compile-imail: compile-sos
+ compile-imail: compile-star-parser
+ compile-imail: syntax-edwin
+ 	(echo '(begin' && \
+ 	 echo '  (construct-packages-from-file' && \
+ 	 echo '   (fasload (package-set-pathname "edwin/edwin")))' && \
+ 	 echo '  (compile-dir "imail"))') \
+ 	| $(BOOTSTRAP_TOOLCHAIN)
+ 
+ .PHONY: compile-sos
+ compile-sos: bootstrap-toolchain
+ 	echo '(compile-dir "sos")' | $(BOOTSTRAP_TOOLCHAIN)
+ 
+ .PHONY: compile-ssp
+ compile-ssp: bootstrap-toolchain
+ compile-ssp: compile-xml
+ 	echo '(compile-dir "ssp")' | $(BOOTSTRAP_TOOLCHAIN)
+ 
+ .PHONY: compile-win32
+ compile-win32: bootstrap-toolchain
+ 	echo '(compile-dir "win32")' | $(BOOTSTRAP_TOOLCHAIN)
+ 
+ .PHONY: compile-xml
+ compile-xml: bootstrap-toolchain
+ compile-xml: compile-sos
+ compile-xml: compile-star-parser
+ 	echo '(compile-dir "xml")' | $(BOOTSTRAP_TOOLCHAIN)
  
  all-svm: microcode/svm1-defns.h
  	$(MAKE) compile-microcode