From: Matt Birkholz <matt@birkholz.chandler.az.us>
Date: Fri, 10 Jun 2011 18:45:30 +0000 (-0700)
Subject: Merge branch 'master' into ELisp
X-Git-Tag: 20110609-ELisp
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=ddf46335125203a52e7f978a70355cf43a407c5a;p=mit-scheme.git

Merge branch 'master' into ELisp
---

ef696ea0aec7cbe4e7accdeff9e7f485d985d1a1
diff --cc src/Makefile.in
index 23735a946,abda45d3b..5f2b750fa
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@@ -61,10 -61,11 +61,11 @@@ mkinstalldirs = $(SHELL) $(top_srcdir)/
  # **** END BOILERPLATE ****
  
  LIARC_BOOT_BUNDLES = compiler cref sf star-parser
 -LIARC_BUNDLES = $(LIARC_BOOT_BUNDLES) edwin ffi imail sos ssp xml
 +LIARC_BUNDLES = $(LIARC_BOOT_BUNDLES) edwin elisp ffi imail sos ssp xml
+ FFIS = @FFIS@
  
  SUBDIRS = $(INSTALLED_SUBDIRS) 6001 compiler rcs win32 xdoc
- INSTALLED_SUBDIRS = microcode runtime $(LIARC_BUNDLES)
+ INSTALLED_SUBDIRS = microcode runtime $(LIARC_BUNDLES) $(FFIS)
  
  MIT_SCHEME_EXE = @MIT_SCHEME_EXE@
  AUXDIR_NAME = @AUXDIR_NAME@
diff --cc src/Setup.sh
index 79d50e3b8,db62f1d56..bf785dd01
--- a/src/Setup.sh
+++ b/src/Setup.sh
@@@ -86,8 -86,13 +86,14 @@@ maybe_link lib/optiondb.scm ../etc/opti
  maybe_link lib/runtime ../runtime
  maybe_link lib/mit-scheme.h ../microcode/pruxffi.h
  maybe_link lib/ffi ../ffi
+ maybe_link lib/ffi-test-shim.so ../ffi/ffi-test-shim.so
+ maybe_link lib/ffi-test-types.bin ../ffi/ffi-test-types.bin
+ maybe_link lib/ffi-test-const.bin ../ffi/ffi-test-const.bin
 +maybe_link lib/elisp ../elisp
  
+ maybe_link config.sub microcode/config.sub
+ maybe_link config.guess microcode/config.guess
+ 
  for SUBDIR in ${INSTALLED_SUBDIRS} ${OTHER_SUBDIRS}; do
      echo "setting up ${SUBDIR}"
      maybe_link ${SUBDIR}/Setup.sh ../etc/Setup.sh
diff --cc src/configure.ac
index eea382774,004413ab2..4c37657ee
--- a/src/configure.ac
+++ b/src/configure.ac
@@@ -138,8 -189,8 +190,8 @@@ if test x"${mit_scheme_native_code}" = 
      for BN in star-parser; do
          (cd lib; rm -f ${BN}; ${LN_S} ../${BN} .)
      done
 -    for BUNDLE in 6001 compiler cref edwin ffi imail sf sos ssp star-parser \
 -		  xdoc xml $FFIS; do
 +    for BUNDLE in 6001 compiler cref edwin elisp ffi imail sf sos ssp \
- 	    star-parser xdoc xml; do
++		  star-parser xdoc xml $FFIS; do
      	SO=${BUNDLE}.so
  	(cd lib/lib; rm -f ${SO}; ${LN_S} ../../${BUNDLE}/${SO} .)
      done
diff --cc src/etc/compile.scm
index bd481ce4b,30445eea4..33239da77
--- a/src/etc/compile.scm
+++ b/src/etc/compile.scm
@@@ -37,8 -38,20 +38,20 @@@ USA
    (with-working-directory-pathname "sos"
      (lambda ()
        (load "load")))
 -  (for-each compile-dir '("xml" "win32" "edwin" "imail" "ssp" "ffi")))
 +  (for-each compile-dir '("xml" "win32" "edwin" "imail" "ssp" "ffi" "elisp")))
  
+ (define (compile-ffi dir)
+   (if (eq? microcode-id/compiled-code-type 'C)
+       (in-liarc
+        (lambda ()
+ 	 (c-compile-dir dir)
+ 	 (let* ((line '("make" "compile-liarc-bundle"))
+ 		(code (run-synchronous-subprocess
+ 		       (car line) (cdr line) 'working-directory dir)))
+ 	   (if (not (zero? code))
+ 	       (error "Process exited with error code:" code line)))))
+       (compile-dir dir)))
+ 
  (define (compile-boot-dirs compile-dir)
    (compile-cref compile-dir)
    (for-each compile-dir '("runtime" "cref" "sf" "compiler" "star-parser")))