Bump version to 1.1.6! (c2933bec) · Commits · mkcl / mkcl

src/Makefile.w64

+37 −30

Original line number	Diff line number	Diff line
		@@ -13,8 +13,8 @@
		# See file '../Copyright' for full details.
		#
		#
		top_srcdir= /usr/home/Jean-Claude/mkcl-1.1.5/src
		srcdir = /usr/home/Jean-Claude/mkcl-1.1.5/src
		top_srcdir= /usr/home/Jean-Claude/mkcl-1.1.6/src
		srcdir = /usr/home/Jean-Claude/mkcl-1.1.6/src

		# Programs used by "make":
		#
		@@ -38,8 +38,8 @@ exec_prefix=${prefix}
		bindir=${exec_prefix}/bin/
		libdir=${exec_prefix}/lib/
		includedir=${prefix}/include/
		mkcldir=${exec_prefix}/lib/mkcl-1.1.5/
		localmkcldir=./lib/mkcl-1.1.5/
		mkcldir=${exec_prefix}/lib/mkcl-1.1.6/
		localmkcldir=./lib/mkcl-1.1.6/

		# Programs used by "make install":
		#
		@@ -55,7 +55,7 @@ mkinstalldirs = $(SHELL) ./gc/mkinstalldirs

		SUBDIRS = c gc
		LIBRARIES = libmkclgc.a
		LSP_LIBRARIES = mkcl_1.1.5.dll
		LSP_LIBRARIES = mkcl_1.1.6.dll
		TARGETS = bin/mkcl$(EXE)

		MKCL_HFILES = mkcl/config.h \
		@@ -120,73 +120,73 @@ bin/mkcl-small$(EXE) liblsp.a $(LSP_LIBRARIES) ENCODINGS: compile.lsp lsp/config
		done


		asdf.fasb libasdf.a: bin/mkcl-small$(EXE) build-asdf.lsp ../contrib/asdf/*.lisp
		asdf.fasb libasdf.a: bin/mkcl-small$(EXE) build-asdf.lsp cmp.fasb compile-utils.lsp ../contrib/asdf/*.lisp
		bin/mkcl-small$(EXE) -norc -q --external-format "(:ascii :lf)" -load build-asdf.lsp

		bytecmp.fasb libbytecmp.a: bin/mkcl-small$(EXE) build-bytecmp.lsp ../contrib/bytecmp/bytecmp.lsp
		bytecmp.fasb libbytecmp.a: bin/mkcl-small$(EXE) build-bytecmp.lsp cmp.fasb compile-utils.lsp ../contrib/bytecmp/bytecmp.lsp
		bin/mkcl-small$(EXE) -norc -q --external-format "(:ascii :lf)" -load build-bytecmp.lsp

		defsystem.fasb libdefsystem.a: bin/mkcl-small$(EXE) build-defsystem.lsp ../contrib/defsystem/defsystem.lisp
		defsystem.fasb libdefsystem.a: bin/mkcl-small$(EXE) build-defsystem.lsp cmp.fasb compile-utils.lsp ../contrib/defsystem/defsystem.lisp
		bin/mkcl-small$(EXE) -norc -q --external-format "(:ascii :lf)" -load build-defsystem.lsp

		profile.fasb libprofile.a: bin/mkcl-small$(EXE) build-profile.lsp ../contrib/profile/profile.lisp
		profile.fasb libprofile.a: bin/mkcl-small$(EXE) build-profile.lsp cmp.fasb compile-utils.lsp ../contrib/profile/profile.lisp
		bin/mkcl-small$(EXE) -norc -q --external-format "(:ascii :lf)" -load build-profile.lsp

		../contrib/sockets/package.lisp: ../contrib/sockets/sockets.lisp
		touch ../contrib/sockets/package.lisp

		sockets.fasb libsockets.a: bin/mkcl-small$(EXE) build-sockets.lsp ../contrib/sockets/*.lisp
		sockets.fasb libsockets.a: bin/mkcl-small$(EXE) build-sockets.lsp cmp.fasb compile-utils.lsp ../contrib/sockets/*.lisp
		bin/mkcl-small$(EXE) -norc -q --external-format "(:ascii :lf)" -load build-sockets.lsp

		serve-event.fasb libserve-event.a: bin/mkcl-small$(EXE) build-serve-event.lsp ../contrib/serve-event/serve-event.lisp
		serve-event.fasb libserve-event.a: bin/mkcl-small$(EXE) build-serve-event.lsp cmp.fasb compile-utils.lsp ../contrib/serve-event/serve-event.lisp
		bin/mkcl-small$(EXE) -norc -q --external-format "(:ascii :lf)" -load build-serve-event.lsp

		walker.fasb walker.a: bin/mkcl-small$(EXE) build-serve-event.lsp ../contrib/walker/walk.lsp
		walker.fasb walker.a: bin/mkcl-small$(EXE) build-walker.lsp cmp.fasb compile-utils.lsp ../contrib/walker/walk.lsp
		bin/mkcl-small$(EXE) -norc -q --external-format "(:ascii :lf)" -load build-walker.lsp


		../contrib/asdf-bundle/asdf-bundle.fas: bin/mkcl-small$(EXE) build-asdf-bundle.lsp ../contrib/asdf-bundle/*.lisp
		../contrib/asdf-bundle/asdf-bundle.fas: bin/mkcl-small$(EXE) build-asdf-bundle.lsp cmp.fasb compile-utils.lsp asdf.fasb ../contrib/asdf-bundle/*.lisp
		if [ "$${LOCALAPPDATA}" ]; then (cd "$${LOCALAPPDATA}"; rm -rf ./common-lisp/cache/mkcl-); elif [ "$${APPDATA}" ]; then (cd "$${APPDATA}"; rm -rf ./common-lisp/cache/mkcl-); else rm -rf $$HOME/.cache/common-lisp/mkcl-*/$$(cd ..;pwd -P)/contrib/asdf-bundle; fi
		bin/mkcl-small$(EXE) -norc -q --external-format "(:ascii :lf)" -load build-asdf-bundle.lsp

		trivial-features.fasb libtrivial-features.a: bin/mkcl-small$(EXE) build-asdf-contrib.lsp ../contrib/trivial-features/src/.lisp
		trivial-features.fasb libtrivial-features.a: bin/mkcl-small$(EXE) build-asdf-contrib.lsp ../contrib/asdf-bundle/asdf-bundle.fas ../contrib/trivial-features/src/.lisp
		bin/mkcl-small$(EXE) -norc -q --external-format "(:ascii :lf)" -load build-asdf-contrib.lsp -- trivial-features ../contrib/trivial-features*/
		cp -p ../contrib/trivial-features*/trivial-features.fasb .
		cp -p ../contrib/trivial-features*/libtrivial-features.a .


		trivial-garbage.fasb libtrivial-garbage.a: bin/mkcl-small$(EXE) build-asdf-contrib.lsp ../contrib/trivial-garbage/.lisp
		trivial-garbage.fasb libtrivial-garbage.a: bin/mkcl-small$(EXE) build-asdf-contrib.lsp ../contrib/asdf-bundle/asdf-bundle.fas ../contrib/trivial-garbage/.lisp
		bin/mkcl-small$(EXE) -norc -q --external-format "(:ascii :lf)" -load build-asdf-contrib.lsp -- trivial-garbage ../contrib/trivial-garbage*/
		cp -p ../contrib/trivial-garbage*/trivial-garbage.fasb .
		cp -p ../contrib/trivial-garbage*/libtrivial-garbage.a .


		alexandria.fasb libalexandria.a: bin/mkcl-small$(EXE) build-asdf-contrib.lsp ../contrib/alexandria/.lisp
		alexandria.fasb libalexandria.a: bin/mkcl-small$(EXE) build-asdf-contrib.lsp ../contrib/asdf-bundle/asdf-bundle.fas ../contrib/alexandria/.lisp
		bin/mkcl-small$(EXE) -norc -q --external-format "(:ascii :lf)" -load build-asdf-contrib.lsp -- alexandria ../contrib/alexandria*/
		cp -p ../contrib/alexandria*/alexandria.fasb .
		cp -p ../contrib/alexandria*/libalexandria.a .

		babel.fasb libbabel.a: bin/mkcl-small$(EXE) build-asdf-contrib.lsp trivial-features.fasb alexandria.fasb ../contrib/babel/src/.lisp
		babel.fasb libbabel.a: bin/mkcl-small$(EXE) build-asdf-contrib.lsp ../contrib/asdf-bundle/asdf-bundle.fas trivial-features.fasb alexandria.fasb ../contrib/babel/src/.lisp
		bin/mkcl-small$(EXE) -norc -q --external-format "(:ascii :lf)" -load build-asdf-contrib.lsp -- babel ../contrib/babel*/
		cp -p ../contrib/babel*/babel.fasb .
		cp -p ../contrib/babel*/libbabel.a .

		cffi.fasb libcffi.a: bin/mkcl-small$(EXE) build-asdf-contrib.lsp babel.fasb ../contrib/cffi/src/.lisp
		cffi.fasb libcffi.a: bin/mkcl-small$(EXE) build-asdf-contrib.lsp ../contrib/asdf-bundle/asdf-bundle.fas babel.fasb ../contrib/cffi/src/.lisp
		bin/mkcl-small$(EXE) -norc -q --external-format "(:ascii :lf)" -load build-asdf-contrib.lsp -- cffi ../contrib/cffi*/
		cp -p ../contrib/cffi*/cffi.fasb .
		cp -p ../contrib/cffi*/libcffi.a .

		bordeaux-threads.fasb libbordeaux-threads.a: bin/mkcl-small$(EXE) build-asdf-contrib.lsp alexandria.fasb ../contrib/bordeaux-threads-/src/.lisp
		bordeaux-threads.fasb libbordeaux-threads.a: bin/mkcl-small$(EXE) build-asdf-contrib.lsp ../contrib/asdf-bundle/asdf-bundle.fas alexandria.fasb ../contrib/bordeaux-threads-/src/.lisp
		bin/mkcl-small$(EXE) -norc -q --external-format "(:ascii :lf)" -load build-asdf-contrib.lsp -- bordeaux-threads ../contrib/bordeaux-threads-*/
		cp -p ../contrib/bordeaux-threads*/bordeaux-threads.fasb .
		cp -p ../contrib/bordeaux-threads*/libbordeaux-threads.a .

		fiveam.fasb libfiveam.a: bin/mkcl-small$(EXE) build-asdf-contrib.lsp alexandria.fasb ../contrib/fiveam-/src/.lisp
		fiveam.fasb libfiveam.a: bin/mkcl-small$(EXE) build-asdf-contrib.lsp ../contrib/asdf-bundle/asdf-bundle.fas alexandria.fasb ../contrib/fiveam-/src/.lisp
		bin/mkcl-small$(EXE) -norc -q --external-format "(:ascii :lf)" -load build-asdf-contrib.lsp -- fiveam ../contrib/fiveam-*/
		cp -p ../contrib/fiveam*/src/fiveam.fasb .
		cp -p ../contrib/fiveam*/src/libfiveam.a .

		rt.fasb librt.a: bin/mkcl-small$(EXE) build-asdf-contrib.lsp babel.fasb ../contrib/rt/.lisp
		rt.fasb librt.a: bin/mkcl-small$(EXE) build-asdf-contrib.lsp ../contrib/asdf-bundle/asdf-bundle.fas babel.fasb ../contrib/rt/.lisp
		bin/mkcl-small$(EXE) -norc -q --external-format "(:ascii :lf)" -load build-asdf-contrib.lsp -- rt ../contrib/rt*/
		cp -p ../contrib/rt*/rt.fasb .
		cp -p ../contrib/rt*/librt.a .
		@@ -219,11 +219,11 @@ mkcl_min$(EXE): $(LIBRARIES) libmkclgc.a libmkclmin.a c/cinit.o c/all_symbols.o
		.gdbinit: util/gdbinit
		cp util/gdbinit $@

		c/cinit.o:
		cd c; $(MAKE) depend; $(MAKE) cinit.o
		c/cinit.o: depend
		cd c; $(MAKE) cinit.o

		c/all_symbols.o:
		cd c; $(MAKE) depend; $(MAKE) all_symbols.o
		c/all_symbols.o: depend
		cd c; $(MAKE) all_symbols.o

		lsp/config.lsp: lsp/config.pre
		sed -e 's,@mkcldir\\@,$(mkcldir),g' < lsp/config.pre > lsp/config.lsp
		@@ -266,20 +266,25 @@ bin/mkcl-config.pre: util/mkcl-config
		./config.status


		libmkclmin.a: c/.d mkcl/.h c/arch/*.d
		cd c; $(MAKE) depend; $(MAKE)
		libmkclmin.a: depend c/.d mkcl/.h c/arch/*.d
		cd c; $(MAKE)

		libmkcltop.a: c/main.d c/all_symbols.d c/symbols_list.h
		cd c; $(MAKE) depend; $(MAKE)
		libmkcltop.a: depend c/main.d c/all_symbols.d c/symbols_list.h
		cd c; $(MAKE)

		gc/.libs/libgc.a:
		cd gc; $(MAKE)

		libmkclgc.a: gc/.libs/libgc.a
		cp -p gc/.libs/libgc.a ./libmkclgc.a

		mkcl/gc/gc.h: gc/include/gc.h
		mkdir -p mkcl/gc
		cp -p gc/include/*.h mkcl/gc

		mkcl/mkcl-gc.h: mkcl/gc/gc.h
		touch $@


		mkcl/mkcl-cmp.h: mkcl/mkcl.h c/symbols_list.h
		touch $@
		@@ -498,7 +503,9 @@ TAGS: lsp/.lsp lsp/config.pre clos/.lsp cmp/.lsp cmp/cmpdefs.pre c/.d c/*.h



		depend:
		depend: c/GNUmakefile

		c/GNUmakefile:
		cd c; $(MAKE) depend

src/c/Makefile.w64

+3 −3

Original line number	Diff line number	Diff line
		@@ -13,9 +13,9 @@
		# See file '../../Copyright' for full details.
		#
		#
		top_srcdir= /usr/home/Jean-Claude/mkcl-1.1.5/src
		srcdir = /usr/home/Jean-Claude/mkcl-1.1.5/src/c
		VPATH = /usr/home/Jean-Claude/mkcl-1.1.5/src/c
		top_srcdir= /usr/home/Jean-Claude/mkcl-1.1.6/src
		srcdir = /usr/home/Jean-Claude/mkcl-1.1.6/src/c
		VPATH = /usr/home/Jean-Claude/mkcl-1.1.6/src/c

		# Programs used by "make":
		#

src/configure

+9 −9

Original line number	Diff line number	Diff line
		#! /bin/sh
		# From configure.in Revision.
		# Guess values for system-dependent variables and create Makefiles.
		# Generated by GNU Autoconf 2.67 for mkcl 1.1.5.
		# Generated by GNU Autoconf 2.67 for mkcl 1.1.6.
		#
		#
		# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
		@@ -550,8 +550,8 @@ MAKEFLAGS=
		# Identity of this package.
		PACKAGE_NAME='mkcl'
		PACKAGE_TARNAME='mkcl'
		PACKAGE_VERSION='1.1.5'
		PACKAGE_STRING='mkcl 1.1.5'
		PACKAGE_VERSION='1.1.6'
		PACKAGE_STRING='mkcl 1.1.6'
		PACKAGE_BUGREPORT=''
		PACKAGE_URL=''

		@@ -1285,7 +1285,7 @@ if test "$ac_init_help" = "long"; then
		# Omit some internal or obsolete options to make the list less imposing.
		# This message is too long to be a string in the A/UX 3.1 sh.
		cat <<_ACEOF
		\`configure' configures mkcl 1.1.5 to adapt to many kinds of systems.
		\`configure' configures mkcl 1.1.6 to adapt to many kinds of systems.

		Usage: $0 [OPTION]... [VAR=VALUE]...

		@@ -1350,7 +1350,7 @@ fi

		if test -n "$ac_init_help"; then
		case $ac_init_help in
		short \| recursive ) echo "Configuration of mkcl 1.1.5:";;
		short \| recursive ) echo "Configuration of mkcl 1.1.6:";;
		esac
		cat <<\_ACEOF

		@@ -1448,7 +1448,7 @@ fi
		test -n "$ac_init_help" && exit $ac_status
		if $ac_init_version; then
		cat <<\_ACEOF
		mkcl configure 1.1.5
		mkcl configure 1.1.6
		generated by GNU Autoconf 2.67

		Copyright (C) 2010 Free Software Foundation, Inc.
		@@ -1905,7 +1905,7 @@ cat >config.log <<_ACEOF
		This file contains any messages produced by compilers while
		running configure, to aid debugging if configure makes a mistake.

		It was created by mkcl $as_me 1.1.5, which was
		It was created by mkcl $as_me 1.1.6, which was
		generated by GNU Autoconf 2.67. Invocation command line was

		$ $0 $@
		@@ -8449,7 +8449,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF \|\| ac_write_fail=1
		# report actual input values of CONFIG_FILES etc. instead of their
		# values after options handling.
		ac_log="
		This file was extended by mkcl $as_me 1.1.5, which was
		This file was extended by mkcl $as_me 1.1.6, which was
		generated by GNU Autoconf 2.67. Invocation command line was

		CONFIG_FILES = $CONFIG_FILES
		@@ -8511,7 +8511,7 @@ _ACEOF
		cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1
		ac_cs_config="`$as_echo "$ac_configure_args" \| sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
		ac_cs_version="\\
		mkcl config.status 1.1.5
		mkcl config.status 1.1.6
		configured by $0, generated by GNU Autoconf 2.67,
		with options \\"\$ac_cs_config\\"

src/configure.in

+1 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@ dnl Giuseppe Attardi 25.1.1994
		dnl Jean-Claude Beaudoin 2012.04.28
		dnl

		AC_INIT([mkcl],[1.1.5],[])
		AC_INIT([mkcl],[1.1.6],[])
		AC_REVISION([$Revision$])
		AC_CONFIG_SRCDIR([bare.lsp.in])
		AC_CONFIG_AUX_DIR([${srcdir}/gc])

src/mkcl/config.h.w64

+5 −5

Original line number	Diff line number	Diff line
		@@ -48,17 +48,17 @@
		#endif

		/* Decimal number made with the formula: MAJOR * 1000000 + MINOR * 10000 + PATCH */
		#define MKCL_VERSION_NUMBER 1010005
		#define MKCL_VERSION_NUMBER 1010006
		#define MKCL_MAJOR_VERSION 1
		#define MKCL_MINOR_VERSION 1
		#define MKCL_PATCH_LEVEL 5
		#define MKCL_VERSION_STRING "1.1.5"
		#define MKCL_PATCH_LEVEL 6
		#define MKCL_VERSION_STRING "1.1.6"
		#define MKCL_MAJOR_MINOR_VERSION_STRING "1.1"
		#define MKCL_MAJOR_VERSION_STRING "1"
		#define MKCL_MINOR_VERSION_STRING "1"
		#define MKCL_PATCH_LEVEL_STRING "5"
		#define MKCL_PATCH_LEVEL_STRING "6"

		#define MKCL_SYS_LIBDIR_DEFAULT "c:/Program Files/MKCL 1.1/lib/mkcl-1.1.5"
		#define MKCL_SYS_LIBDIR_DEFAULT "c:/Program Files/MKCL 1.1/lib/mkcl-1.1.6"

		/*
		* FEATURES LINKED IN