Skip to content

Commit

Permalink
version 10.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
burgerrg committed Feb 5, 2024
1 parent 1f5adec commit 51e8025
Show file tree
Hide file tree
Showing 28 changed files with 106 additions and 226 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
16 changes: 8 additions & 8 deletions BUILDING
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
4 changes: 2 additions & 2 deletions boot/pb/equates.h
Original file line number Diff line number Diff line change
@@ -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 */
Expand Down Expand Up @@ -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
Expand Down
Binary file modified boot/pb/petite.boot
Binary file not shown.
Binary file modified boot/pb/scheme.boot
Binary file not shown.
4 changes: 2 additions & 2 deletions boot/pb/scheme.h
Original file line number Diff line number Diff line change
@@ -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 */
Expand Down Expand Up @@ -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 */
Expand Down
7 changes: 2 additions & 5 deletions c/fasl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
12 changes: 6 additions & 6 deletions c/scheme.rc
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion csug/copyright.stex
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions csug/csug.stex
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion makefiles/Makefile-csug.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 3 additions & 7 deletions makefiles/install.zuo
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pkg/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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/')
Expand Down Expand Up @@ -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
Expand Down
Loading

0 comments on commit 51e8025

Please sign in to comment.