diff --git a/BUILDING b/BUILDING
index c8643c6ae7..b2361bfc38 100644
--- a/BUILDING
+++ b/BUILDING
@@ -1,4 +1,4 @@
-Building Chez Scheme Version 9.4
+Building Chez Scheme Version 9.4.1
Copyright 1984-2016 Cisco Systems, Inc.
Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/LOG b/LOG
index 3d980cb4fe..1310ec7f7a 100644
--- a/LOG
+++ b/LOG
@@ -166,3 +166,10 @@
replace the anchors with spans); and replace the deprecated valign
attribute with a style attribute.
pdhtml.ss
+
+9.4.1 changes:
+ * updated version to 9.4.1
+ bintar BUILDING NOTICE makefiles/Mf-install.in scheme.1.in
+ c/Makefile.i3nt c/Makefile.a6nt c/Makefile.ti3nt c/Makefile.ta6nt
+ mats/bldnt.bat workarea c/scheme.rc s/7.ss s/cmacros.ss
+ release_notes/release_notes.stex csug/csug.stex
diff --git a/NOTICE b/NOTICE
index cf68a640df..22ebd30e55 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,4 @@
-Chez Scheme Version 9.4
+Chez Scheme Version 9.4.1
Copyright 1984-2016 Cisco Systems, Inc.
This product includes code developed by Cisco Systems, Inc.
diff --git a/bintar b/bintar
old mode 100755
new mode 100644
index 1c91abce33..caca537e94
--- a/bintar
+++ b/bintar
@@ -40,11 +40,11 @@ foreach m ($argv[3-])
case ti3nt:
case i3nt:
set files = ($files $release/bin/$m/scheme.exe)
- set files = ($files $release/bin/$m/csv94.dll)
- set files = ($files $release/bin/$m/csv94.lib)
+ set files = ($files $release/bin/$m/csv941.dll)
+ set files = ($files $release/bin/$m/csv941.lib)
set files = ($files $release/bin/$m/vcruntime140.dll)
- set files = ($files $release/boot/$m/csv94md.lib)
- set files = ($files $release/boot/$m/csv94mt.lib)
+ set files = ($files $release/boot/$m/csv941md.lib)
+ set files = ($files $release/boot/$m/csv941mt.lib)
set files = ($files $release/boot/$m/custommd.obj)
set files = ($files $release/boot/$m/custommt.obj)
set files = ($files $release/boot/$m/scheme.res)
diff --git a/c/Makefile.a6nt b/c/Makefile.a6nt
index 5c509232ed..ca1d8fb0b9 100644
--- a/c/Makefile.a6nt
+++ b/c/Makefile.a6nt
@@ -18,11 +18,11 @@ m = a6nt
# following have to use \ for directory separator
SchemeInclude = ..\boot\$m
ZlibInclude = ..\zlib
-KernelDll = ..\bin\$m\csv94.dll
-KernelLib = ..\bin\$m\csv94.lib
-MTKernelLib = ..\boot\$m\csv94mt.lib
-MDKernelLib = ..\boot\$m\csv94md.lib
-KernelExp = ..\bin\$m\csv94.exp
+KernelDll = ..\bin\$m\csv941.dll
+KernelLib = ..\bin\$m\csv941.lib
+MTKernelLib = ..\boot\$m\csv941mt.lib
+MDKernelLib = ..\boot\$m\csv941md.lib
+KernelExp = ..\bin\$m\csv941.exp
Exec = ..\bin\$m\scheme.exe
MTMain = ..\boot\$m\mainmt.obj
MDMain = ..\boot\$m\mainmd.obj
diff --git a/c/Makefile.i3nt b/c/Makefile.i3nt
index 9411cee3b0..4f284036f2 100644
--- a/c/Makefile.i3nt
+++ b/c/Makefile.i3nt
@@ -18,11 +18,11 @@ m = i3nt
# following have to use \ for directory separator
SchemeInclude = ..\boot\$m
ZlibInclude = ..\zlib
-KernelDll = ..\bin\$m\csv94.dll
-KernelLib = ..\bin\$m\csv94.lib
-MTKernelLib = ..\boot\$m\csv94mt.lib
-MDKernelLib = ..\boot\$m\csv94md.lib
-KernelExp = ..\bin\$m\csv94.exp
+KernelDll = ..\bin\$m\csv941.dll
+KernelLib = ..\bin\$m\csv941.lib
+MTKernelLib = ..\boot\$m\csv941mt.lib
+MDKernelLib = ..\boot\$m\csv941md.lib
+KernelExp = ..\bin\$m\csv941.exp
Exec = ..\bin\$m\scheme.exe
MTMain = ..\boot\$m\mainmt.obj
MDMain = ..\boot\$m\mainmd.obj
diff --git a/c/Makefile.ta6nt b/c/Makefile.ta6nt
index 6344b74a33..319b4b2b1b 100644
--- a/c/Makefile.ta6nt
+++ b/c/Makefile.ta6nt
@@ -18,11 +18,11 @@ m = ta6nt
# following have to use \ for directory separator
SchemeInclude = ..\boot\$m
ZlibInclude = ..\zlib
-KernelDll = ..\bin\$m\csv94.dll
-KernelLib = ..\bin\$m\csv94.lib
-MTKernelLib = ..\boot\$m\csv94mt.lib
-MDKernelLib = ..\boot\$m\csv94md.lib
-KernelExp = ..\bin\$m\csv94.exp
+KernelDll = ..\bin\$m\csv941.dll
+KernelLib = ..\bin\$m\csv941.lib
+MTKernelLib = ..\boot\$m\csv941mt.lib
+MDKernelLib = ..\boot\$m\csv941md.lib
+KernelExp = ..\bin\$m\csv941.exp
Exec = ..\bin\$m\scheme.exe
MTMain = ..\boot\$m\mainmt.obj
MDMain = ..\boot\$m\mainmd.obj
diff --git a/c/Makefile.ti3nt b/c/Makefile.ti3nt
index 83d9ceba3c..d7ea1396c8 100644
--- a/c/Makefile.ti3nt
+++ b/c/Makefile.ti3nt
@@ -18,11 +18,11 @@ m = ti3nt
# following have to use \ for directory separator
SchemeInclude = ..\boot\$m
ZlibInclude = ..\zlib
-KernelDll = ..\bin\$m\csv94.dll
-KernelLib = ..\bin\$m\csv94.lib
-MTKernelLib = ..\boot\$m\csv94mt.lib
-MDKernelLib = ..\boot\$m\csv94md.lib
-KernelExp = ..\bin\$m\csv94.exp
+KernelDll = ..\bin\$m\csv941.dll
+KernelLib = ..\bin\$m\csv941.lib
+MTKernelLib = ..\boot\$m\csv941mt.lib
+MDKernelLib = ..\boot\$m\csv941md.lib
+KernelExp = ..\bin\$m\csv941.exp
Exec = ..\bin\$m\scheme.exe
MTMain = ..\boot\$m\mainmt.obj
MDMain = ..\boot\$m\mainmd.obj
diff --git a/c/scheme.rc b/c/scheme.rc
index ab635f2f85..ab67b85235 100644
--- a/c/scheme.rc
+++ b/c/scheme.rc
@@ -1,8 +1,8 @@
#include "winver.h"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 9,4,0,0
- PRODUCTVERSION 9,4,0,0
+ FILEVERSION 9,4,1,0
+ PRODUCTVERSION 9,4,1,0
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS VOS__WINDOWS32
@@ -12,13 +12,13 @@ VS_VERSION_INFO VERSIONINFO
BLOCK "StringFileInfo" {
BLOCK "04090000" {
VALUE "CompanyName", "Cisco Systems, Inc."
- VALUE "FileDescription", "Chez Scheme Version 9.4"
- VALUE "FileVersion", "9.4"
+ VALUE "FileDescription", "Chez Scheme Version 9.4.1"
+ VALUE "FileVersion", "9.4.1"
VALUE "InternalName", "scheme.exe"
VALUE "LegalCopyright", "Copyright 1984-2016 Cisco Systems, Inc. Licensed under the Apache License, Version 2.0."
VALUE "OriginalFilename", "scheme.exe"
VALUE "ProductName", "Chez Scheme"
- VALUE "ProductVersion", "9.4"
+ VALUE "ProductVersion", "9.4.1"
}
}
BLOCK "VarFileInfo" {
diff --git a/checkin b/checkin
index 3359077246..2e99a0a7cb 100755
--- a/checkin
+++ b/checkin
@@ -110,7 +110,6 @@ foreach x ($sdirs)
goto error
endsw
end
-(cd $W/zlib; make distclean > & /dev/null; rm -f zconf.h rm -f Makefile > /dev/null)
set ignorefiles = ()
@@ -299,7 +298,7 @@ endif
delete:
-set tmpfiles = `(cd $W; find . -type f -print)`
+set tmpfiles = `(cd $W; find . -name zlib -prune -o -type f -print)`
set files = ()
foreach x ($tmpfiles)
set files = ($x $files)
diff --git a/csug/copyright.stex b/csug/copyright.stex
index b17e550eba..025feaafe7 100644
--- a/csug/copyright.stex
+++ b/csug/copyright.stex
@@ -22,7 +22,7 @@ Licensed under the Apache License Version 2.0\\
http://www.apache.org/licenses/LICENSE-2.0
% NB: also update corresponding notice in csug.stex
-Revised May 2016 for Chez Scheme Version 9.4.
+Revised \INSERTREVISIONMONTHSPACEYEAR for Chez Scheme Version 9.4.1.
\medskip\noindent
Cisco and the Cisco logo are trademarks or registered trademarks
diff --git a/csug/csug.stex b/csug/csug.stex
index 60e83e06bf..0d5c4e6b79 100644
--- a/csug/csug.stex
+++ b/csug/csug.stex
@@ -44,7 +44,7 @@
Copyright © 2016 Cisco Systems, Inc.
Licensed under the Apache License Version 2.0
(full copyright notice.).
-Revised May 2016 for Chez Scheme Version 9.4
+Revised \INSERTREVISIONMONTHSPACEYEAR for Chez Scheme Version 9.4.1
about this book
}}
diff --git a/makefiles/Mf-install.in b/makefiles/Mf-install.in
index 628e26eac5..dc71823384 100644
--- a/makefiles/Mf-install.in
+++ b/makefiles/Mf-install.in
@@ -58,7 +58,7 @@ InstallScriptName=scheme-script
# no changes should be needed below this point #
###############################################################################
-Version=csv9.4
+Version=csv9.4.1
Include=boot/$m
PetiteBoot=boot/$m/petite.boot
SchemeBoot=boot/$m/scheme.boot
diff --git a/mats/bldnt.bat b/mats/bldnt.bat
index 7e0a368c9d..c82a8e8a79 100644
--- a/mats/bldnt.bat
+++ b/mats/bldnt.bat
@@ -7,5 +7,5 @@ cl /I../boot/%m% /nologo -c -DWIN32 foreign1.c
cl /I../boot/%m% /nologo -c -DWIN32 foreign2.c
cl /I../boot/%m% /nologo -c -DWIN32 foreign3.c
cl /nologo /DWIN32 cat_flush.c
-link -dll -out:foreign1.so foreign1.obj foreign2.obj foreign3.obj ..\bin\%m%\csv94.lib
+link -dll -out:foreign1.so foreign1.obj foreign2.obj foreign3.obj ..\bin\%m%\csv941.lib
..\bin\%m%\scheme -q mat.so < script.all%o%
diff --git a/release_notes/release_notes.stex b/release_notes/release_notes.stex
index cae6f1ffb2..2e9319ef9e 100644
--- a/release_notes/release_notes.stex
+++ b/release_notes/release_notes.stex
@@ -1,6 +1,6 @@
\documentclass{releasenotes}
-\thisversion{Version 9.4}
+\thisversion{Version 9.4.1}
\thatversion{Version 8.4}
\pubmonth{May}
\pubyear{2016}
diff --git a/s/cmacros.ss b/s/cmacros.ss
index b4221a547a..57bb2b13cb 100644
--- a/s/cmacros.ss
+++ b/s/cmacros.ss
@@ -328,7 +328,7 @@
[(_ foo e1 e2) e1] ...
[(_ bar e1 e2) e2]))))])))
-(define-constant scheme-version #x00090400)
+(define-constant scheme-version #x00090401)
(define-syntax define-machine-types
(lambda (x)
diff --git a/workarea b/workarea
index 734625e55d..6b7cb15e7b 100755
--- a/workarea
+++ b/workarea
@@ -176,8 +176,8 @@ case $M in
*nt)
(cd $W/boot/$M; workln ../../../boot/$M/mainmd.obj mainmd.obj)
(cd $W/boot/$M; workln ../../../boot/$M/mainmt.obj mainmt.obj)
- (cd $W/boot/$M; workln ../../../boot/$M/csv94md.lib csv94md.lib)
- (cd $W/boot/$M; workln ../../../boot/$M/csv94mt.lib csv94mt.lib)
+ (cd $W/boot/$M; workln ../../../boot/$M/csv941md.lib csv941md.lib)
+ (cd $W/boot/$M; workln ../../../boot/$M/csv941mt.lib csv941mt.lib)
(cd $W/boot/$M; workln ../../../boot/$M/scheme.res scheme.res)
;;
*)
@@ -192,8 +192,8 @@ case $M in
*nt)
(cd $W/bin/$M; workln ../../../bin/$M/scheme.exe scheme.exe)
(cd $W/bin/$M; forceworkln scheme.exe petite.exe)
- (cd $W/bin/$M; workln ../../../bin/$M/csv94.dll csv94.dll)
- (cd $W/bin/$M; workln ../../../bin/$M/csv94.lib csv94.lib)
+ (cd $W/bin/$M; workln ../../../bin/$M/csv941.dll csv941.dll)
+ (cd $W/bin/$M; workln ../../../bin/$M/csv941.lib csv941.lib)
;;
*)
(cd $W/bin/$M; workln ../../../bin/$M/scheme scheme)
@@ -206,7 +206,7 @@ case $M in
*nt)
(cd $W/bin; forceworkln $M/scheme.exe scheme.exe)
(cd $W/bin; forceworkln $M/petite.exe petite.exe)
- (cd $W/bin; forceworkln $M/csv94.dll csv94.dll)
+ (cd $W/bin; forceworkln $M/csv941.dll csv941.dll)
;;
*)
(cd $W/bin; forceworkln $M/scheme scheme)