diff --git a/BUILDING b/BUILDING index 07d0a78805..24533337c7 100644 --- a/BUILDING +++ b/BUILDING @@ -1,4 +1,4 @@ -Building Chez Scheme Version 9.5.2 +Building Chez Scheme Version 9.5.3 Copyright 1984-2019 Cisco Systems, Inc. Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/LOG b/LOG index 5c0ea61dbe..7b9a1ae62d 100644 --- a/LOG +++ b/LOG @@ -1232,3 +1232,14 @@ fasl.c, ftype.ms, release_notes.stex + +9.5.3 changes: +- updated version to 9.5.3 + BUILDING NOTICE makefiles/Mf-install.in makefiles/Makefile-csug.in + scheme.1.in c/Makefile.a6nt c/Makefile.i3nt c/Makefile.ta6nt + c/Makefile.ti3nt mats/Mf-a6nt mats/Mf-i3nt mats/Mf-ta6nt + mats/Mf-ti3nt workarea c/scheme.rc s/7.ss s/cmacros.ss + release_notes/release_notes.stex csug/copyright.stex csug/csug.stex + bintar/Makefile rpm/Makefile pkg/Makefile wininstall/Makefile + wininstall/a6nt.wxs wininstall/i3nt.wxs wininstall/ta6nt.wxs + wininstall/ti3nt.wxs diff --git a/NOTICE b/NOTICE index 386eeb28d4..a2067d8388 100644 --- a/NOTICE +++ b/NOTICE @@ -1,4 +1,4 @@ -Chez Scheme Version 9.5.2 +Chez Scheme Version 9.5.3 Copyright 1984-2019 Cisco Systems, Inc. This product includes code developed by Cisco Systems, Inc. diff --git a/bintar/Makefile b/bintar/Makefile index 9acaa7f149..e88788fb32 100644 --- a/bintar/Makefile +++ b/bintar/Makefile @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -version = 9.5.2 +version = 9.5.3 m := $(shell find ../bin/* -type d | xargs basename) R = csv$(version) @@ -61,7 +61,7 @@ $(R)/boot: $(R) ( cd $(R)/boot/$(m) ; ln -s ../../../../boot/$(m)/{scheme.h,petite.boot,scheme.boot} . ) case $(m) in \ *nt) \ - ( cd $R/boot/$(m) ; ln -s ../../../../boot/$(m)/{csv952md.lib,csv952mt.lib,mainmd.obj,mainmt.obj,scheme.res} . ) \ + ( cd $R/boot/$(m) ; ln -s ../../../../boot/$(m)/{csv953md.lib,csv953mt.lib,mainmd.obj,mainmt.obj,scheme.res} . ) \ ;; \ *) \ ( cd $R/boot/$(m) ; ln -s ../../../../boot/$(m)/{main.o,kernel.o} . ) \ @@ -72,7 +72,7 @@ $(R)/bin: $(R) mkdir -p $(R)/bin/$(m) case $(m) in \ *nt) \ - ( cd $R/bin/$(m) ; ln -s ../../../../bin/$(m)/{scheme.exe,csv952.dll,csv952.lib,vcruntime140.lib} . ) \ + ( cd $R/bin/$(m) ; ln -s ../../../../bin/$(m)/{scheme.exe,csv953.dll,csv953.lib,vcruntime140.lib} . ) \ ;; \ *) \ ( cd $R/bin/$(m) ; ln -s ../../../../bin/$(m)/scheme . ) \ diff --git a/c/Makefile.a6nt b/c/Makefile.a6nt index 79eedfcf43..ef09f5db5c 100644 --- a/c/Makefile.a6nt +++ b/c/Makefile.a6nt @@ -17,11 +17,11 @@ m = a6nt # following have to use \ for directory separator SchemeInclude = ..\boot\$m -KernelDll = ..\bin\$m\csv952.dll -KernelLib = ..\bin\$m\csv952.lib -MTKernelLib = ..\boot\$m\csv952mt.lib -MDKernelLib = ..\boot\$m\csv952md.lib -KernelExp = ..\bin\$m\csv952.exp +KernelDll = ..\bin\$m\csv953.dll +KernelLib = ..\bin\$m\csv953.lib +MTKernelLib = ..\boot\$m\csv953mt.lib +MDKernelLib = ..\boot\$m\csv953md.lib +KernelExp = ..\bin\$m\csv953.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 4a91a815a7..448984e7eb 100644 --- a/c/Makefile.i3nt +++ b/c/Makefile.i3nt @@ -17,11 +17,11 @@ m = i3nt # following have to use \ for directory separator SchemeInclude = ..\boot\$m -KernelDll = ..\bin\$m\csv952.dll -KernelLib = ..\bin\$m\csv952.lib -MTKernelLib = ..\boot\$m\csv952mt.lib -MDKernelLib = ..\boot\$m\csv952md.lib -KernelExp = ..\bin\$m\csv952.exp +KernelDll = ..\bin\$m\csv953.dll +KernelLib = ..\bin\$m\csv953.lib +MTKernelLib = ..\boot\$m\csv953mt.lib +MDKernelLib = ..\boot\$m\csv953md.lib +KernelExp = ..\bin\$m\csv953.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 9a6617551f..c9258d983d 100644 --- a/c/Makefile.ta6nt +++ b/c/Makefile.ta6nt @@ -17,11 +17,11 @@ m = ta6nt # following have to use \ for directory separator SchemeInclude = ..\boot\$m -KernelDll = ..\bin\$m\csv952.dll -KernelLib = ..\bin\$m\csv952.lib -MTKernelLib = ..\boot\$m\csv952mt.lib -MDKernelLib = ..\boot\$m\csv952md.lib -KernelExp = ..\bin\$m\csv952.exp +KernelDll = ..\bin\$m\csv953.dll +KernelLib = ..\bin\$m\csv953.lib +MTKernelLib = ..\boot\$m\csv953mt.lib +MDKernelLib = ..\boot\$m\csv953md.lib +KernelExp = ..\bin\$m\csv953.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 bcf9cd433e..2cbb2c715f 100644 --- a/c/Makefile.ti3nt +++ b/c/Makefile.ti3nt @@ -17,11 +17,11 @@ m = ti3nt # following have to use \ for directory separator SchemeInclude = ..\boot\$m -KernelDll = ..\bin\$m\csv952.dll -KernelLib = ..\bin\$m\csv952.lib -MTKernelLib = ..\boot\$m\csv952mt.lib -MDKernelLib = ..\boot\$m\csv952md.lib -KernelExp = ..\bin\$m\csv952.exp +KernelDll = ..\bin\$m\csv953.dll +KernelLib = ..\bin\$m\csv953.lib +MTKernelLib = ..\boot\$m\csv953mt.lib +MDKernelLib = ..\boot\$m\csv953md.lib +KernelExp = ..\bin\$m\csv953.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 3c31db7892..9f63ef0133 100644 --- a/c/scheme.rc +++ b/c/scheme.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 9,5,2,0 - PRODUCTVERSION 9,5,2,0 + FILEVERSION 9,5,3,0 + PRODUCTVERSION 9,5,3,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.5.2" - VALUE "FileVersion", "9.5.2" + VALUE "FileDescription", "Chez Scheme Version 9.5.3" + VALUE "FileVersion", "9.5.3" VALUE "InternalName", "scheme.exe" VALUE "LegalCopyright", "Copyright 1984-2019 Cisco Systems, Inc. Licensed under the Apache License, Version 2.0." VALUE "OriginalFilename", "scheme.exe" VALUE "ProductName", "Chez Scheme" - VALUE "ProductVersion", "9.5.2" + VALUE "ProductVersion", "9.5.3" } } BLOCK "VarFileInfo" { diff --git a/csug/copyright.stex b/csug/copyright.stex index 583e8868a2..c75637f587 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 \revisiondate~for Chez Scheme Version 9.5.2. +Revised \revisiondate~for Chez Scheme Version 9.5.3. \medskip\noindent Cisco and the Cisco logo are trademarks or registered trademarks diff --git a/csug/csug.stex b/csug/csug.stex index bcd9d7d37b..0fec9041da 100644 --- a/csug/csug.stex +++ b/csug/csug.stex @@ -63,7 +63,7 @@ Copyright © 2019 Cisco Systems, Inc.
Licensed under the Apache License Version 2.0 (full copyright notice.).
-Revised} \revisiondate\raw{ for Chez Scheme Version 9.5.2
+Revised} \revisiondate\raw{ for Chez Scheme Version 9.5.3
about this book }} diff --git a/makefiles/Mf-install.in b/makefiles/Mf-install.in index 6ea9aaaca0..0e1f51838c 100644 --- a/makefiles/Mf-install.in +++ b/makefiles/Mf-install.in @@ -55,7 +55,7 @@ InstallScriptName=scheme-script # no changes should be needed below this point # ############################################################################### -Version=csv9.5.2 +Version=csv9.5.3 Include=boot/$m PetiteBoot=boot/$m/petite.boot SchemeBoot=boot/$m/scheme.boot diff --git a/mats/Mf-a6nt b/mats/Mf-a6nt index 0244275180..74ca208c14 100644 --- a/mats/Mf-a6nt +++ b/mats/Mf-a6nt @@ -22,7 +22,7 @@ mdclean = cat_flush.exe cat_flush.obj foreign1.exp foreign1.lib foreign1.obj for include Mf-base foreign1.so: $(fsrc) - cmd.exe /c "vs.bat amd64 && cl /DWIN32 /DX86_64 /Fe$@ /I${Include} /LD /MD /nologo ../bin/$m/csv952.lib $(fsrc)" + cmd.exe /c "vs.bat amd64 && cl /DWIN32 /DX86_64 /Fe$@ /I${Include} /LD /MD /nologo ../bin/$m/csv953.lib $(fsrc)" cat_flush: cat_flush.c cmd.exe /c "vs.bat amd64 && cl /DWIN32 /DX86_64 /MD /nologo $<" diff --git a/mats/Mf-i3nt b/mats/Mf-i3nt index d807e0a8b3..3c8da577f1 100644 --- a/mats/Mf-i3nt +++ b/mats/Mf-i3nt @@ -22,7 +22,7 @@ mdclean = cat_flush.exe cat_flush.obj foreign1.exp foreign1.lib foreign1.obj for include Mf-base foreign1.so: $(fsrc) - cmd.exe /c "vs.bat x86 && cl /DWIN32 /Fe$@ /I${Include} /LD /MD /nologo ../bin/$m/csv952.lib $(fsrc)" + cmd.exe /c "vs.bat x86 && cl /DWIN32 /Fe$@ /I${Include} /LD /MD /nologo ../bin/$m/csv953.lib $(fsrc)" cat_flush: cat_flush.c cmd.exe /c "vs.bat x86 && cl /DWIN32 /MD /nologo $<" diff --git a/mats/Mf-ta6nt b/mats/Mf-ta6nt index 5bf797ff8e..23f65694b0 100644 --- a/mats/Mf-ta6nt +++ b/mats/Mf-ta6nt @@ -22,7 +22,7 @@ mdclean = cat_flush.exe cat_flush.obj foreign1.exp foreign1.lib foreign1.obj for include Mf-base foreign1.so: $(fsrc) - cmd.exe /c "vs.bat amd64 && cl /DWIN32 /DX86_64 /Fe$@ /I${Include} /LD /MD /nologo ../bin/$m/csv952.lib $(fsrc)" + cmd.exe /c "vs.bat amd64 && cl /DWIN32 /DX86_64 /Fe$@ /I${Include} /LD /MD /nologo ../bin/$m/csv953.lib $(fsrc)" cat_flush: cat_flush.c cmd.exe /c "vs.bat amd64 && cl /DWIN32 /DX86_64 /MD /nologo $<" diff --git a/mats/Mf-ti3nt b/mats/Mf-ti3nt index ab582e3faf..3c7e300574 100644 --- a/mats/Mf-ti3nt +++ b/mats/Mf-ti3nt @@ -22,7 +22,7 @@ mdclean = cat_flush.exe cat_flush.obj foreign1.exp foreign1.lib foreign1.obj for include Mf-base foreign1.so: $(fsrc) - cmd.exe /c "vs.bat x86 && cl /DWIN32 /Fe$@ /I${Include} /LD /MD /nologo ../bin/$m/csv952.lib $(fsrc)" + cmd.exe /c "vs.bat x86 && cl /DWIN32 /Fe$@ /I${Include} /LD /MD /nologo ../bin/$m/csv953.lib $(fsrc)" cat_flush: cat_flush.c cmd.exe /c "vs.bat x86 && cl /DWIN32 /MD /nologo $<" diff --git a/pkg/Makefile b/pkg/Makefile index 771d8ccdf5..33b77f7a65 100644 --- a/pkg/Makefile +++ b/pkg/Makefile @@ -14,7 +14,7 @@ # limitations under the License. m := $(shell find ../bin/* -type d | xargs basename) -version = 9.5.2 +version = 9.5.3 release = 1 DOTUSER = $(shell ls -ld . | sed -e 's/[^ ]* *[^ ]* *\([^ ]*\).*/\1/') diff --git a/release_notes/release_notes.stex b/release_notes/release_notes.stex index 192725f068..4727ac2e39 100644 --- a/release_notes/release_notes.stex +++ b/release_notes/release_notes.stex @@ -1,6 +1,6 @@ \documentclass{releasenotes} -\thisversion{Version 9.5.2} +\thisversion{Version 9.5.3} \thatversion{Version 8.4} \pubmonth{January} \pubyear{2019} diff --git a/rpm/Makefile b/rpm/Makefile index 4d36324a5a..901358bcdd 100644 --- a/rpm/Makefile +++ b/rpm/Makefile @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -version = 9.5.2 +version = 9.5.3 release = 1 m := $(shell find ../bin/* -type d | xargs basename) arch := $(shell if test "$(m)" == "i3le" ; then echo i686 ; elif test "$(m)" == "a6le" ; then echo x86_64 ; else echo UNKNOWN ; fi) diff --git a/s/cmacros.ss b/s/cmacros.ss index 88f6c65403..20be35ac5a 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 #x00090502) +(define-constant scheme-version #x00090503) (define-syntax define-machine-types (lambda (x) diff --git a/scheme.1.in b/scheme.1.in index 3dab1faafa..5c69518c38 100644 --- a/scheme.1.in +++ b/scheme.1.in @@ -3,7 +3,7 @@ .if t .ds c caf\o'\'e' .if n .ds c cafe .ds ]W -.TH SCHEME 1 "Chez Scheme Version 9.5.2 March 2019" +.TH SCHEME 1 "Chez Scheme Version 9.5.3 March 2019" .SH NAME \fIChez Scheme\fP .br diff --git a/wininstall/Makefile b/wininstall/Makefile index 38ba0d66f8..0b23a4313e 100644 --- a/wininstall/Makefile +++ b/wininstall/Makefile @@ -1,4 +1,4 @@ -VERSION := 9.5.2 +VERSION := 9.5.3 WIXEXTENSIONS := -ext WixUIExtension -ext WixBalExtension ChezScheme.exe: x86/bundle.wixobj ChezScheme32.msi ChezScheme64.msi diff --git a/wininstall/a6nt.wxs b/wininstall/a6nt.wxs index 7914da8a42..6dd2e69396 100644 --- a/wininstall/a6nt.wxs +++ b/wininstall/a6nt.wxs @@ -4,16 +4,16 @@ - + - + - + - + @@ -40,10 +40,10 @@ - + - + diff --git a/wininstall/i3nt.wxs b/wininstall/i3nt.wxs index 9e13a99f00..945c5ef287 100644 --- a/wininstall/i3nt.wxs +++ b/wininstall/i3nt.wxs @@ -4,16 +4,16 @@ - + - + - + - + @@ -40,10 +40,10 @@ - + - + diff --git a/wininstall/ta6nt.wxs b/wininstall/ta6nt.wxs index 3463b00bed..19c315cf56 100644 --- a/wininstall/ta6nt.wxs +++ b/wininstall/ta6nt.wxs @@ -4,16 +4,16 @@ - + - + - + - + @@ -40,10 +40,10 @@ - + - + diff --git a/wininstall/ti3nt.wxs b/wininstall/ti3nt.wxs index fffad58bfb..1773f066d5 100644 --- a/wininstall/ti3nt.wxs +++ b/wininstall/ti3nt.wxs @@ -4,16 +4,16 @@ - + - + - + - + @@ -40,10 +40,10 @@ - + - + diff --git a/workarea b/workarea index 5c6e452485..11cf2c7b10 100755 --- a/workarea +++ b/workarea @@ -200,8 +200,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/csv952md.lib csv952md.lib) - (cd $W/boot/$M; workln ../../../boot/$M/csv952mt.lib csv952mt.lib) + (cd $W/boot/$M; workln ../../../boot/$M/csv953md.lib csv953md.lib) + (cd $W/boot/$M; workln ../../../boot/$M/csv953mt.lib csv953mt.lib) (cd $W/boot/$M; workln ../../../boot/$M/scheme.res scheme.res) ;; *) @@ -216,8 +216,8 @@ case $M in *nt) (cd $W/bin/$M; workln ../../../bin/$M/scheme.exe scheme.exe) (cd $W/bin/$M; forceworkln2 scheme.exe petite.exe) - (cd $W/bin/$M; workln ../../../bin/$M/csv952.dll csv952.dll) - (cd $W/bin/$M; workln ../../../bin/$M/csv952.lib csv952.lib) + (cd $W/bin/$M; workln ../../../bin/$M/csv953.dll csv953.dll) + (cd $W/bin/$M; workln ../../../bin/$M/csv953.lib csv953.lib) ;; *) (cd $W/bin/$M; workln ../../../bin/$M/scheme scheme)