Commit 86768cc1 authored by Jean-Claude Beaudoin's avatar Jean-Claude Beaudoin
Browse files

Update Win64 configuration files for 1.1.9.

parent 22ad1ef3
......@@ -13,8 +13,8 @@
# See file '../Copyright' for full details.
#
#
top_srcdir= /usr/home/Jean-Claude/mkcl-1.1.8/src
srcdir = /usr/home/Jean-Claude/mkcl-1.1.8/src
top_srcdir= /usr/home/Jean-Claude/mkcl-1.1.9/src
srcdir = /usr/home/Jean-Claude/mkcl-1.1.9/src
# Programs used by "make":
#
......@@ -33,13 +33,13 @@ EXE = .exe
# subdirectories of this directory. The default values for many of
# the variables below are expressed in terms of this one, so you may
# not need to change them. This defaults to /usr/local.
prefix=C:/GNU/MinGW
prefix=/mingw
exec_prefix=${prefix}
bindir=${exec_prefix}/bin/
libdir=${exec_prefix}/lib/
includedir=${prefix}/include/
mkcldir=${libdir}/mkcl-1.1.8/
localmkcldir=./lib/mkcl-1.1.8/
mkcldir=${libdir}/mkcl-1.1.9/
localmkcldir=./lib/mkcl-1.1.9/
# Programs used by "make install":
#
......@@ -49,13 +49,13 @@ INSTALL_PROGRAM = ${INSTALL}
INSTALL_SCRIPT = ${INSTALL}
INSTALL_LIBRARY = $(INSTALL_SCRIPT)
INSTALL_DATA = ${INSTALL} -m 644
mkinstalldirs = $(SHELL) ./gc/mkinstalldirs
mkinstalldirs = $(SHELL) ./util/mkinstalldirs
# Files
SUBDIRS = c gc
LIBRARIES = mkclgc.a
LSP_LIBRARIES = mkcl_1.1.8.dll
LSP_LIBRARIES = mkcl_1.1.9.dll
TARGETS = bin/mkcl$(EXE)
MKCL_HFILES = mkcl/config.h \
......@@ -99,7 +99,7 @@ BUILTINS = asdf profile rt serve-event sockets
MKCL_STATIC_PARTS = mkcltop.a lsp.a mkclmin.a
all: bin/mkcl-config $(TARGETS) $(ASDF_FASLS) $(ASDF2_FASLS) $(CONTRIB_FASLS) HELP.DOC
all: bin/mkcl-config $(TARGETS) $(ASDF_FASLS) $(ASDF2_FASLS) $(CONTRIB_FASLS) help.doc
.PHONY: all
Makefile: Makefile.in config.status
......@@ -110,7 +110,7 @@ mkcl/config.h: mkcl/config.h.in config.status
touch mkcl/config.h
bin/mkcl-small$(EXE) lsp.a $(LSP_LIBRARIES) ENCODINGS: compile.lsp lsp/config.lsp cmp/cmpdefs.lsp lsp/*.lsp clos/*.lsp cmp/*.lsp mkcl/mkcl-cmp.h mkcl/config.h BUILD-STAMP mkcl_min$(EXE) mkcltop.a
bin/mkcl-small$(EXE) lsp.a $(LSP_LIBRARIES) encodings: compile.lsp lsp/config.lsp cmp/cmpdefs.lsp lsp/*.lsp clos/*.lsp cmp/*.lsp mkcl/mkcl-cmp.h mkcl/config.h BUILD-STAMP mkcl_min$(EXE) mkcltop.a
./mkcl_min$(EXE) compile
for i in $(LSP_LIBRARIES) ; do \
if test -s $$i ; then \
......@@ -250,7 +250,7 @@ bin/mkcl-full$(EXE): bin/mkcl-small$(EXE) build-full-mkcl.lsp $(BUILTINS)
bin/mkcl-small$(EXE) -norc -q --external-format "(:ascii :lf)" -load build-full-mkcl.lsp -- $(BUILTINS)
endif
HELP.DOC: dump-doc.lsp bin/mkcl-small$(EXE) doc/help.lsp
help.doc: dump-doc.lsp bin/mkcl-small$(EXE) doc/help.lsp
bin/mkcl-small$(EXE) -norc -q --external-format "(:ascii :lf)" -load dump-doc.lsp
......@@ -314,7 +314,7 @@ mkclmin.a: depend c/*.d mkcl/*.h c/arch/*.d
mkcltop.a: depend c/main.d c/all_symbols.d c/symbols_list.h
cd c; $(MAKE) ../mkcltop.a
gc/.libs/libgc.a:
gc/.libs/libgc.a: gc/*.c gc/include/*.h gc/include/*/*.h
cd gc; $(MAKE)
mkclgc.a: gc/.libs/libgc.a
......@@ -353,10 +353,10 @@ install-base: all mkcl/config-install.h
for i in $(TARGETS); do \
$(INSTALL_PROGRAM) $$i $(bindir); \
done
if [ -d ENCODINGS ]; then \
$(mkinstalldirs) $(mkcldir)/ENCODINGS; \
for i in ./ENCODINGS/*; do \
$(INSTALL_DATA) $$i $(mkcldir)/ENCODINGS; \
if [ -d encodings ]; then \
$(mkinstalldirs) $(mkcldir)/encodings; \
for i in ./encodings/*; do \
$(INSTALL_DATA) $$i $(mkcldir)/encodings; \
done \
fi
$(INSTALL_DATA) ./mkcl/*.h $(includedir)/mkcl
......@@ -367,7 +367,7 @@ install-base: all mkcl/config-install.h
rm $(includedir)/mkcl/config.h
mv $(includedir)/mkcl/config-install.h $(includedir)/mkcl/config.h
$(INSTALL_SCRIPT) bin/mkcl-config $(bindir)
for i in BUILD-STAMP HELP.DOC ; do \
for i in BUILD-STAMP help.doc ; do \
$(INSTALL_DATA) $$i $(mkcldir); \
done
for i in $(LSP_LIBRARIES); do \
......@@ -422,10 +422,10 @@ install-base-local: all mkcl/config-install.h
$(localmkcldir) ./include/ ./include//mkcl
$(INSTALL_DATA) ../Copyright ../LGPL $(localmkcldir)
$(INSTALL_DATA) ../Copyright ../LGPL ./include/mkcl
if [ -d ENCODINGS ]; then \
$(mkinstalldirs) $(localmkcldir)/ENCODINGS; \
for i in ./ENCODINGS/*; do \
$(INSTALL_DATA) $$i $(localmkcldir)/ENCODINGS; \
if [ -d encodings ]; then \
$(mkinstalldirs) $(localmkcldir)/encodings; \
for i in ./encodings/*; do \
$(INSTALL_DATA) $$i $(localmkcldir)/encodings; \
done \
fi
$(INSTALL_DATA) ./mkcl/*.h ./include//mkcl
......@@ -435,7 +435,7 @@ install-base-local: all mkcl/config-install.h
fi
rm ./include//mkcl/config.h
mv ./include//mkcl/config-install.h ./include//mkcl/config.h
for i in BUILD-STAMP HELP.DOC ; do \
for i in BUILD-STAMP help.doc ; do \
$(INSTALL_DATA) $$i $(localmkcldir); \
done
for i in $(LSP_LIBRARIES); do \
......@@ -495,13 +495,14 @@ doc: $(TARGETS)
clean: clean_lisp clean_contribs
cd c; $(MAKE) clean
$(RM) compile.lsp bin/mkcl-config BUILD-STAMP mkcl/config-install.h
$(RM) depend compile.lsp bin/mkcl-config BUILD-STAMP mkcl/config-install.h
$(RM) mkcl_min$(EXE) bin/mkcl$(EXE) bin/mkcl-dyn bin/mkcl-small$(EXE) bin/mkcl-full$(EXE)
$(RM) MKCLINIT* bin/MKCLINIT*
$(RM) MKC*.c MKC*.tmp bin/MKC*.c bin/MKC*.tmp
$(RM) -r ENCODINGS
$(RM) MODULES HELP.DOC TAGS
$(RM) -r encodings
$(RM) MODULES help.doc TAGS
$(RM) mkcl/gc/*.h ./mkclgc.a
-(cd gc; $(MAKE) clean-libtool clean-libLTLIBRARIES)
$(RM) *.dll bin/*.dll
$(RM) *.o *.a *.la *.so *.data *.fasb *.fas core core.* a.out
cd bin; $(RM) *.o *.a *.la *.so *.data *.fasb *.fas core core.* a.out
......@@ -516,18 +517,19 @@ clean_lisp:
for i in lsp cmp clos; \
do $(RM) $$i.{a,fasb,asd,as2} $$i/?*.{o,data,c,sdat,h,fasb,fas}; done
$(RM) lsp/config.lsp cmp/cmpdefs.lsp
$(RM) HELP.DOC
$(RM) help.doc
distclean: clean
cd c; $(MAKE) distclean
$(RM) bin/mkcl-config.pre
$(RM) Makefile bare.lsp compile.pre
$(RM) doc/Makefile doc/mkcl.man doc/mkcl-config.man
$(RM) mkcl/config.h mkcl/configpre.h
$(RM) lsp/config.pre lsp/load.lsp clos/load.lsp
$(RM) cmp/cmpdefs.pre cmp/load.lsp
(cd gc; $(MAKE) distclean)
-(cd gc/libatomic_ops; $(MAKE) distclean)
-(cd gc; $(MAKE) distclean)
$(RM) config.status config.version config.log config.cache
$(RM) Makefile bare.lsp compile.pre
realclean: distclean
cd c; $(MAKE) realclean
......@@ -545,6 +547,7 @@ TAGS: lsp/*.lsp lsp/config.pre clos/*.lsp cmp/*.lsp cmp/cmpdefs.pre c/*.d c/*.h
depend: c/GNUmakefile
touch depend
c/GNUmakefile:
cd c; $(MAKE) depend
......
......@@ -13,9 +13,9 @@
# See file '../../Copyright' for full details.
#
#
top_srcdir= /usr/home/Jean-Claude/mkcl-1.1.8/src
srcdir = /usr/home/Jean-Claude/mkcl-1.1.8/src/c
VPATH = /usr/home/Jean-Claude/mkcl-1.1.8/src/c
top_srcdir= /usr/home/Jean-Claude/mkcl-1.1.9/src
srcdir = /usr/home/Jean-Claude/mkcl-1.1.9/src/c
VPATH = /usr/home/Jean-Claude/mkcl-1.1.9/src/c
# Programs used by "make":
#
......
......@@ -322,15 +322,8 @@ progress. The default value is T.")
;;; --cmpenv.lsp--
;;;
;;; These default settings are equivalent to (optimize (speed 2) (space 0) (safety 3))
;;;
(defvar *safety* 2)
(defvar *speed* 3)
(defvar *space* 0)
(defvar *debug* 2)
(defconstant *default-optimize-settings*
`(optimize (safety ,*safety*) (speed ,*speed*) (space ,*space*) (debug ,*debug*)))
`(optimize (safety ,si::*safety*) (speed ,si::*speed*) (space ,si::*space*) (debug ,si::*debug*)))
;;; Emit automatic CHECK-TYPE forms for function arguments in lambda forms.
(defvar *automatic-check-type-in-lambda* t)
......
......@@ -48,17 +48,17 @@
#endif
/* Decimal number made with the formula: MAJOR * 1000000 + MINOR * 10000 + PATCH */
#define MKCL_VERSION_NUMBER 1010008
#define MKCL_VERSION_NUMBER 1010009
#define MKCL_MAJOR_VERSION 1
#define MKCL_MINOR_VERSION 1
#define MKCL_PATCH_LEVEL 8
#define MKCL_VERSION_STRING "1.1.8"
#define MKCL_PATCH_LEVEL 9
#define MKCL_VERSION_STRING "1.1.9"
#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 "8"
#define MKCL_PATCH_LEVEL_STRING "9"
#define MKCL_SYS_LIBDIR_DEFAULT "C:/Program Files/MKCL 1.1/lib/mkcl-1.1.8"
#define MKCL_SYS_LIBDIR_DEFAULT "C:/Program Files/MKCL 1.1/lib/mkcl-1.1.9"
/*
* FEATURES LINKED IN
......@@ -153,8 +153,7 @@ typedef uintptr_t mkcl_hashkey;
/* See cmplam.lsp if you change this value */
#define MKCL_C_ARGUMENTS_LIMIT 64
/* Maximum number of values returned by a function
(must be >= MKCL_C_ARGUMENTS_LIMIT because of a hack on argument frames on some platforms. JCB) */
/* Maximum number of output arguments (>= MKCL_C_ARGUMENTS_LIMIT) */
#define MKCL_MULTIPLE_VALUES_LIMIT 64
/* A setjmp that does not save signals */
......
......@@ -4,7 +4,7 @@
!define PRODUCT_NAME "MKCL"
!define PRODUCT_VERSION_MAJOR "1"
!define PRODUCT_VERSION_MINOR "1"
!define PRODUCT_VERSION_PATCH "8"
!define PRODUCT_VERSION_PATCH "9"
!define PRODUCT_VERSION "${PRODUCT_VERSION_MAJOR}.${PRODUCT_VERSION_MINOR}"
!define PRODUCT_FULL_VERSION "${PRODUCT_VERSION_MAJOR}.${PRODUCT_VERSION_MINOR}.${PRODUCT_VERSION_PATCH}"
!define PRODUCT_PUBLISHER "Jean-Claude Beaudoin"
......@@ -14,8 +14,8 @@
!define PRODUCT_UNINST_ROOT_KEY "HKLM"
Name "MKCL 1.1.8"
OutFile "mkcl-1.1.8_win64_setup.exe"
Name "MKCL 1.1.9"
OutFile "mkcl-1.1.9_win64_setup.exe"
InstallDir "$PROGRAMFILES64\MKCL ${PRODUCT_VERSION}\"
InstallDirRegKey HKLM "${PRODUCT_PATH_REGKEY}\HOME" ""
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment