diff --git a/BUILDING b/BUILDING index 111595b70..fa0632eb0 100644 --- a/BUILDING +++ b/BUILDING @@ -1,4 +1,4 @@ -Building Chez Scheme Version 9.6.0 +Building Chez Scheme Version 9.6.2 Copyright 1984-2023 Cisco Systems, Inc. Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/LOG b/LOG index 7525f9851..2e1ed95b6 100644 --- a/LOG +++ b/LOG @@ -2417,4 +2417,15 @@ wininstall/ti3nt.wxs - removed Microsoft C Runtime library merge module redistribution as recommended by Microsoft -- specify version of WiX required to build the Windows installer \ No newline at end of file +- specify version of WiX required to build the Windows installer + +9.6.2 changes: +- The make install target of 9.6.0 was broken by the version string being 9.6. +- updated version to 9.6.2 + BUILDING NOTICE makefiles/Mf-install.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/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 5db830c20..05920e1bd 100644 --- a/NOTICE +++ b/NOTICE @@ -1,4 +1,4 @@ -Chez Scheme Version 9.6.0 +Chez Scheme Version 9.6.2 Copyright 1984-2023 Cisco Systems, Inc. This product includes code developed by Cisco Systems, Inc. diff --git a/bintar/Makefile b/bintar/Makefile index f17e1c058..feac7be99 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.6.0 +version = 9.6.2 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,revision} . ) case $(m) in \ *nt) \ - ( cd $R/boot/$(m) ; ln -s ../../../../boot/$(m)/{csv960md.lib,csv960mt.lib,mainmd.obj,mainmt.obj,scheme.res} . ) \ + ( cd $R/boot/$(m) ; ln -s ../../../../boot/$(m)/{csv962md.lib,csv962mt.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,csv960.dll,csv960.lib,vcruntime140.lib} . ) \ + ( cd $R/bin/$(m) ; ln -s ../../../../bin/$(m)/{scheme.exe,csv962.dll,csv962.lib,vcruntime140.lib} . ) \ ;; \ *) \ ( cd $R/bin/$(m) ; ln -s ../../../../bin/$(m)/scheme . ) \ diff --git a/boot/a6le/equates.h b/boot/a6le/equates.h index d4bc4db24..9b9690333 100644 --- a/boot/a6le/equates.h +++ b/boot/a6le/equates.h @@ -1,4 +1,4 @@ -/* equates.h for Chez Scheme Version 9.6 */ +/* equates.h for Chez Scheme Version 9.6.2 */ /* Do not edit this file. It is automatically generated and */ /* specifically tailored to the version of Chez Scheme named */ @@ -485,7 +485,7 @@ typedef unsigned long U64; #define rtd_sealed 0x4 #define sbwp (ptr)0x4E #define scaled_shot_1_shot_flag -0x8 -#define scheme_version 0x90600 +#define scheme_version 0x90602 #define segment_card_offset_bits 0x5 #define segment_offset_bits 0xE #define segment_t1_bits 0x10 diff --git a/boot/a6le/petite.boot b/boot/a6le/petite.boot index e10180087..8a765a16a 100644 Binary files a/boot/a6le/petite.boot and b/boot/a6le/petite.boot differ diff --git a/boot/a6le/scheme.boot b/boot/a6le/scheme.boot index 6a5b9293d..23dd62e3c 100644 Binary files a/boot/a6le/scheme.boot and b/boot/a6le/scheme.boot differ diff --git a/boot/a6le/scheme.h b/boot/a6le/scheme.h index 551d3270d..c1bcd6e93 100644 --- a/boot/a6le/scheme.h +++ b/boot/a6le/scheme.h @@ -1,4 +1,4 @@ -/* scheme.h for Chez Scheme Version 9.6 (a6le) */ +/* scheme.h for Chez Scheme Version 9.6.2 (a6le) */ /* Do not edit this file. It is automatically generated and */ /* specifically tailored to the version of Chez Scheme named */ @@ -35,7 +35,7 @@ #endif /* Chez Scheme Version and machine type */ -#define VERSION "9.6" +#define VERSION "9.6.2" #define MACHINE_TYPE "a6le" /* All Scheme objects are of type ptr. Type iptr and */ diff --git a/boot/a6nt/equates.h b/boot/a6nt/equates.h index 9b9ee835d..9ec45ba75 100644 --- a/boot/a6nt/equates.h +++ b/boot/a6nt/equates.h @@ -1,4 +1,4 @@ -/* equates.h for Chez Scheme Version 9.6 */ +/* equates.h for Chez Scheme Version 9.6.2 */ /* Do not edit this file. It is automatically generated and */ /* specifically tailored to the version of Chez Scheme named */ @@ -485,7 +485,7 @@ typedef unsigned long long U64; #define rtd_sealed 0x4 #define sbwp (ptr)0x4E #define scaled_shot_1_shot_flag -0x8 -#define scheme_version 0x90600 +#define scheme_version 0x90602 #define segment_card_offset_bits 0x5 #define segment_offset_bits 0xE #define segment_t1_bits 0x10 diff --git a/boot/a6nt/petite.boot b/boot/a6nt/petite.boot index 770f67683..1e707110a 100644 Binary files a/boot/a6nt/petite.boot and b/boot/a6nt/petite.boot differ diff --git a/boot/a6nt/scheme.boot b/boot/a6nt/scheme.boot index ab52fee0f..97c22eea0 100644 Binary files a/boot/a6nt/scheme.boot and b/boot/a6nt/scheme.boot differ diff --git a/boot/a6nt/scheme.h b/boot/a6nt/scheme.h index 795b40b45..a2f2ca4b0 100644 --- a/boot/a6nt/scheme.h +++ b/boot/a6nt/scheme.h @@ -1,4 +1,4 @@ -/* scheme.h for Chez Scheme Version 9.6 (a6nt) */ +/* scheme.h for Chez Scheme Version 9.6.2 (a6nt) */ /* Do not edit this file. It is automatically generated and */ /* specifically tailored to the version of Chez Scheme named */ @@ -35,7 +35,7 @@ #endif /* Chez Scheme Version and machine type */ -#define VERSION "9.6" +#define VERSION "9.6.2" #define MACHINE_TYPE "a6nt" /* All Scheme objects are of type ptr. Type iptr and */ diff --git a/boot/a6osx/equates.h b/boot/a6osx/equates.h index 4d9cd3789..d510b9d3b 100644 --- a/boot/a6osx/equates.h +++ b/boot/a6osx/equates.h @@ -1,4 +1,4 @@ -/* equates.h for Chez Scheme Version 9.6 */ +/* equates.h for Chez Scheme Version 9.6.2 */ /* Do not edit this file. It is automatically generated and */ /* specifically tailored to the version of Chez Scheme named */ @@ -485,7 +485,7 @@ typedef unsigned long U64; #define rtd_sealed 0x4 #define sbwp (ptr)0x4E #define scaled_shot_1_shot_flag -0x8 -#define scheme_version 0x90600 +#define scheme_version 0x90602 #define segment_card_offset_bits 0x5 #define segment_offset_bits 0xE #define segment_t1_bits 0x10 diff --git a/boot/a6osx/petite.boot b/boot/a6osx/petite.boot index 1b643f8a5..5514b0328 100644 Binary files a/boot/a6osx/petite.boot and b/boot/a6osx/petite.boot differ diff --git a/boot/a6osx/scheme.boot b/boot/a6osx/scheme.boot index 5438a620d..2eb37b7ca 100644 Binary files a/boot/a6osx/scheme.boot and b/boot/a6osx/scheme.boot differ diff --git a/boot/a6osx/scheme.h b/boot/a6osx/scheme.h index 49015667a..8c83690f3 100644 --- a/boot/a6osx/scheme.h +++ b/boot/a6osx/scheme.h @@ -1,4 +1,4 @@ -/* scheme.h for Chez Scheme Version 9.6 (a6osx) */ +/* scheme.h for Chez Scheme Version 9.6.2 (a6osx) */ /* Do not edit this file. It is automatically generated and */ /* specifically tailored to the version of Chez Scheme named */ @@ -35,7 +35,7 @@ #endif /* Chez Scheme Version and machine type */ -#define VERSION "9.6" +#define VERSION "9.6.2" #define MACHINE_TYPE "a6osx" /* All Scheme objects are of type ptr. Type iptr and */ diff --git a/boot/arm32le/equates.h b/boot/arm32le/equates.h index 222251982..52f2c1265 100644 --- a/boot/arm32le/equates.h +++ b/boot/arm32le/equates.h @@ -1,4 +1,4 @@ -/* equates.h for Chez Scheme Version 9.6 */ +/* equates.h for Chez Scheme Version 9.6.2 */ /* Do not edit this file. It is automatically generated and */ /* specifically tailored to the version of Chez Scheme named */ @@ -486,7 +486,7 @@ typedef unsigned long long U64; #define rtd_sealed 0x4 #define sbwp (ptr)0x4E #define scaled_shot_1_shot_flag -0x4 -#define scheme_version 0x90600 +#define scheme_version 0x90602 #define segment_card_offset_bits 0x5 #define segment_offset_bits 0xD #define segment_t1_bits 0x13 diff --git a/boot/arm32le/petite.boot b/boot/arm32le/petite.boot index b8a2e0094..83bb2c98b 100644 Binary files a/boot/arm32le/petite.boot and b/boot/arm32le/petite.boot differ diff --git a/boot/arm32le/scheme.boot b/boot/arm32le/scheme.boot index 029ef9b55..dfafcde4b 100644 Binary files a/boot/arm32le/scheme.boot and b/boot/arm32le/scheme.boot differ diff --git a/boot/arm32le/scheme.h b/boot/arm32le/scheme.h index 2fa6b4a69..eb3d8e0bc 100644 --- a/boot/arm32le/scheme.h +++ b/boot/arm32le/scheme.h @@ -1,4 +1,4 @@ -/* scheme.h for Chez Scheme Version 9.6 (arm32le) */ +/* scheme.h for Chez Scheme Version 9.6.2 (arm32le) */ /* Do not edit this file. It is automatically generated and */ /* specifically tailored to the version of Chez Scheme named */ @@ -35,7 +35,7 @@ #endif /* Chez Scheme Version and machine type */ -#define VERSION "9.6" +#define VERSION "9.6.2" #define MACHINE_TYPE "arm32le" /* All Scheme objects are of type ptr. Type iptr and */ diff --git a/boot/i3le/equates.h b/boot/i3le/equates.h index 3b4776ca2..3e5e89302 100644 --- a/boot/i3le/equates.h +++ b/boot/i3le/equates.h @@ -1,4 +1,4 @@ -/* equates.h for Chez Scheme Version 9.6 */ +/* equates.h for Chez Scheme Version 9.6.2 */ /* Do not edit this file. It is automatically generated and */ /* specifically tailored to the version of Chez Scheme named */ @@ -485,7 +485,7 @@ typedef unsigned long long U64; #define rtd_sealed 0x4 #define sbwp (ptr)0x4E #define scaled_shot_1_shot_flag -0x4 -#define scheme_version 0x90600 +#define scheme_version 0x90602 #define segment_card_offset_bits 0x5 #define segment_offset_bits 0xD #define segment_t1_bits 0x13 diff --git a/boot/i3le/petite.boot b/boot/i3le/petite.boot index 4edc722b3..d243fc2e0 100644 Binary files a/boot/i3le/petite.boot and b/boot/i3le/petite.boot differ diff --git a/boot/i3le/scheme.boot b/boot/i3le/scheme.boot index db6c29191..408fdf8e6 100644 Binary files a/boot/i3le/scheme.boot and b/boot/i3le/scheme.boot differ diff --git a/boot/i3le/scheme.h b/boot/i3le/scheme.h index b6c6a1644..aaaef52e5 100644 --- a/boot/i3le/scheme.h +++ b/boot/i3le/scheme.h @@ -1,4 +1,4 @@ -/* scheme.h for Chez Scheme Version 9.6 (i3le) */ +/* scheme.h for Chez Scheme Version 9.6.2 (i3le) */ /* Do not edit this file. It is automatically generated and */ /* specifically tailored to the version of Chez Scheme named */ @@ -35,7 +35,7 @@ #endif /* Chez Scheme Version and machine type */ -#define VERSION "9.6" +#define VERSION "9.6.2" #define MACHINE_TYPE "i3le" /* All Scheme objects are of type ptr. Type iptr and */ diff --git a/boot/i3nt/equates.h b/boot/i3nt/equates.h index a44564c3c..1b30fecbf 100644 --- a/boot/i3nt/equates.h +++ b/boot/i3nt/equates.h @@ -1,4 +1,4 @@ -/* equates.h for Chez Scheme Version 9.6 */ +/* equates.h for Chez Scheme Version 9.6.2 */ /* Do not edit this file. It is automatically generated and */ /* specifically tailored to the version of Chez Scheme named */ @@ -485,7 +485,7 @@ typedef unsigned long long U64; #define rtd_sealed 0x4 #define sbwp (ptr)0x4E #define scaled_shot_1_shot_flag -0x4 -#define scheme_version 0x90600 +#define scheme_version 0x90602 #define segment_card_offset_bits 0x5 #define segment_offset_bits 0xD #define segment_t1_bits 0x13 diff --git a/boot/i3nt/petite.boot b/boot/i3nt/petite.boot index 2e77c11cd..88efdfb43 100644 Binary files a/boot/i3nt/petite.boot and b/boot/i3nt/petite.boot differ diff --git a/boot/i3nt/scheme.boot b/boot/i3nt/scheme.boot index 8863bfbc9..66af8ec2e 100644 Binary files a/boot/i3nt/scheme.boot and b/boot/i3nt/scheme.boot differ diff --git a/boot/i3nt/scheme.h b/boot/i3nt/scheme.h index ed1d9858c..c118fa204 100644 --- a/boot/i3nt/scheme.h +++ b/boot/i3nt/scheme.h @@ -1,4 +1,4 @@ -/* scheme.h for Chez Scheme Version 9.6 (i3nt) */ +/* scheme.h for Chez Scheme Version 9.6.2 (i3nt) */ /* Do not edit this file. It is automatically generated and */ /* specifically tailored to the version of Chez Scheme named */ @@ -35,7 +35,7 @@ #endif /* Chez Scheme Version and machine type */ -#define VERSION "9.6" +#define VERSION "9.6.2" #define MACHINE_TYPE "i3nt" /* All Scheme objects are of type ptr. Type iptr and */ diff --git a/boot/i3osx/equates.h b/boot/i3osx/equates.h index fb37f53dd..10ebb191b 100644 --- a/boot/i3osx/equates.h +++ b/boot/i3osx/equates.h @@ -1,4 +1,4 @@ -/* equates.h for Chez Scheme Version 9.6 */ +/* equates.h for Chez Scheme Version 9.6.2 */ /* Do not edit this file. It is automatically generated and */ /* specifically tailored to the version of Chez Scheme named */ @@ -485,7 +485,7 @@ typedef unsigned long long U64; #define rtd_sealed 0x4 #define sbwp (ptr)0x4E #define scaled_shot_1_shot_flag -0x4 -#define scheme_version 0x90600 +#define scheme_version 0x90602 #define segment_card_offset_bits 0x5 #define segment_offset_bits 0xD #define segment_t1_bits 0x13 diff --git a/boot/i3osx/petite.boot b/boot/i3osx/petite.boot index 8bf0a3227..cf1483696 100644 Binary files a/boot/i3osx/petite.boot and b/boot/i3osx/petite.boot differ diff --git a/boot/i3osx/scheme.boot b/boot/i3osx/scheme.boot index 41fa94fd1..ca20acf7c 100644 Binary files a/boot/i3osx/scheme.boot and b/boot/i3osx/scheme.boot differ diff --git a/boot/i3osx/scheme.h b/boot/i3osx/scheme.h index 9a3c12093..9f23609db 100644 --- a/boot/i3osx/scheme.h +++ b/boot/i3osx/scheme.h @@ -1,4 +1,4 @@ -/* scheme.h for Chez Scheme Version 9.6 (i3osx) */ +/* scheme.h for Chez Scheme Version 9.6.2 (i3osx) */ /* Do not edit this file. It is automatically generated and */ /* specifically tailored to the version of Chez Scheme named */ @@ -35,7 +35,7 @@ #endif /* Chez Scheme Version and machine type */ -#define VERSION "9.6" +#define VERSION "9.6.2" #define MACHINE_TYPE "i3osx" /* All Scheme objects are of type ptr. Type iptr and */ diff --git a/boot/ta6le/equates.h b/boot/ta6le/equates.h index 76c18d1cf..297e1552f 100644 --- a/boot/ta6le/equates.h +++ b/boot/ta6le/equates.h @@ -1,4 +1,4 @@ -/* equates.h for Chez Scheme Version 9.6 */ +/* equates.h for Chez Scheme Version 9.6.2 */ /* Do not edit this file. It is automatically generated and */ /* specifically tailored to the version of Chez Scheme named */ @@ -485,7 +485,7 @@ typedef unsigned long U64; #define rtd_sealed 0x4 #define sbwp (ptr)0x4E #define scaled_shot_1_shot_flag -0x8 -#define scheme_version 0x90600 +#define scheme_version 0x90602 #define segment_card_offset_bits 0x5 #define segment_offset_bits 0xE #define segment_t1_bits 0x10 diff --git a/boot/ta6le/petite.boot b/boot/ta6le/petite.boot index d25571072..ecaab6843 100644 Binary files a/boot/ta6le/petite.boot and b/boot/ta6le/petite.boot differ diff --git a/boot/ta6le/scheme.boot b/boot/ta6le/scheme.boot index 90cf3645d..43b16c18a 100644 Binary files a/boot/ta6le/scheme.boot and b/boot/ta6le/scheme.boot differ diff --git a/boot/ta6le/scheme.h b/boot/ta6le/scheme.h index 479d45053..fb6d79754 100644 --- a/boot/ta6le/scheme.h +++ b/boot/ta6le/scheme.h @@ -1,4 +1,4 @@ -/* scheme.h for Chez Scheme Version 9.6 (ta6le) */ +/* scheme.h for Chez Scheme Version 9.6.2 (ta6le) */ /* Do not edit this file. It is automatically generated and */ /* specifically tailored to the version of Chez Scheme named */ @@ -35,7 +35,7 @@ #endif /* Chez Scheme Version and machine type */ -#define VERSION "9.6" +#define VERSION "9.6.2" #define MACHINE_TYPE "ta6le" /* All Scheme objects are of type ptr. Type iptr and */ diff --git a/boot/ta6nt/equates.h b/boot/ta6nt/equates.h index 371d70910..ad5e57917 100644 --- a/boot/ta6nt/equates.h +++ b/boot/ta6nt/equates.h @@ -1,4 +1,4 @@ -/* equates.h for Chez Scheme Version 9.6 */ +/* equates.h for Chez Scheme Version 9.6.2 */ /* Do not edit this file. It is automatically generated and */ /* specifically tailored to the version of Chez Scheme named */ @@ -485,7 +485,7 @@ typedef unsigned long long U64; #define rtd_sealed 0x4 #define sbwp (ptr)0x4E #define scaled_shot_1_shot_flag -0x8 -#define scheme_version 0x90600 +#define scheme_version 0x90602 #define segment_card_offset_bits 0x5 #define segment_offset_bits 0xE #define segment_t1_bits 0x10 diff --git a/boot/ta6nt/petite.boot b/boot/ta6nt/petite.boot index 830156338..136311e99 100644 Binary files a/boot/ta6nt/petite.boot and b/boot/ta6nt/petite.boot differ diff --git a/boot/ta6nt/scheme.boot b/boot/ta6nt/scheme.boot index a42234d7e..2252bbce7 100644 Binary files a/boot/ta6nt/scheme.boot and b/boot/ta6nt/scheme.boot differ diff --git a/boot/ta6nt/scheme.h b/boot/ta6nt/scheme.h index 79e4152cb..984d74e3f 100644 --- a/boot/ta6nt/scheme.h +++ b/boot/ta6nt/scheme.h @@ -1,4 +1,4 @@ -/* scheme.h for Chez Scheme Version 9.6 (ta6nt) */ +/* scheme.h for Chez Scheme Version 9.6.2 (ta6nt) */ /* Do not edit this file. It is automatically generated and */ /* specifically tailored to the version of Chez Scheme named */ @@ -35,7 +35,7 @@ #endif /* Chez Scheme Version and machine type */ -#define VERSION "9.6" +#define VERSION "9.6.2" #define MACHINE_TYPE "ta6nt" /* All Scheme objects are of type ptr. Type iptr and */ diff --git a/boot/ta6osx/equates.h b/boot/ta6osx/equates.h index f72673fc2..a6bc23124 100644 --- a/boot/ta6osx/equates.h +++ b/boot/ta6osx/equates.h @@ -1,4 +1,4 @@ -/* equates.h for Chez Scheme Version 9.6 */ +/* equates.h for Chez Scheme Version 9.6.2 */ /* Do not edit this file. It is automatically generated and */ /* specifically tailored to the version of Chez Scheme named */ @@ -485,7 +485,7 @@ typedef unsigned long U64; #define rtd_sealed 0x4 #define sbwp (ptr)0x4E #define scaled_shot_1_shot_flag -0x8 -#define scheme_version 0x90600 +#define scheme_version 0x90602 #define segment_card_offset_bits 0x5 #define segment_offset_bits 0xE #define segment_t1_bits 0x10 diff --git a/boot/ta6osx/petite.boot b/boot/ta6osx/petite.boot index 800500628..3e94fd38f 100644 Binary files a/boot/ta6osx/petite.boot and b/boot/ta6osx/petite.boot differ diff --git a/boot/ta6osx/scheme.boot b/boot/ta6osx/scheme.boot index 05590b6eb..629715933 100644 Binary files a/boot/ta6osx/scheme.boot and b/boot/ta6osx/scheme.boot differ diff --git a/boot/ta6osx/scheme.h b/boot/ta6osx/scheme.h index fb8a05761..afadda634 100644 --- a/boot/ta6osx/scheme.h +++ b/boot/ta6osx/scheme.h @@ -1,4 +1,4 @@ -/* scheme.h for Chez Scheme Version 9.6 (ta6osx) */ +/* scheme.h for Chez Scheme Version 9.6.2 (ta6osx) */ /* Do not edit this file. It is automatically generated and */ /* specifically tailored to the version of Chez Scheme named */ @@ -35,7 +35,7 @@ #endif /* Chez Scheme Version and machine type */ -#define VERSION "9.6" +#define VERSION "9.6.2" #define MACHINE_TYPE "ta6osx" /* All Scheme objects are of type ptr. Type iptr and */ diff --git a/boot/ti3le/equates.h b/boot/ti3le/equates.h index 843d0b99a..def4e4d8a 100644 --- a/boot/ti3le/equates.h +++ b/boot/ti3le/equates.h @@ -1,4 +1,4 @@ -/* equates.h for Chez Scheme Version 9.6 */ +/* equates.h for Chez Scheme Version 9.6.2 */ /* Do not edit this file. It is automatically generated and */ /* specifically tailored to the version of Chez Scheme named */ @@ -485,7 +485,7 @@ typedef unsigned long long U64; #define rtd_sealed 0x4 #define sbwp (ptr)0x4E #define scaled_shot_1_shot_flag -0x4 -#define scheme_version 0x90600 +#define scheme_version 0x90602 #define segment_card_offset_bits 0x5 #define segment_offset_bits 0xD #define segment_t1_bits 0x13 diff --git a/boot/ti3le/petite.boot b/boot/ti3le/petite.boot index 043e5b50c..50217bf80 100644 Binary files a/boot/ti3le/petite.boot and b/boot/ti3le/petite.boot differ diff --git a/boot/ti3le/scheme.boot b/boot/ti3le/scheme.boot index fd510081c..c174334f5 100644 Binary files a/boot/ti3le/scheme.boot and b/boot/ti3le/scheme.boot differ diff --git a/boot/ti3le/scheme.h b/boot/ti3le/scheme.h index d4502fb6d..cbf12da23 100644 --- a/boot/ti3le/scheme.h +++ b/boot/ti3le/scheme.h @@ -1,4 +1,4 @@ -/* scheme.h for Chez Scheme Version 9.6 (ti3le) */ +/* scheme.h for Chez Scheme Version 9.6.2 (ti3le) */ /* Do not edit this file. It is automatically generated and */ /* specifically tailored to the version of Chez Scheme named */ @@ -35,7 +35,7 @@ #endif /* Chez Scheme Version and machine type */ -#define VERSION "9.6" +#define VERSION "9.6.2" #define MACHINE_TYPE "ti3le" /* All Scheme objects are of type ptr. Type iptr and */ diff --git a/boot/ti3nt/equates.h b/boot/ti3nt/equates.h index 7b7016542..2d8357c25 100644 --- a/boot/ti3nt/equates.h +++ b/boot/ti3nt/equates.h @@ -1,4 +1,4 @@ -/* equates.h for Chez Scheme Version 9.6 */ +/* equates.h for Chez Scheme Version 9.6.2 */ /* Do not edit this file. It is automatically generated and */ /* specifically tailored to the version of Chez Scheme named */ @@ -485,7 +485,7 @@ typedef unsigned long long U64; #define rtd_sealed 0x4 #define sbwp (ptr)0x4E #define scaled_shot_1_shot_flag -0x4 -#define scheme_version 0x90600 +#define scheme_version 0x90602 #define segment_card_offset_bits 0x5 #define segment_offset_bits 0xD #define segment_t1_bits 0x13 diff --git a/boot/ti3nt/petite.boot b/boot/ti3nt/petite.boot index 5877a28a0..2a1a831a6 100644 Binary files a/boot/ti3nt/petite.boot and b/boot/ti3nt/petite.boot differ diff --git a/boot/ti3nt/scheme.boot b/boot/ti3nt/scheme.boot index c41d6cd85..13c15f1e3 100644 Binary files a/boot/ti3nt/scheme.boot and b/boot/ti3nt/scheme.boot differ diff --git a/boot/ti3nt/scheme.h b/boot/ti3nt/scheme.h index ccb66cd36..33f439f33 100644 --- a/boot/ti3nt/scheme.h +++ b/boot/ti3nt/scheme.h @@ -1,4 +1,4 @@ -/* scheme.h for Chez Scheme Version 9.6 (ti3nt) */ +/* scheme.h for Chez Scheme Version 9.6.2 (ti3nt) */ /* Do not edit this file. It is automatically generated and */ /* specifically tailored to the version of Chez Scheme named */ @@ -35,7 +35,7 @@ #endif /* Chez Scheme Version and machine type */ -#define VERSION "9.6" +#define VERSION "9.6.2" #define MACHINE_TYPE "ti3nt" /* All Scheme objects are of type ptr. Type iptr and */ diff --git a/boot/ti3osx/equates.h b/boot/ti3osx/equates.h index 497fbcd00..151e3b122 100644 --- a/boot/ti3osx/equates.h +++ b/boot/ti3osx/equates.h @@ -1,4 +1,4 @@ -/* equates.h for Chez Scheme Version 9.6 */ +/* equates.h for Chez Scheme Version 9.6.2 */ /* Do not edit this file. It is automatically generated and */ /* specifically tailored to the version of Chez Scheme named */ @@ -485,7 +485,7 @@ typedef unsigned long long U64; #define rtd_sealed 0x4 #define sbwp (ptr)0x4E #define scaled_shot_1_shot_flag -0x4 -#define scheme_version 0x90600 +#define scheme_version 0x90602 #define segment_card_offset_bits 0x5 #define segment_offset_bits 0xD #define segment_t1_bits 0x13 diff --git a/boot/ti3osx/petite.boot b/boot/ti3osx/petite.boot index b023224a5..cec6ccfd4 100644 Binary files a/boot/ti3osx/petite.boot and b/boot/ti3osx/petite.boot differ diff --git a/boot/ti3osx/scheme.boot b/boot/ti3osx/scheme.boot index 502d5a181..782e89390 100644 Binary files a/boot/ti3osx/scheme.boot and b/boot/ti3osx/scheme.boot differ diff --git a/boot/ti3osx/scheme.h b/boot/ti3osx/scheme.h index 863094f37..ff25f80d7 100644 --- a/boot/ti3osx/scheme.h +++ b/boot/ti3osx/scheme.h @@ -1,4 +1,4 @@ -/* scheme.h for Chez Scheme Version 9.6 (ti3osx) */ +/* scheme.h for Chez Scheme Version 9.6.2 (ti3osx) */ /* Do not edit this file. It is automatically generated and */ /* specifically tailored to the version of Chez Scheme named */ @@ -35,7 +35,7 @@ #endif /* Chez Scheme Version and machine type */ -#define VERSION "9.6" +#define VERSION "9.6.2" #define MACHINE_TYPE "ti3osx" /* All Scheme objects are of type ptr. Type iptr and */ diff --git a/c/Makefile.a6nt b/c/Makefile.a6nt index 7181688a2..759047c3b 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\csv960.dll -KernelLib = ..\bin\$m\csv960.lib -MTKernelLib = ..\boot\$m\csv960mt.lib -MDKernelLib = ..\boot\$m\csv960md.lib -KernelExp = ..\bin\$m\csv960.exp +KernelDll = ..\bin\$m\csv962.dll +KernelLib = ..\bin\$m\csv962.lib +MTKernelLib = ..\boot\$m\csv962mt.lib +MDKernelLib = ..\boot\$m\csv962md.lib +KernelExp = ..\bin\$m\csv962.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 62cea8928..9af43b6ed 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\csv960.dll -KernelLib = ..\bin\$m\csv960.lib -MTKernelLib = ..\boot\$m\csv960mt.lib -MDKernelLib = ..\boot\$m\csv960md.lib -KernelExp = ..\bin\$m\csv960.exp +KernelDll = ..\bin\$m\csv962.dll +KernelLib = ..\bin\$m\csv962.lib +MTKernelLib = ..\boot\$m\csv962mt.lib +MDKernelLib = ..\boot\$m\csv962md.lib +KernelExp = ..\bin\$m\csv962.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 3d3c9dda2..3a4a02e57 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\csv960.dll -KernelLib = ..\bin\$m\csv960.lib -MTKernelLib = ..\boot\$m\csv960mt.lib -MDKernelLib = ..\boot\$m\csv960md.lib -KernelExp = ..\bin\$m\csv960.exp +KernelDll = ..\bin\$m\csv962.dll +KernelLib = ..\bin\$m\csv962.lib +MTKernelLib = ..\boot\$m\csv962mt.lib +MDKernelLib = ..\boot\$m\csv962md.lib +KernelExp = ..\bin\$m\csv962.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 b78f10acd..9401bd88c 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\csv960.dll -KernelLib = ..\bin\$m\csv960.lib -MTKernelLib = ..\boot\$m\csv960mt.lib -MDKernelLib = ..\boot\$m\csv960md.lib -KernelExp = ..\bin\$m\csv960.exp +KernelDll = ..\bin\$m\csv962.dll +KernelLib = ..\bin\$m\csv962.lib +MTKernelLib = ..\boot\$m\csv962mt.lib +MDKernelLib = ..\boot\$m\csv962md.lib +KernelExp = ..\bin\$m\csv962.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 b0da68e16..49f3db245 100644 --- a/c/scheme.rc +++ b/c/scheme.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 9,6,0,0 - PRODUCTVERSION 9,6,0,0 + FILEVERSION 9,6,2,0 + PRODUCTVERSION 9,6,2,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.6.0" - VALUE "FileVersion", "9.6.0" + VALUE "FileDescription", "Chez Scheme Version 9.6.2" + VALUE "FileVersion", "9.6.2" VALUE "InternalName", "scheme.exe" VALUE "LegalCopyright", "Copyright 1984-2023 Cisco Systems, Inc. Licensed under the Apache License, Version 2.0." VALUE "OriginalFilename", "scheme.exe" VALUE "ProductName", "Chez Scheme" - VALUE "ProductVersion", "9.6.0" + VALUE "ProductVersion", "9.6.2" } } BLOCK "VarFileInfo" { diff --git a/csug/copyright.stex b/csug/copyright.stex index f46a3e350..e1440e88b 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.6.0. +Revised \revisiondate~for Chez Scheme Version 9.6.2. \medskip\noindent Cisco and the Cisco logo are trademarks or registered trademarks diff --git a/csug/csug.stex b/csug/csug.stex index cd0a192a2..29c1ca3cd 100644 --- a/csug/csug.stex +++ b/csug/csug.stex @@ -51,7 +51,7 @@ Copyright © 2023 Cisco Systems, Inc.
Licensed under the Apache License Version 2.0 (full copyright notice.).
-Revised} \revisiondate\raw{ for Chez Scheme Version 9.6.0
+Revised} \revisiondate\raw{ for Chez Scheme Version 9.6.2
about this book }} diff --git a/makefiles/Mf-install.in b/makefiles/Mf-install.in index d898f257c..26117be6f 100644 --- a/makefiles/Mf-install.in +++ b/makefiles/Mf-install.in @@ -62,7 +62,7 @@ InstallLZ4Target= # no changes should be needed below this point # ############################################################################### -Version=csv9.6.0 +Version=csv9.6.2 Include=boot/$m PetiteBoot=boot/$m/petite.boot SchemeBoot=boot/$m/scheme.boot diff --git a/mats/Mf-a6nt b/mats/Mf-a6nt index 4821e8287..0e7fdb3f5 100644 --- a/mats/Mf-a6nt +++ b/mats/Mf-a6nt @@ -25,7 +25,7 @@ export MSYS_NO_PATHCONV=1 export MSYS2_ARG_CONV_EXCL=* foreign1.so: $(fsrc) - cmd.exe /c "vs.bat amd64 && cl /DWIN32 /DX86_64 /Fe$@ /I${Include} /LD /MD /nologo ../bin/$m/csv960.lib $(fsrc)" + cmd.exe /c "vs.bat amd64 && cl /DWIN32 /DX86_64 /Fe$@ /I${Include} /LD /MD /nologo ../bin/$m/csv962.lib $(fsrc)" cat_flush.exe: 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 e2a9b3f74..e688f7fac 100644 --- a/mats/Mf-i3nt +++ b/mats/Mf-i3nt @@ -25,7 +25,7 @@ export MSYS_NO_PATHCONV=1 export MSYS2_ARG_CONV_EXCL=* foreign1.so: $(fsrc) - cmd.exe /c "vs.bat x86 && cl /DWIN32 /Fe$@ /I${Include} /LD /MD /nologo ../bin/$m/csv960.lib $(fsrc)" + cmd.exe /c "vs.bat x86 && cl /DWIN32 /Fe$@ /I${Include} /LD /MD /nologo ../bin/$m/csv962.lib $(fsrc)" cat_flush.exe: cat_flush.c cmd.exe /c "vs.bat x86 && cl /DWIN32 /MD /nologo $<" diff --git a/mats/Mf-ta6nt b/mats/Mf-ta6nt index 0c650b622..39e9a4cae 100644 --- a/mats/Mf-ta6nt +++ b/mats/Mf-ta6nt @@ -25,7 +25,7 @@ export MSYS_NO_PATHCONV=1 export MSYS2_ARG_CONV_EXCL=* foreign1.so: $(fsrc) - cmd.exe /c "vs.bat amd64 && cl /DWIN32 /DX86_64 /Fe$@ /I${Include} /LD /MD /nologo ../bin/$m/csv960.lib $(fsrc)" + cmd.exe /c "vs.bat amd64 && cl /DWIN32 /DX86_64 /Fe$@ /I${Include} /LD /MD /nologo ../bin/$m/csv962.lib $(fsrc)" cat_flush.exe: 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 c7912ec2e..ebb9d5735 100644 --- a/mats/Mf-ti3nt +++ b/mats/Mf-ti3nt @@ -25,7 +25,7 @@ export MSYS_NO_PATHCONV=1 export MSYS2_ARG_CONV_EXCL=* foreign1.so: $(fsrc) - cmd.exe /c "vs.bat x86 && cl /DWIN32 /Fe$@ /I${Include} /LD /MD /nologo ../bin/$m/csv960.lib $(fsrc)" + cmd.exe /c "vs.bat x86 && cl /DWIN32 /Fe$@ /I${Include} /LD /MD /nologo ../bin/$m/csv962.lib $(fsrc)" cat_flush.exe: cat_flush.c cmd.exe /c "vs.bat x86 && cl /DWIN32 /MD /nologo $<" diff --git a/pkg/Makefile b/pkg/Makefile index fee3da705..b2f29a4ec 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.6.0 +version = 9.6.2 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 289f854bc..1f5ac5675 100644 --- a/release_notes/release_notes.stex +++ b/release_notes/release_notes.stex @@ -1,6 +1,6 @@ \documentclass{releasenotes} -\thisversion{Version 9.6.0} +\thisversion{Version 9.6.2} \thatversion{Version 8.4} \pubmonth{August} \pubyear{2023} diff --git a/rpm/Makefile b/rpm/Makefile index 9c4f2c229..fe77157ee 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.6.0 +version = 9.6.2 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 22dbc069b..58d3f5df3 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 #x00090600) +(define-constant scheme-version #x00090602) (define-syntax define-machine-types (lambda (x) diff --git a/scheme.1.in b/scheme.1.in index 3c7f43bae..42b8cc945 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.6.0 August 2023" +.TH SCHEME 1 "Chez Scheme Version 9.6.2 August 2023" .SH NAME \fIChez Scheme\fP .br diff --git a/wininstall/Makefile b/wininstall/Makefile index fd4435292..2cf530ad5 100644 --- a/wininstall/Makefile +++ b/wininstall/Makefile @@ -1,4 +1,4 @@ -VERSION := 9.6.0 +VERSION := 9.6.2 WIXEXTENSIONS := -ext WixUIExtension -ext WixBalExtension export MSYS_NO_PATHCONV=1 diff --git a/wininstall/a6nt.wxs b/wininstall/a6nt.wxs index 34bd35a33..00de60118 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 9e006ac5d..a35a78123 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 0a4eb67fe..02e81b81c 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 31d4d22c7..baf5099f6 100644 --- a/wininstall/ti3nt.wxs +++ b/wininstall/ti3nt.wxs @@ -4,16 +4,16 @@ - + - + - + - + @@ -40,10 +40,10 @@ - + - + diff --git a/workarea b/workarea index 6ea931e80..f370ee7bb 100755 --- a/workarea +++ b/workarea @@ -206,8 +206,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/csv960md.lib csv960md.lib) - (cd $W/boot/$M; workln ../../../boot/$M/csv960mt.lib csv960mt.lib) + (cd $W/boot/$M; workln ../../../boot/$M/csv962md.lib csv962md.lib) + (cd $W/boot/$M; workln ../../../boot/$M/csv962mt.lib csv962mt.lib) (cd $W/boot/$M; workln ../../../boot/$M/scheme.res scheme.res) ;; *) @@ -222,8 +222,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/csv960.dll csv960.dll) - (cd $W/bin/$M; workln ../../../bin/$M/csv960.lib csv960.lib) + (cd $W/bin/$M; workln ../../../bin/$M/csv962.dll csv962.dll) + (cd $W/bin/$M; workln ../../../bin/$M/csv962.lib csv962.lib) ;; *) (cd $W/bin/$M; workln ../../../bin/$M/scheme scheme)