summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Burger <bburger@indigobio.com>2024-02-01 15:41:58 -0500
committerBob Burger <bburger@indigobio.com>2024-02-05 17:52:07 -0500
commit253230f7dfbb4fe777277d6bbf93f39f9567f086 (patch)
tree7aa64ff862a2a7a772d72e5406470a9bf7e11afe
parentc502a24ffb00f23030374ea09e5b0b4b941aa78d (diff)
version 10.0.0v10.0.0
-rw-r--r--.github/workflows/ci.yml4
-rw-r--r--BUILDING16
-rw-r--r--NOTICE4
-rw-r--r--boot/pb/equates.h4
-rw-r--r--boot/pb/petite.bootbin6758934 -> 6758216 bytes
-rw-r--r--boot/pb/scheme.bootbin4891259 -> 4891251 bytes
-rw-r--r--boot/pb/scheme.h4
-rw-r--r--c/fasl.c7
-rw-r--r--c/scheme.rc12
-rw-r--r--csug/copyright.stex2
-rw-r--r--csug/csug.stex4
-rw-r--r--csug/system.stex2
-rw-r--r--makefiles/Makefile-csug.in2
-rw-r--r--makefiles/install.zuo10
-rw-r--r--pkg/Makefile4
-rw-r--r--release_notes/release_notes.stex87
-rw-r--r--rpm/Makefile2
-rw-r--r--s/7.ss14
-rw-r--r--s/cmacros.ss2
-rw-r--r--s/mkheader.ss12
-rw-r--r--scheme.1.in4
-rwxr-xr-xwininstall/.gitignore1
-rw-r--r--wininstall/Makefile11
-rw-r--r--wininstall/a6nt.wxs12
-rw-r--r--wininstall/i3nt.wxs12
-rwxr-xr-xwininstall/locate-vcredist.bat76
-rwxr-xr-xwininstall/product.wxs2
-rw-r--r--wininstall/ta6nt.wxs12
-rw-r--r--wininstall/ti3nt.wxs12
29 files changed, 107 insertions, 227 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1140a9f4..2892b53b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -63,7 +63,7 @@ jobs:
if: ${{ runner.os == 'Windows' }}
run: git config --global core.autocrlf false
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
with:
submodules: 'recursive'
- name: Setup 32-bit Linux
@@ -87,7 +87,7 @@ jobs:
run: tar -c -h -z -f $TARGET_MACHINE$TOOLCHAIN$VARIANT.tgz $TARGET_MACHINE
- name: Upload archive
if: always()
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
with:
name: ${{ matrix.config.machine }}${{ matrix.config.toolchain }}${{ matrix.config.variant }}
path: ${{ matrix.config.machine }}${{ matrix.config.toolchain }}${{ matrix.config.variant }}.tgz
diff --git a/BUILDING b/BUILDING
index 2f36a892..7b3dc9c8 100644
--- a/BUILDING
+++ b/BUILDING
@@ -1,5 +1,5 @@
-Building Chez Scheme Version 9.9.9
-Copyright 1984-2023 Cisco Systems, Inc.
+Building Chez Scheme Version 10.0.0
+Copyright 1984-2024 Cisco Systems, Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -350,12 +350,12 @@ To build on Windows with Microsoft Visual Studio, use
where <machine type> is one of the following:
* pb (portable bytecode, usually for bootstrapping)
- * ta6nt (64-bit Intel threaded
- * a6nt (64-bit Intel non-threaded
- * tarm64nt (64-bit Arm threaded)
- * arm64nt (64-bit Arm non-threaded)
- * ti3nt (32-bit threaded)
- * i3nt (32-bit non-threaded)
+ * ta6nt (64-bit Intel threaded)
+ * a6nt (64-bit Intel non-threaded)
+ * tarm64nt (64-bit ARM threaded)
+ * arm64nt (64-bit ARM non-threaded)
+ * ti3nt (32-bit Intel threaded)
+ * i3nt (32-bit Intel non-threaded)
If you're using Visual Studio 2022 or 2019, install "Desktop
development with C++" on the "Workloads" tabs and the "C++ 20[xx]
diff --git a/NOTICE b/NOTICE
index 59771015..4dc1b01b 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
-Chez Scheme Version 9.9.9
-Copyright 1984-2023 Cisco Systems, Inc.
+Chez Scheme Version 10.0.0
+Copyright 1984-2024 Cisco Systems, Inc.
This product includes code developed by Cisco Systems, Inc.
diff --git a/boot/pb/equates.h b/boot/pb/equates.h
index 696353e1..86c2649c 100644
--- a/boot/pb/equates.h
+++ b/boot/pb/equates.h
@@ -1,4 +1,4 @@
-/* equates.h for Chez Scheme Version 9.9.9-pre-release.24 */
+/* equates.h for Chez Scheme Version 10.0.0 */
/* Do not edit this file. It is automatically generated and */
/* specifically tailored to the version of Chez Scheme named */
@@ -1010,7 +1010,7 @@ typedef uint64_t U64;
#define rtd_sealed 0x4
#define sbwp (ptr)0x4E
#define scaled_shot_1_shot_flag -0x8
-#define scheme_version 0x9090918
+#define scheme_version 0xA000000
#define seginfo_generation_disp 0x1
#define seginfo_list_bits_disp 0x8
#define seginfo_space_disp 0x0
diff --git a/boot/pb/petite.boot b/boot/pb/petite.boot
index 4dae5bd5..87015ea2 100644
--- a/boot/pb/petite.boot
+++ b/boot/pb/petite.boot
Binary files differ
diff --git a/boot/pb/scheme.boot b/boot/pb/scheme.boot
index 5e1f2456..d9d00cc9 100644
--- a/boot/pb/scheme.boot
+++ b/boot/pb/scheme.boot
Binary files differ
diff --git a/boot/pb/scheme.h b/boot/pb/scheme.h
index d7d498a7..dcb1fb63 100644
--- a/boot/pb/scheme.h
+++ b/boot/pb/scheme.h
@@ -1,4 +1,4 @@
-/* scheme.h for Chez Scheme Version 9.9.9-pre-release.24 (pb) */
+/* scheme.h for Chez Scheme Version 10.0.0 (pb) */
/* Do not edit this file. It is automatically generated and */
/* specifically tailored to the version of Chez Scheme named */
@@ -40,7 +40,7 @@
#endif
/* Chez Scheme Version and machine type */
-#define VERSION "9.9.9-pre-release.24"
+#define VERSION "10.0.0"
#define MACHINE_TYPE "pb"
/* Integer typedefs */
diff --git a/c/fasl.c b/c/fasl.c
index dbe3a299..8ecb5b8e 100644
--- a/c/fasl.c
+++ b/c/fasl.c
@@ -371,11 +371,8 @@ char *S_format_scheme_version(uptr n) {
static char buf[40]; INT len;
if ((n >> 24) != ((n >> 24) & 0xffff)) return "unknown";
if ((n & 0xff) == 0) {
- if ((n & 0xff) == 0)
- len = snprintf(buf, sizeof(buf), "%d.%d", (int) n >> 24, (int) (n >> 16) & 0xff);
- else
- len = snprintf(buf, sizeof(buf), "%d.%d.%d", (int) n >> 24, (int) (n >> 16) & 0xff,
- (int) (n >> 8) & 0xff);
+ len = snprintf(buf, sizeof(buf), "%d.%d.%d", (int) n >> 24, (int) (n >> 16) & 0xff,
+ (int) (n >> 8) & 0xff);
} else
len = snprintf(buf, sizeof(buf), "%d.%d.%d-pre-release.%d", (int) n >> 24, (int) (n >> 16) & 0xff,
(int) (n >> 8) & 0xff, (int) n & 0xff);
diff --git a/c/scheme.rc b/c/scheme.rc
index 2e778364..f09e55cf 100644
--- a/c/scheme.rc
+++ b/c/scheme.rc
@@ -1,8 +1,8 @@
#include "winver.h"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 9,9,9,0
- PRODUCTVERSION 9,9,9,0
+ FILEVERSION 10,0,0,0
+ PRODUCTVERSION 10,0,0,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.9.9"
- VALUE "FileVersion", "9.9.9"
+ VALUE "FileDescription", "Chez Scheme Version 10.0.0"
+ VALUE "FileVersion", "10.0.0"
VALUE "InternalName", "scheme.exe"
- VALUE "LegalCopyright", "Copyright 1984-2023 Cisco Systems, Inc. Licensed under the Apache License, Version 2.0."
+ VALUE "LegalCopyright", "Copyright 1984-2024 Cisco Systems, Inc. Licensed under the Apache License, Version 2.0."
VALUE "OriginalFilename", "scheme.exe"
VALUE "ProductName", "Chez Scheme"
- VALUE "ProductVersion", "9.9.9"
+ VALUE "ProductVersion", "10.0.0"
}
}
BLOCK "VarFileInfo" {
diff --git a/csug/copyright.stex b/csug/copyright.stex
index 16e82abf..ed6951dc 100644
--- a/csug/copyright.stex
+++ b/csug/copyright.stex
@@ -16,7 +16,7 @@
\centerline{}\vfill
-\textbf{\copyright~2023 Cisco Systems, Inc.}
+\textbf{\copyright~2024 Cisco Systems, Inc.}
Licensed under the Apache License Version 2.0\\
http://www.apache.org/licenses/LICENSE-2.0
diff --git a/csug/csug.stex b/csug/csug.stex
index 697f5e05..080101b5 100644
--- a/csug/csug.stex
+++ b/csug/csug.stex
@@ -27,7 +27,7 @@
;; is the same as the documented version. If it's a release version,
;; then the date is fixed to the release date. Otherwise, use
;; the date when the document is built.
-(define latest-release-date "September 2023")
+(define latest-release-date "February 2024")
(printf "\\def\\CSVersion{~a}\n" (scheme-version #t))
(cond
[(not (scheme-pre-release))
@@ -78,7 +78,7 @@
\def\copyrightnotice{\raw{<hr class=copyright align=left>
<p>
<a class=plain href="index.html">Chez Scheme Version 10 User's Guide</a><br>
-Copyright &copy; 2023 Cisco Systems, Inc.<br>
+Copyright &copy; 2024 Cisco Systems, Inc.<br>
Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License Version 2.0</a>
(<a class=plain href="canned/copyright.html">full copyright notice.</a>).</br>
Revised} \revisiondate\raw{ for }\CSVersion\raw{<br>
diff --git a/csug/system.stex b/csug/system.stex
index 7ca9475d..d4f2bcbb 100644
--- a/csug/system.stex
+++ b/csug/system.stex
@@ -2960,7 +2960,7 @@ For example, the programmer can define \scheme{case} as follows:
...))]))
\endschemedisplay
-and count on the introduce \scheme{let} expression to be eliminated
+and count on the introduced \scheme{let} expression to be eliminated
if \scheme{e} turns out to be an unassigned variable, and count on
the entire \scheme{case} expression to be folded if \scheme{e} turns
out to be a constant.
diff --git a/makefiles/Makefile-csug.in b/makefiles/Makefile-csug.in
index 52da6af8..ebaf7176 100644
--- a/makefiles/Makefile-csug.in
+++ b/makefiles/Makefile-csug.in
@@ -20,7 +20,7 @@ target: canned logcheck1 logcheck2 checklibs $(x).html $(x).pdf
install: target
$(INSTALL) -m 2755 -d $(installdir)
$(INSTALL) -m 0644 --ifdiff *.html *.css $(installdir)
- $(INSTALL) -m 0644 --ifdiff csug.pdf $(installdir)/csug9_9.pdf
+ $(INSTALL) -m 0644 --ifdiff csug.pdf $(installdir)/csug10_0.pdf
$(INSTALL) -m 2755 -d $(installdir)/canned
$(INSTALL) -m 0644 --ifdiff canned/* $(installdir)/canned
$(INSTALL) -m 2755 -d $(installdir)/gifs
diff --git a/makefiles/install.zuo b/makefiles/install.zuo
index 0824b059..9ca28755 100644
--- a/makefiles/install.zuo
+++ b/makefiles/install.zuo
@@ -71,14 +71,10 @@
;; Everything after here is derived from the configuration
(define Version (let ([l (get-version)])
- (~a "csv" (list-ref l 0) "." (list-ref l 1)
- (if (and (= (list-ref l 2) 0)
- (= (list-ref l 3) 0))
+ (~a "csv" (list-ref l 0) "." (list-ref l 1) "." (list-ref l 2)
+ (if (= (list-ref l 3) 0)
""
- (~a "." (list-ref l 2)
- (if (= (list-ref l 3) 0)
- ""
- (~a "-pre-release." (list-ref l 3))))))))
+ (~a "-pre-release." (list-ref l 3))))))
(define (build-path* . elems)
(if script-to
diff --git a/pkg/Makefile b/pkg/Makefile
index 5d34b98f..4c1b6171 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.9.9
+version = 10.0.0
release = 1
DOTUSER = $(shell ls -ld . | sed -e 's/[^ ]* *[^ ]* *\([^ ]*\).*/\1/')
@@ -77,7 +77,7 @@ $(BUILDROOT)/Distribution: $(BUILDROOT)
$(BUILDROOT)/Resources/en.lproj/Welcome.html: $(BUILDROOT)/Resources/en.lproj
echo '<html>' > $(BUILDROOT)/Resources/en.lproj/Welcome.html
echo '<h3>Chez Scheme Version $(version)</h3>' >> $(BUILDROOT)/Resources/en.lproj/Welcome.html
- echo '<p>Copyright &copy; 2023 Cisco Systems, Inc.</p>' >> $(BUILDROOT)/Resources/en.lproj/Welcome.html
+ echo '<p>Copyright &copy; 2024 Cisco Systems, Inc.</p>' >> $(BUILDROOT)/Resources/en.lproj/Welcome.html
echo '<p>Chez Scheme is a programming language and an implementation of that language, with supporting tools and documentation.</p>' >> $(BUILDROOT)/Resources/en.lproj/Welcome.html
echo '</html>' >> $(BUILDROOT)/Resources/en.lproj/Welcome.html
chmod 644 $(BUILDROOT)/Resources/en.lproj/Welcome.html
diff --git a/release_notes/release_notes.stex b/release_notes/release_notes.stex
index 6571ff70..51a2e79c 100644
--- a/release_notes/release_notes.stex
+++ b/release_notes/release_notes.stex
@@ -1,9 +1,9 @@
\documentclass{releasenotes}
-\thisversion{Version 9.9.9}
+\thisversion{Version 10.0.0}
\thatversion{Version 8.4}
-\pubmonth{September}
-\pubyear{2023}
+\pubmonth{February}
+\pubyear{2024}
\iflatex
\usepackage{enumitem}
@@ -113,12 +113,12 @@ Online versions of both books can be found at
%-----------------------------------------------------------------------------
\section{Functionality Changes}\label{section:functionality}
-\subsection{Unicode 15.1 support (9.9.9)}
+\subsection{Unicode 15.1 support (10.0.0)}
The character sets, character classes, and word-breaking algorithms for character, string,
and Unicode-related bytevector operations have now been updated to Unicode 15.1.
-\subsection{New supported platforms and portable bytecode (9.9.9)}
+\subsection{New supported platforms and portable bytecode (10.0.0)}
AArch64 (64-bit Arm), RV64G (64-bit RISC-V), and LoongArch64 architectures are
supported. Threads are supported on architectures with weak memory
@@ -144,8 +144,7 @@ bytecode interpretation. In particular, since Chez Scheme is mostly
written in Chez Scheme, a pbchunk conversion of its boot files
improves performance of primitives and compilation.
-
-\subsection{Threaded default and build system changes (9.9.9)}
+\subsection{Threaded default and build system changes (10.0.0)}
Running \scheme{configure} assumes a threaded target machine type,
unless \scheme{--nothreads} or a non-threaded machine type is
@@ -172,8 +171,7 @@ The new \scheme{scheme-build-number} function complements
during development. The \scheme{scheme-build-number} procedure always
returns zero for a released version of Chez Scheme.
-
-\subsection{Compiler improvements (9.9.9)}\label{sec:unbox-floats}
+\subsection{Compiler improvements (10.0.0)}\label{sec:unbox-floats}
The compiler generates code that locally unboxes floating-point
operations, so that compositions of floating-point operations can be
@@ -233,8 +231,7 @@ The internal representation of record types has changed so that a
record-type predicate is a constant-time operation, instead of
proportional to the subtype depth.
-
-\subsection{Garbage-collector improvements (9.9.9)}
+\subsection{Garbage-collector improvements (10.0.0)}
Garbage collection takes advantage of machine parallelism. Parallel
collection is automatically enabled when a program has multiple Scheme
@@ -263,8 +260,7 @@ previous versions of Chez Scheme.
See also Sections~\ref{sec:gc-reflect} and \ref{sec:ffi-storage} for
related new functionality.
-
-\subsection{Continuation marks (9.9.9)}\label{sec:cont-marks}
+\subsection{Continuation marks (10.0.0)}\label{sec:cont-marks}
\emph{Continuation marks} add key--value information to continuations.
The \scheme{with-continuation-mark} form associates a key--value pair
@@ -288,8 +284,7 @@ similar to calling a procedure as a function, but instead of a value
to deliver to the continuation, it takes a procedure of no arguments
to call within the continuation.
-
-\subsection{New fixnum operations (9.9.9)}
+\subsection{New fixnum operations (10.0.0)}
New operations support common bit-related operations on fixnums:
@@ -312,8 +307,7 @@ mutable-fxvector? ; removed
immutable-fxvector? ; removed
\endschemedisplay
-
-\subsection{New flonum operations (9.9.9)}
+\subsection{New flonum operations (10.0.0)}
The \scheme{eq?} operator works on flonums in the sense that two
flonums values that are \scheme{eq?} at some point (such as creation
@@ -355,8 +349,7 @@ The \scheme{fl=}, \scheme{fl<}, , \scheme{fl>}, \scheme{fl<=}, and
that's \scheme{+nan.0}, which makes them consistent with \scheme{=},
\scheme{<}, \scheme{>}, \scheme{<=}, and \scheme{>=}.
-
-\subsection{Improved bignum arithmetic (9.9.9)}
+\subsection{Improved bignum arithmetic (10.0.0)}
Multiplication of very large numbers uses Karatsuba, Toom-3, or
Toom-4, while division (including GCD) uses Burnikel-Ziegler. These
@@ -364,8 +357,7 @@ changes make arithmetic and number-to-string conversions faster for
large values, and they avoid unbounded delays between interrupt
polling.
-
-\subsection{Exact zeros, transcendentals, and exponentials (9.9.9)}
+\subsection{Exact zeros, transcendentals, and exponentials (10.0.0)}
Division of an exact \scheme{0} by an inexact number now always
produces exact \scheme{0}, and
@@ -389,8 +381,7 @@ The \scheme{expt} function recognizes an exact \scheme{1/2} as its
second argument, and in that case it behaves like \scheme{sqrt}, which
may produce an exact result.
-
-\subsection{New character, string, and Unicode functions (9.9.9)}
+\subsection{New character, string, and Unicode functions (10.0.0)}
New functions support decoding grapheme clusters within strings or
character streams and expose the underlying new character classifiers:
@@ -410,9 +401,7 @@ creating an intermediate mutable string.
The \scheme{path-build} procedure combines two path strings to form a
path, adding a directory separator between them if necessary.
-
-\subsection{Hashtable changes (9.9.9)}
-
+\subsection{Hashtable changes (10.0.0)}
Operations returning hashtable cells (\scheme{hashtable-cell},
\scheme{eq-hashtable-cell}, \scheme{symbol-hashtable-cell}, and
@@ -447,8 +436,7 @@ changes to \scheme{eq?} for flonum values and the availability of weak
and ephemeron hash tables with arbitrary equality and hashing
functions.
-
-\subsection{Stencil vectors (9.9.9)}
+\subsection{Stencil vectors (10.0.0)}
Stencil vectors provide support in the compiler and runtime for
implementing data structures such as persistent maps:
@@ -465,8 +453,7 @@ stencil-vector-truncate!
stencil-vector-mask-width
\endschemedisplay
-
-\subsection{New vector functions (9.9.9)}
+\subsection{New vector functions (10.0.0)}
New and extended (in the case of \scheme{vector-copy}) vector functions
support creating a vector from the content of others and creating immutable
@@ -488,7 +475,7 @@ new versions can avoid redundant initialization and write barriers.
The immutable-vector functions similarly can avoid allocating an
intermediate mutable vector.
-\subsection{New symbol functions (9.9.9)}
+\subsection{New symbol functions (10.0.0)}
While gensyms support most symbol-generation needs, uninterned symbols
are useful for purposes where properties must not prevent a symbol
@@ -501,8 +488,7 @@ uninterned-symbol?
The string returned by \scheme{symbol->string} is always immutable.
-
-\subsection{Record anonymous fields (9.9.9)}
+\subsection{Record anonymous fields (10.0.0)}
Records can have anonymous fields, which can save memory in the
representation when many record types need to be created (as opposed
@@ -521,8 +507,7 @@ The new \scheme{record-instance?} predicate is a specialization of
An unsafe \scheme{record-instance?} test can be faster than an unsafe
\scheme{record?} test.
-
-\subsection{Lists assuming immutability (9.9.9)}
+\subsection{Lists assuming immutability (10.0.0)}
In a context where pairs are not mutated, the new
\scheme{list-assuming-immutable?} predicate is useful as a variant of
@@ -531,8 +516,7 @@ efficient, amortized constant-time decision on whether a value
represents a list, but its behavior is unspecified if the
\scheme{cdr} or any pair relevant to the result is mutated.
-
-\subsection{New random number generation (9.9.9)}
+\subsection{New random number generation (10.0.0)}
A new random-number API implements the MRG32K3A algorithm:
@@ -545,8 +529,7 @@ pseudo-random-generator->vector
vector->pseudo-random-generator
\endschemedisplay
-
-\subsection{Wrapper procedures (9.9.9)}
+\subsection{Wrapper procedures (10.0.0)}
A \emph{wrapper procedure} provides an inexpensive way to an adjust a
procedure's name, constrain its arity, or associate extra data to the
@@ -564,8 +547,7 @@ set-wrapper-procedure-data!
set-wrapper-procedure!
\endschemedisplay
-
-\subsection{New thread functions (9.9.9)}\label{sec:threads}
+\subsection{New thread functions (10.0.0)}\label{sec:threads}
The new \scheme{thread-join} operator can be used to wait for a thread
to terminate. Waiting for termination in this sense can be useful to
@@ -591,8 +573,7 @@ When a new thread is created, it now starts with the default
exception-handler stack instead of inheriting the stack of the
creating thread.
-
-\subsection{Garbage collection introspection (9.9.9)}\label{sec:gc-reflect}
+\subsection{Garbage collection introspection (10.0.0)}\label{sec:gc-reflect}
Similar to \scheme{enable-object-counts}, the
\scheme{enable-object-backreferences} parameter enables recording of
@@ -633,8 +614,7 @@ garbage collection, the \scheme{collect} function takes a list as
an optional last argument to fuse a garbage collection with size
accounting.
-
-\subsection{Storage management and foreign interfaces (9.9.9)}\label{sec:ffi-storage}
+\subsection{Storage management and foreign interfaces (10.0.0)}\label{sec:ffi-storage}
The \scheme{make-guardian} function accepts an option to create an
\emph{ordered guardian}. An ordered guardian treats each of its
@@ -691,8 +671,7 @@ internal changes that make allocation thread-local, which in turn
makes the size of a thread's representation proportional to the
maximum number of generations.
-
-\subsection{Foreign interface extensions (9.9.9)}
+\subsection{Foreign interface extensions (10.0.0)}
Some ABIs treat functions with varargs (i.e., specified with
\scheme{...} in the C prototype) differently than functions without
@@ -728,8 +707,7 @@ file descriptor and offset. This form of boot-file registration is
useful for loading boot files that are embedded with an executable
segment.
-
-\subsection{Fasl and vfasl (9.9.9)}
+\subsection{Fasl and vfasl (10.0.0)}
Reading fasl data has been made safe no matter how deeply nested the
structure of the data.
@@ -752,8 +730,7 @@ for boot files to load directly into a static generation can make
startup much faster; otherwise, the time--space tradeoff rarely pays
off. Convert from fasl to vfasl using \scheme{vfasl-convert-file}.
-
-\subsection{New compiler options (9.9.9)}
+\subsection{New compiler options (10.0.0)}
Two new parameters skip safety checks in specific situations:
\scheme{enable-unsafe-application} assumes that the target of a
@@ -803,14 +780,14 @@ The \scheme{enable-error-source-expression} parameter determines
whether error messages that become embedded in code can refer to the
original source file's path.
-\subsection{Executable-relative boot files (9.9.9)}
+\subsection{Executable-relative boot files (10.0.0)}
When searching for boot files, the two-character escape sequence
``\scheme{%x}'' is now supported on more platforms. By default, Chez
Scheme is configured to use this facility to find boot files relative
to the executable, even when installed.
-\subsection{Syntax quoting (9.9.9)}
+\subsection{Syntax quoting (10.0.0)}
The new \scheme{quote-syntax} form is like the R$^6$RS \scheme{syntax}
form except that pattern variables are not substituted. It can be
@@ -2749,13 +2726,13 @@ in fasl files does not generally make sense.
%-----------------------------------------------------------------------------
\section{Bug Fixes}\label{section:bugfixes}
-\subsection{\scheme{library-exports} for library that is not yet imported (9.9.9)}
+\subsection{\scheme{library-exports} for library that is not yet imported (10.0.0)}
When visiting or loading a separately compiled library,
\scheme{library-exports} raised an exception if the library was not
yet imported.
-\subsection{Incorrect code for \scheme{record?} at optimize-level 3 (9.9.9)}
+\subsection{Incorrect code for \scheme{record?} at optimize-level 3 (10.0.0)}
At optimize-level 3, the \scheme{record?} predicate could short circuit without
evaluating the \var{rtd} expression.
diff --git a/rpm/Makefile b/rpm/Makefile
index 0205c444..3f347b7b 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.9.9
+version = 10.0.0
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/7.ss b/s/7.ss
index c60ea692..9b5091b0 100644
--- a/s/7.ss
+++ b/s/7.ss
@@ -709,14 +709,10 @@
(define $format-scheme-version
(lambda (n)
- (if (= (logand (ash n -8) 255) 0)
- (format "~d.~d"
- (ash n -24)
- (logand (ash n -16) 255))
- (format "~d.~d.~d"
- (ash n -24)
- (logand (ash n -16) 255)
- (logand (ash n -8) 255)))))
+ (format "~d.~d.~d"
+ (ash n -24)
+ (logand (ash n -16) 255)
+ (logand (ash n -8) 255))))
; set in back.ss
(define $scheme-version)
@@ -785,7 +781,7 @@
(define $scheme-greeting
(lambda ()
- (format "~a\nCopyright 1984-2023 Cisco Systems, Inc.\n"
+ (format "~a\nCopyright 1984-2024 Cisco Systems, Inc.\n"
(scheme-version #t))))
(define $session-key #f)
diff --git a/s/cmacros.ss b/s/cmacros.ss
index efa63484..b083653f 100644
--- a/s/cmacros.ss
+++ b/s/cmacros.ss
@@ -357,7 +357,7 @@
;; ---------------------------------------------------------------------
;; Version and machine types:
-(define-constant scheme-version #x09090918)
+(define-constant scheme-version #x0a000000)
(define-syntax define-machine-types
(lambda (x)
diff --git a/s/mkheader.ss b/s/mkheader.ss
index 705c7f73..54ea157e 100644
--- a/s/mkheader.ss
+++ b/s/mkheader.ss
@@ -160,14 +160,10 @@
(define scheme-version ; adapted from 7.ss
(let ([n (constant scheme-version)])
(if (= (logand n 255) 0)
- (if (= (logand n 255) 0)
- (format "~d.~d"
- (ash n -24)
- (logand (ash n -16) 255))
- (format "~d.~d.~d"
- (ash n -24)
- (logand (ash n -16) 255)
- (logand (ash n -8) 255)))
+ (format "~d.~d.~d"
+ (ash n -24)
+ (logand (ash n -16) 255)
+ (logand (ash n -8) 255))
(format "~d.~d.~d-pre-release.~d"
(ash n -24)
(logand (ash n -16) 255)
diff --git a/scheme.1.in b/scheme.1.in
index 235645f1..6ca82d7a 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.9.9 September 2023"
+.TH SCHEME 1 "Chez Scheme Version 10.0.0 February 2024"
.SH NAME
\fIChez Scheme\fP
.br
@@ -794,6 +794,6 @@ Second Edition\fP,
MIT press (1996).
.in -5
.SH AUTHOR
-Copyright 2023 Cisco Systems, Inc.
+Copyright 2024 Cisco Systems, Inc.
Licensed under the Apache License, Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0)
diff --git a/wininstall/.gitignore b/wininstall/.gitignore
index 50d90527..83dc4f5c 100755
--- a/wininstall/.gitignore
+++ b/wininstall/.gitignore
@@ -2,4 +2,3 @@
*.msi
*.wixobj
*.wixpdb
-/vcredist.wxs
diff --git a/wininstall/Makefile b/wininstall/Makefile
index 9f5338b8..d96a49a5 100644
--- a/wininstall/Makefile
+++ b/wininstall/Makefile
@@ -1,14 +1,14 @@
-VERSION := 9.9.9
+VERSION := 10.0.0
WIXEXTENSIONS := -ext WixUIExtension -ext WixBalExtension
export MSYS_NO_PATHCONV=1
ChezScheme.exe: x86/bundle.wixobj ChezScheme32.msi ChezScheme64.msi
cmd.exe /c "light.bat -nologo $(WIXEXTENSIONS) $< -out $@"
-ChezScheme32.msi: x86/product.wixobj x86/examples.wixobj x86/i3nt.wixobj x86/ti3nt.wixobj x86/vcredist.wixobj x86/ui.wixobj
+ChezScheme32.msi: x86/product.wixobj x86/examples.wixobj x86/i3nt.wixobj x86/ti3nt.wixobj x86/ui.wixobj
cmd.exe /c "light.bat -nologo $(WIXEXTENSIONS) $^ -sice:ICE64 -sice:ICE03 -sice:ICE82 -sice:ICE61 -out $@"
-ChezScheme64.msi: x64/product.wixobj x64/a6nt.wixobj x64/examples.wixobj x64/ta6nt.wixobj x64/vcredist.wixobj x64/ui.wixobj
+ChezScheme64.msi: x64/product.wixobj x64/a6nt.wixobj x64/examples.wixobj x64/ta6nt.wixobj x64/ui.wixobj
cmd.exe /c "light.bat -nologo $(WIXEXTENSIONS) $^ -sice:ICE64 -sice:ICE03 -sice:ICE82 -sice:ICE61 -out $@"
x86/%.wixobj: %.wxs
@@ -17,9 +17,6 @@ x86/%.wixobj: %.wxs
x64/%.wixobj: %.wxs
cmd.exe /c "candle.bat -arch x64 -nologo -dVersion=$(VERSION) $(WIXEXTENSIONS) $< -out $@"
-vcredist.wxs: locate-vcredist.bat
- cmd.exe /c "locate-vcredist.bat"
-
# After building a6nt, use it to create boot files for the
# other machine types, since that's faster than going through
# pb every time
@@ -35,4 +32,4 @@ workareas:
.PHONY: clean
clean:
- -rm -rf *.msi *.wixpdb x86/ x64/ vcredist.wxs *.wixobj *.exe
+ -rm -rf *.msi *.wixpdb x86/ x64/ *.wixobj *.exe
diff --git a/wininstall/a6nt.wxs b/wininstall/a6nt.wxs
index 96e47a22..19a40336 100644
--- a/wininstall/a6nt.wxs
+++ b/wininstall/a6nt.wxs
@@ -4,16 +4,16 @@
<DirectoryRef Id="D_bin">
<Directory Id="D_bin_a6nt" Name="a6nt">
<Component Id="cmp9E121291956F53F264990A9F6E93E67D" Guid="*">
- <File Id="fil174DC3B31231BE75291782CBF71B1ECB" KeyPath="yes" Source="..\a6nt\bin\a6nt\csv999.dll" />
+ <File Id="fil174DC3B31231BE75291782CBF71B1ECB" KeyPath="yes" Source="..\a6nt\bin\a6nt\csv1000.dll" />
</Component>
<Component Id="cmpDB181AE3BD838D4F431CAE12DB40B70A" Guid="*">
- <File Id="fil53D3BD37CECBBF28D1DB95A8B750DBDC" KeyPath="yes" Source="..\a6nt\bin\a6nt\csv999.exp" />
+ <File Id="fil53D3BD37CECBBF28D1DB95A8B750DBDC" KeyPath="yes" Source="..\a6nt\bin\a6nt\csv1000.exp" />
</Component>
<Component Id="cmp0B0A70880E3C505B199705D415235AC7" Guid="*">
- <File Id="fil69E98A18AB5AD3061617C9E68F536773" KeyPath="yes" Source="..\a6nt\bin\a6nt\csv999.lib" />
+ <File Id="fil69E98A18AB5AD3061617C9E68F536773" KeyPath="yes" Source="..\a6nt\bin\a6nt\csv1000.lib" />
</Component>
<Component Id="cmp41C1093548579E6BE087DD4BE735B7C5" Guid="*">
- <File Id="fil11683117A53DD772D9B6F0C11BE06C7C" KeyPath="yes" Source="..\a6nt\bin\a6nt\csv999.pdb" />
+ <File Id="fil11683117A53DD772D9B6F0C11BE06C7C" KeyPath="yes" Source="..\a6nt\bin\a6nt\csv1000.pdb" />
</Component>
<Component Id="cmpD50999EDF5C2480D6F6F6A04E6B127F3" Guid="*">
<File Id="filE439E2DE55CFE1366273AF3E232D4519" KeyPath="yes" Source="..\a6nt\bin\a6nt\petite.exe" />
@@ -40,10 +40,10 @@
<DirectoryRef Id="D_boot">
<Directory Id="D_boot_a6nt" Name="a6nt">
<Component Id="cmpB8AFC5E7298C4FB423F21E474D718248" Guid="*">
- <File Id="filAA3DCFC2962A0A679D26BAEF2EE45D18" KeyPath="yes" Source="..\a6nt\boot\a6nt\csv999md.lib" />
+ <File Id="filAA3DCFC2962A0A679D26BAEF2EE45D18" KeyPath="yes" Source="..\a6nt\boot\a6nt\csv1000md.lib" />
</Component>
<Component Id="cmp41A0F324C636C03565EFAB5DC1197958" Guid="*">
- <File Id="fil0052F236986BD25DFE0D0DE76854483B" KeyPath="yes" Source="..\a6nt\boot\a6nt\csv999mt.lib" />
+ <File Id="fil0052F236986BD25DFE0D0DE76854483B" KeyPath="yes" Source="..\a6nt\boot\a6nt\csv1000mt.lib" />
</Component>
<Component Id="cmp08025CB77BA01465D21171D27231AE6A" Guid="*">
<File Id="fil7FF609B8D0F6C6E984910D4458F7B76B" KeyPath="yes" Source="..\a6nt\boot\a6nt\mainmd.obj" />
diff --git a/wininstall/i3nt.wxs b/wininstall/i3nt.wxs
index 5cfde7e0..5c57c4f9 100644
--- a/wininstall/i3nt.wxs
+++ b/wininstall/i3nt.wxs
@@ -4,16 +4,16 @@
<DirectoryRef Id="D_bin">
<Directory Id="D_bin_i3nt" Name="i3nt">
<Component Id="cmp3EAD5F342D86023E323C2F3E96A596B9" Guid="*">
- <File Id="filF35C82CDA44DE51CEFA9FF8CA1B38AAA" KeyPath="yes" Source="..\i3nt\bin\i3nt\csv999.dll" />
+ <File Id="filF35C82CDA44DE51CEFA9FF8CA1B38AAA" KeyPath="yes" Source="..\i3nt\bin\i3nt\csv1000.dll" />
</Component>
<Component Id="cmpF2410A7AF5FB7C10A33DA57476B0E56B" Guid="*">
- <File Id="filFE4E60D4DD4AEF0DDA574E6EF117FEC0" KeyPath="yes" Source="..\i3nt\bin\i3nt\csv999.exp" />
+ <File Id="filFE4E60D4DD4AEF0DDA574E6EF117FEC0" KeyPath="yes" Source="..\i3nt\bin\i3nt\csv1000.exp" />
</Component>
<Component Id="cmp905F254ECBC3BCB861BBBF60B0F34D73" Guid="*">
- <File Id="fil811C8A53860477F59CD4D11BF7C36A5E" KeyPath="yes" Source="..\i3nt\bin\i3nt\csv999.lib" />
+ <File Id="fil811C8A53860477F59CD4D11BF7C36A5E" KeyPath="yes" Source="..\i3nt\bin\i3nt\csv1000.lib" />
</Component>
<Component Id="cmp43EE1BA94E7D15B5F9721D32B41CDFF1" Guid="*">
- <File Id="fil3475AECC40E6C77A1E5A74C81205D246" KeyPath="yes" Source="..\i3nt\bin\i3nt\csv999.pdb" />
+ <File Id="fil3475AECC40E6C77A1E5A74C81205D246" KeyPath="yes" Source="..\i3nt\bin\i3nt\csv1000.pdb" />
</Component>
<Component Id="cmp2660425B08191D07FD2B8E4D12C25CAF" Guid="*">
<File Id="fil6C14AF587FDAABD1440BADC640EEF64E" KeyPath="yes" Source="..\i3nt\bin\i3nt\petite.exe" />
@@ -40,10 +40,10 @@
<DirectoryRef Id="D_boot">
<Directory Id="D_boot_i3nt" Name="i3nt">
<Component Id="cmp47E339F22F1D268C3D889C89DC04B1EC" Guid="*">
- <File Id="filFAE795432021A108F72A5A1763549848" KeyPath="yes" Source="..\i3nt\boot\i3nt\csv999md.lib" />
+ <File Id="filFAE795432021A108F72A5A1763549848" KeyPath="yes" Source="..\i3nt\boot\i3nt\csv1000md.lib" />
</Component>
<Component Id="cmp97E86E3E78EC5C1E35333413F9D239A9" Guid="*">
- <File Id="filC2A38DD4D83F793279D6D10E8D553145" KeyPath="yes" Source="..\i3nt\boot\i3nt\csv999mt.lib" />
+ <File Id="filC2A38DD4D83F793279D6D10E8D553145" KeyPath="yes" Source="..\i3nt\boot\i3nt\csv1000mt.lib" />
</Component>
<Component Id="cmp4EC08D9AF0D6DADE3077A7EB099476B4" Guid="*">
<File Id="fil47E4EBA05B181E80FAF43A5B84DCC1D6" KeyPath="yes" Source="..\i3nt\boot\i3nt\mainmd.obj" />
diff --git a/wininstall/locate-vcredist.bat b/wininstall/locate-vcredist.bat
deleted file mode 100755
index 7b220df3..00000000
--- a/wininstall/locate-vcredist.bat
+++ /dev/null
@@ -1,76 +0,0 @@
-@call "../c/vs.bat" x86
-
-@IF "%VisualStudioVersion%"=="" ( GOTO error-undefined-vs )
-
-@IF "%VisualStudioVersion%"=="14.0" (
- SET "Path32=%CommonProgramFiles(x86)%\Merge Modules\Microsoft_VC140_CRT_x86.msm"
- SET "Path64=%CommonProgramFiles(x86)%\Merge Modules\Microsoft_VC140_CRT_x64.msm"
-)
-
-@IF "%VisualStudioVersion%"=="15.0" or "%VisualStudioVersion%"=="16.0" or "%VisualStudioVersion%"=="17.0" (
- @PUSHD "%VCINSTALLDIR%Redist\MSVC"
- @FOR /D %%D IN (*) DO (
- @PUSHD %%D
- @FOR %%F IN (MergeModules\Microsoft_VC*_CRT_x86.msm) DO (
- SET "Path32=%VCINSTALLDIR%Redist\MSVC\%%D\%%F"
- )
- @FOR %%F IN (MergeModules\Microsoft_VC*_CRT_x64.msm) DO (
- SET "Path64=%VCINSTALLDIR%Redist\MSVC\%%D\%%F"
- )
- @POPD
- )
- @POPD
-)
-
-@DEL vcredist.wxs >nul 2>&1
-
-IF "%Path32%"=="" ( GOTO error-unknown-vs )
-IF NOT EXIST "%Path32%" ( GOTO error-32-doesnt-exist )
-IF NOT EXIST "%Path64%" ( GOTO error-64-doesnt-exist )
-
-@(
- @ECHO ^<?xml version="1.0" encoding="utf-8"?^>
- @ECHO ^<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"^>
- @ECHO ^<Fragment^>
- @ECHO ^<DirectoryRef Id="TARGETDIR"^>
- @ECHO ^<Merge Id="VCRedist64Merge" SourceFile="%Path64%" Language="0" DiskId="1" /^>
- @ECHO ^</DirectoryRef^>
- @ECHO ^</Fragment^>
- @ECHO ^<Fragment^>
- @ECHO ^<DirectoryRef Id="TARGETDIR"^>
- @ECHO ^<Merge Id="VCRedist32Merge" SourceFile="%Path32%" Language="0" DiskId="1" /^>
- @ECHO ^</DirectoryRef^>
- @ECHO ^</Fragment^>
- @ECHO ^<Fragment^>
- @ECHO ^<Feature Id="VCRedist64" Title="Visual C++ Runtime (64-bit)" AllowAdvertise="no" Display="hidden" Level="1"^>
- @ECHO ^<MergeRef Id="VCRedist64Merge" /^>
- @ECHO ^</Feature^>
- @ECHO ^</Fragment^>
- @ECHO ^<Fragment^>
- @ECHO ^<Feature Id="VCRedist32" Title="Visual C++ Runtime (32-bit)" AllowAdvertise="no" Display="hidden" Level="1"^>
- @ECHO ^<MergeRef Id="VCRedist32Merge" /^>
- @ECHO ^</Feature^>
- @ECHO ^</Fragment^>
- @ECHO ^</Wix^>
-) > vcredist.wxs
-
-@ECHO Built vcredist.wxs
-@EXIT /b 0
-
-:error-undefined-vs
-@ECHO Error building vcredist.wxs: Visual Studio version not defined.
-@EXIT /b 1
-
-:error-unknown-vs
-@ECHO Error building vcredist.wxs: Unexpected Visual Studio version.
-@EXIT /b 1
-
-:error-32-doesnt-exist
-@ECHO Error building vcredist.wxs: Merge Module couldn't be found:
-@ECHO %Path32%
-@EXIT /b 1
-
-:error-64-doesnt-exist
-@ECHO Error building vcredist.wxs: Merge Module couldn't be found:
-@ECHO %Path64%
-@EXIT /b 1
diff --git a/wininstall/product.wxs b/wininstall/product.wxs
index 822ba562..4d15a0be 100755
--- a/wininstall/product.wxs
+++ b/wininstall/product.wxs
@@ -63,7 +63,6 @@
<Feature Id="ti3nt" Level="1" Title="Chez Scheme 32-bit threaded">
<ComponentGroupRef Id="ti3nt"/>
</Feature>
- <FeatureRef Id="VCRedist32"/>
<?endif?>
<?if $(sys.BUILDARCH)="x64"?>
@@ -73,7 +72,6 @@
<Feature Id="ta6nt" Level="1" Title="Chez Scheme 64-bit threaded">
<ComponentGroupRef Id="ta6nt"/>
</Feature>
- <FeatureRef Id="VCRedist64"/>
<?endif?>
<Feature Id="Registry" Level="1" Title="Chez Scheme Registry Entries">
diff --git a/wininstall/ta6nt.wxs b/wininstall/ta6nt.wxs
index a330aa7a..3e71059e 100644
--- a/wininstall/ta6nt.wxs
+++ b/wininstall/ta6nt.wxs
@@ -4,16 +4,16 @@
<DirectoryRef Id="D_bin">
<Directory Id="D_bin_ta6nt" Name="ta6nt">
<Component Id="cmpA67EF6318D00B4209BFCD0BFDCDF781C" Guid="*">
- <File Id="fil6AE7892DB37FF6D2C21B5EC064C90DE5" KeyPath="yes" Source="..\ta6nt\bin\ta6nt\csv999.dll" />
+ <File Id="fil6AE7892DB37FF6D2C21B5EC064C90DE5" KeyPath="yes" Source="..\ta6nt\bin\ta6nt\csv1000.dll" />
</Component>
<Component Id="cmpF41FF9DE554F79FB6FBD85E5B80A5221" Guid="*">
- <File Id="fil9157F8FB18F1F75BE50A64A9C227BF61" KeyPath="yes" Source="..\ta6nt\bin\ta6nt\csv999.exp" />
+ <File Id="fil9157F8FB18F1F75BE50A64A9C227BF61" KeyPath="yes" Source="..\ta6nt\bin\ta6nt\csv1000.exp" />
</Component>
<Component Id="cmp372F759C97C3C69E4C336B81D807E4F5" Guid="*">
- <File Id="fil602A8BBB83416294672AA22507E6452A" KeyPath="yes" Source="..\ta6nt\bin\ta6nt\csv999.lib" />
+ <File Id="fil602A8BBB83416294672AA22507E6452A" KeyPath="yes" Source="..\ta6nt\bin\ta6nt\csv1000.lib" />
</Component>
<Component Id="cmp009F56824D2716FAAC978FE17A4D947D" Guid="*">
- <File Id="filDD0E7D06D27FC4C00388CB48E4B2818C" KeyPath="yes" Source="..\ta6nt\bin\ta6nt\csv999.pdb" />
+ <File Id="filDD0E7D06D27FC4C00388CB48E4B2818C" KeyPath="yes" Source="..\ta6nt\bin\ta6nt\csv1000.pdb" />
</Component>
<Component Id="cmp50972D99EC9DDA63E4BC6E29DAA592D0" Guid="*">
<File Id="fil8A260A0B8935F8F9011AA2EDB9147BDE" KeyPath="yes" Source="..\ta6nt\bin\ta6nt\petite.exe" />
@@ -40,10 +40,10 @@
<DirectoryRef Id="D_boot">
<Directory Id="D_boot_ta6nt" Name="ta6nt">
<Component Id="cmpCBDB945622604667783C3C57A0427DF5" Guid="*">
- <File Id="filD3E4E45F8404EE812C5DAFCBEB2502AA" KeyPath="yes" Source="..\ta6nt\boot\ta6nt\csv999md.lib" />
+ <File Id="filD3E4E45F8404EE812C5DAFCBEB2502AA" KeyPath="yes" Source="..\ta6nt\boot\ta6nt\csv1000md.lib" />
</Component>
<Component Id="cmpD7880184C113065E511275EFD531D589" Guid="*">
- <File Id="filDC2D7E1DB036BAE5B7FFA7FE14F3CD69" KeyPath="yes" Source="..\ta6nt\boot\ta6nt\csv999mt.lib" />
+ <File Id="filDC2D7E1DB036BAE5B7FFA7FE14F3CD69" KeyPath="yes" Source="..\ta6nt\boot\ta6nt\csv1000mt.lib" />
</Component>
<Component Id="cmp5211817ED85951CDAF2FD5E2419BD211" Guid="*">
<File Id="fil21839A8D4062A72DEAB3156D77EEE82A" KeyPath="yes" Source="..\ta6nt\boot\ta6nt\mainmd.obj" />
diff --git a/wininstall/ti3nt.wxs b/wininstall/ti3nt.wxs
index 5c490eff..a29fb986 100644
--- a/wininstall/ti3nt.wxs
+++ b/wininstall/ti3nt.wxs
@@ -4,16 +4,16 @@
<DirectoryRef Id="D_bin">
<Directory Id="D_bin_ti3nt" Name="ti3nt">
<Component Id="cmp3E51840FF941B7410025EFB2215EAB58" Guid="*">
- <File Id="fil6B96E8682034EC96C7842C5024FDF620" KeyPath="yes" Source="..\ti3nt\bin\ti3nt\csv999.dll" />
+ <File Id="fil6B96E8682034EC96C7842C5024FDF620" KeyPath="yes" Source="..\ti3nt\bin\ti3nt\csv1000.dll" />
</Component>
<Component Id="cmp68BA21E76800BFFA057D33973E89D8F4" Guid="*">
- <File Id="fil5F505E9200C84F7887C4D12FA9D9D794" KeyPath="yes" Source="..\ti3nt\bin\ti3nt\csv999.exp" />
+ <File Id="fil5F505E9200C84F7887C4D12FA9D9D794" KeyPath="yes" Source="..\ti3nt\bin\ti3nt\csv1000.exp" />
</Component>
<Component Id="cmpCA1F1C55C49A3A332E60F8D0D78363C2" Guid="*">
- <File Id="filB8607D2BF295249DD6F51070A687E14B" KeyPath="yes" Source="..\ti3nt\bin\ti3nt\csv999.lib" />
+ <File Id="filB8607D2BF295249DD6F51070A687E14B" KeyPath="yes" Source="..\ti3nt\bin\ti3nt\csv1000.lib" />
</Component>
<Component Id="cmp01D266C0ECE540BE4BF6E6AE14AFFCBB" Guid="*">
- <File Id="filE99735E84B4934FC41AAA6BBF547F1C5" KeyPath="yes" Source="..\ti3nt\bin\ti3nt\csv999.pdb" />
+ <File Id="filE99735E84B4934FC41AAA6BBF547F1C5" KeyPath="yes" Source="..\ti3nt\bin\ti3nt\csv1000.pdb" />
</Component>
<Component Id="cmpC00FD9C7415A1D2D22EA38F5259CAAA4" Guid="*">
<File Id="fil80D2F31CB0D3B8F98E3C8CCAF9DA6F29" KeyPath="yes" Source="..\ti3nt\bin\ti3nt\petite.exe" />
@@ -40,10 +40,10 @@
<DirectoryRef Id="D_boot">
<Directory Id="D_boot_ti3nt" Name="ti3nt">
<Component Id="cmp7099C9EB3F487AAFE3A880CED21FA9C2" Guid="*">
- <File Id="filD5DA8D84F54BC985AA246BBD3FB15239" KeyPath="yes" Source="..\ti3nt\boot\ti3nt\csv999md.lib" />
+ <File Id="filD5DA8D84F54BC985AA246BBD3FB15239" KeyPath="yes" Source="..\ti3nt\boot\ti3nt\csv1000md.lib" />
</Component>
<Component Id="cmpF3038779EA05930E72A29C15DC2D64B2" Guid="*">
- <File Id="filFB335FE01A6D5ED27AD2BC179DB8E265" KeyPath="yes" Source="..\ti3nt\boot\ti3nt\csv999mt.lib" />
+ <File Id="filFB335FE01A6D5ED27AD2BC179DB8E265" KeyPath="yes" Source="..\ti3nt\boot\ti3nt\csv1000mt.lib" />
</Component>
<Component Id="cmp9DDE0523EFC5EEA983DE3CFA0F493908" Guid="*">
<File Id="fil139F59D34D1A013CCB2AEC11507287AA" KeyPath="yes" Source="..\ti3nt\boot\ti3nt\mainmd.obj" />