Fix problem with building and installing x11 plugin from native dist.

diff --git a/dist/make-native-files b/dist/make-native-files
index 908f0544ebb5f6dd6e18d6476e0416c9dd020b8e..0d932d256dd9230cb8338e960602cf7c72accbc6 100755 (executable)
--- a/dist/make-native-files
+++ b/dist/make-native-files
@@ -51,12 +51,23 @@ build ()
     touch .native-release-marker
 }
 
+clean ()
+{
+    (cd microcode && make distclean)
+    local PLUGIN
+    for PLUGIN in "${PLUGINS[@]}"; do
+        if [[ -f ${PLUGIN}/Makefile ]]; then
+            (cd "${PLUGIN}" && make mostlyclean)
+        fi
+    done
+}
+
 OUT_ROOT=${NATIVE_OUT}-${ARCH}
 
 notify "Building binaries for arch ${ARCH}"
 unpack_dist_file_to "${DIST_DIR}" "${DIST_DIR}"
 run_command "${OUT_ROOT}"-compile "${DIST_DIR}"/src build
-run_command "${OUT_ROOT}"-clean "${DIST_DIR}"/src/microcode make distclean
+run_command "${OUT_ROOT}"-clean "${DIST_DIR}"/src clean
 
 notify "Making tarball"
 fixup_perms "${DIST_DIR}"

diff --git a/dist/shared.sh b/dist/shared.sh
index 25140d490cac33c6692119d0f38f1e1cc1d04c39..d1e5a6d1531730f1e74b9b7c06d469402801b346 100644 (file)
--- a/dist/shared.sh
+++ b/dist/shared.sh
@@ -100,7 +100,7 @@ LIARC_OUT=${OUTPUT_DIR}/liarc
 NATIVE_OUT=${OUTPUT_DIR}/native
 MACOSX_OUT=${OUTPUT_DIR}/macosx
 
-PLUGINS="blowfish gdbm mcrypt edwin imail x11 x11-screen"
+PLUGINS=(blowfish gdbm mcrypt edwin imail x11 x11-screen)
 
 notify ()
 {

diff --git a/doc/configure.ac b/doc/configure.ac
index eaa8a200955d0d437b463b0489b44a4a094b9c45..a269e46217ab3ff7cea0a89fd8d954fc9cf11473 100644 (file)
--- a/doc/configure.ac
+++ b/doc/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT([MIT/GNU Scheme documentation],
-       [10.1.1],
+       [10.1.2],
        [bug-mit-scheme@gnu.org],
        [mit-scheme-doc])
 AC_CONFIG_SRCDIR([ref-manual/scheme.texinfo])

diff --git a/doc/mit-scheme.1 b/doc/mit-scheme.1
index 392321e91fd5b680c719f21b14b66d2982ef7a97..9daf5c5454719a24d32d83716e80ad3b034a6cf6 100644 (file)
--- a/doc/mit-scheme.1
+++ b/doc/mit-scheme.1
@@ -1,4 +1,4 @@
-.TH "mit-scheme" "1" "10.1.1" "MIT/GNU Scheme Team" ""
+.TH "mit-scheme" "1" "10.1.2" "MIT/GNU Scheme Team" ""
 .SH "NAME"
 .LP
 mit-scheme - The MIT/GNU Scheme development environment

diff --git a/doc/ref-manual/scheme.texinfo b/doc/ref-manual/scheme.texinfo
index 89c825302a44ba8061b67c060ddc9450e7613157..e060a982881d25165d80c9d4cca6fd9e968ea243 100644 (file)
--- a/doc/ref-manual/scheme.texinfo
+++ b/doc/ref-manual/scheme.texinfo
@@ -2,7 +2,7 @@
 @comment %**start of header
 @setfilename mit-scheme-ref
 @set EDITION 1.106
-@set VERSION 10.1.1
+@set VERSION 10.1.2
 @set UPDATED 2017-02-15
 @settitle MIT/GNU Scheme @value{VERSION}
 @comment %**end of header

diff --git a/doc/user-manual/user.texinfo b/doc/user-manual/user.texinfo
index 645a14b626fefcdc8f9c95822fce35e224165128..e667d103a2224911da6d641b13f2048ce1616799 100644 (file)
--- a/doc/user-manual/user.texinfo
+++ b/doc/user-manual/user.texinfo
@@ -2,7 +2,7 @@
 @comment %**start of header
 @setfilename mit-scheme-user
 @set EDITION 1.95
-@set VERSION 10.1.1
+@set VERSION 10.1.2
 @set UPDATED 2015-11-25
 @settitle MIT/GNU Scheme @value{VERSION}
 @comment %**end of header

diff --git a/src/Makefile.in b/src/Makefile.in
index 8cb74b7c93c4ac7de91b7087dc413c8ef9336869..219821bd5b2bfb66e7d33cccf2fc2eed26ca63ee 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -139,6 +139,11 @@ microcode/scheme:
 
 .PHONY: compile-microcode
 compile-microcode: microcode/scheme
+@IF_BLOWFISH@compile-microcode: compile-blowfish-c
+@IF_GDBM@compile-microcode: compile-gdbm-c
+@IF_MCRYPT@compile-microcode: compile-mcrypt-c
+@IF_PGSQL@compile-microcode: compile-pgsql-c
+@IF_X11@compile-microcode: compile-x11-c
 
 stamp_install-microcode: compile-microcode
        (cd microcode; $(MAKE) install)
@@ -394,6 +399,10 @@ all-blowfish: compile-blowfish
 compile-blowfish: compile-runtime compile-ffi
        (cd blowfish && MIT_SCHEME_EXE=$(MIT_SCHEME_EXE) $(MAKE))
 
+.PHONY: compile-blowfish-c
+compile-blowfish-c:
+       (cd blowfish && $(MAKE))
+
 ################
 # edwin
 ################
@@ -419,6 +428,10 @@ all-gdbm: compile-gdbm
 compile-gdbm: compile-runtime compile-ffi
        (cd gdbm && MIT_SCHEME_EXE=$(MIT_SCHEME_EXE) $(MAKE))
 
+.PHONY: compile-gdbm-c
+compile-gdbm-c:
+       (cd gdbm && $(MAKE))
+
 ################
 # imail
 ################
@@ -441,6 +454,10 @@ all-mcrypt: compile-mcrypt
 compile-mcrypt: compile-runtime compile-ffi
        (cd mcrypt && MIT_SCHEME_EXE=$(MIT_SCHEME_EXE) $(MAKE))
 
+.PHONY: compile-mcrypt-c
+compile-mcrypt-c:
+       (cd mcrypt && $(MAKE))
+
 ################
 # pgsql
 ################
@@ -452,6 +469,10 @@ all-pgsql: compile-pgsql
 compile-pgsql: compile-runtime compile-ffi
        (cd pgsql && MIT_SCHEME_EXE=$(MIT_SCHEME_EXE) $(MAKE))
 
+.PHONY: compile-pgsql-c
+compile-pgsql-c:
+       (cd pgsql && $(MAKE))
+
 ################
 # X11
 ################
@@ -463,6 +484,10 @@ all-x11: compile-x11
 compile-x11: compile-runtime compile-ffi
        (cd x11 && MIT_SCHEME_EXE=$(MIT_SCHEME_EXE) $(MAKE))
 
+.PHONY: compile-x11-c
+compile-x11-c:
+       (cd x11 && $(MAKE))
+
 ################
 # X11-screen
 ################

diff --git a/src/blowfish/mit-scheme-blowfish.texi b/src/blowfish/mit-scheme-blowfish.texi
index c8922b7b173f35d237d759616dc80d9e4424bd53..5d4454b6e896cf706b9d2bb7dde9bee077bf7819 100644 (file)
--- a/src/blowfish/mit-scheme-blowfish.texi
+++ b/src/blowfish/mit-scheme-blowfish.texi
@@ -2,7 +2,7 @@
 @comment %**start of header
 @setfilename mit-scheme-blowfish.info
 @include version.texi
-@set SCMVERS 10.1.1
+@set SCMVERS 10.1.2
 @settitle MIT/GNU Scheme Blowfish Plugin Manual
 @comment %**end of header
 

diff --git a/src/configure.ac b/src/configure.ac
index 2a395fd4c4b5109aa20321ed8aaa7faad72e0d5e..8cc73871ce0d63534409ed16d85129b31550ff0d 100644 (file)
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([MIT/GNU Scheme], [10.1.1], [bug-mit-scheme@gnu.org], [mit-scheme])
+AC_INIT([MIT/GNU Scheme], [10.1.2], [bug-mit-scheme@gnu.org], [mit-scheme])
 AC_CONFIG_SRCDIR([microcode/boot.c])
 AC_CONFIG_AUX_DIR([microcode])
 AC_PROG_MAKE_SET
@@ -161,7 +161,7 @@ fi
 AUXDIR_NAME=mit-scheme-${mit_scheme_native_code}
 AUXDIR='$(libdir)'/${AUXDIR_NAME}
 MIT_SCHEME_LIBDIR=${AUXDIR}/
-MIT_SCHEME_INCLUDEDIR=${AUXDIR}/
+MIT_SCHEME_INCLUDEDIR=`pwd`/lib/
 MIT_SCHEME_OS_SUFFIX=unx
 MIT_SCHEME_CC_TYPE=${mit_scheme_native_code}
 

diff --git a/src/gdbm/mit-scheme-gdbm.texi b/src/gdbm/mit-scheme-gdbm.texi
index 73c22ca2a2b4a3bedcef9512e4be6e249f4d16f0..8d0dcd2ce0b9e973d1d1bb8d9658b01c35ddca91 100644 (file)
--- a/src/gdbm/mit-scheme-gdbm.texi
+++ b/src/gdbm/mit-scheme-gdbm.texi
@@ -2,7 +2,7 @@
 @comment %**start of header
 @setfilename mit-scheme-gdbm.info
 @include version.texi
-@set SCMVERS 10.1.1
+@set SCMVERS 10.1.2
 @settitle MIT/GNU Scheme GDBM Plugin Manual
 @comment %**end of header
 

diff --git a/src/runtime/version.scm b/src/runtime/version.scm
index df30e4fa04c7da9ed2742c742af7ba84fa96ca38..f573c44c400965e044c101281f4a67ed59a1a0db 100644 (file)
--- a/src/runtime/version.scm
+++ b/src/runtime/version.scm
@@ -39,7 +39,7 @@ USA.
         (let ((now last-copyright-year)
               (then 1986))
           (iota (+ (- now then) 1) then)))
-   (add-subsystem-identification! "Release" '(10 1 1))
+   (add-subsystem-identification! "Release" '(10 1 2))
    (snarf-microcode-version!)
    (add-event-receiver! event:after-restore snarf-microcode-version!)
    (add-subsystem-identification! "Runtime" '(15 7))))

diff --git a/src/x11/Makefile.am b/src/x11/Makefile.am
index cabb382338239831eed77b8b128b3a0d41af7fe8..7f47e7f7c269c268f35e83f1f57c832c4966f6c9 100644 (file)
--- a/src/x11/Makefile.am
+++ b/src/x11/Makefile.am
@@ -58,21 +58,29 @@ x11-shim.c: stamp-shim
 x11-const.c: stamp-shim
 x11-types.bin: stamp-shim
 stamp-shim: $(c_sources) $(cdecls)
-       touch stamp-shim
        echo '(generate-shim "x11" "#include \"x11-shim.h\"")' \
-       | $(MIT_SCHEME_EXE) --batch-mode \
-       || rm stamp-shim
+           | $(MIT_SCHEME_EXE) --batch-mode
+       echo "done" > $@
 
 x11-const.bin: x11-const.scm
        echo '(sf "x11-const")' | $(MIT_SCHEME_EXE) --batch-mode
 
-x11-const.scm: x11-const
+x11-const.scm: stamp-x11-const
        ./x11-const
 
+stamp-x11-const: stamp-shim
+       $(MAKE) x11-const
+       echo "done" > $@
+
 @MIT_SCHEME_DEPS@
-stamp-scheme: stamp-shim $(sources) $(cdecls:.cdecl=-const.bin) x11.pkg
-       touch stamp-scheme
-       if ! ./compile.sh; then rm stamp-scheme; exit 1; fi
+stamp-scheme: stamp-shim $(sources) x11-const.bin x11.pkg
+       ./compile.sh
+       echo "done" > $@
+
+MOSTLYCLEANFILES = $(scmlib_LTLIBRARIES) x11-const
+
+mostlyclean-local:
+       -rm -rf .libs
 
 CLEANFILES = x11-const* x11-shim.c
 CLEANFILES += *.bin *.ext *.com *.bci *.moc *.fni *.crf *.fre *.pkd