From 075048409bd689ced85e1c50ed1e449e8ec90841 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Sun, 27 Sep 2020 14:56:15 -0600 Subject: [PATCH] bump version --- .makefile | 2 +- Makefile | 12 ++++++------ pkgs/base/info.rkt | 2 +- racket/src/ChezScheme/makefiles/Mf-install.in | 2 +- racket/src/ChezScheme/s/cmacros.ss | 2 +- racket/src/ChezScheme/s/mkgc.ss | 2 +- racket/src/version/racket_version.h | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.makefile b/.makefile index bbff3bff49..de985e0fc8 100644 --- a/.makefile +++ b/.makefile @@ -338,7 +338,7 @@ RACKET_FOR_BOOTFILES = $(RACKET) RACKET_FOR_BUILD = $(RACKET) # This branch name changes each time the pb boot files are updated: -PB_BRANCH == circa-7.8.0.10-12 +PB_BRANCH == circa-7.8.0.10-13 PB_REPO == https://github.com/racket/pb # Alternative source for Chez Scheme boot files, normally set by diff --git a/Makefile b/Makefile index 9d21016371..b1fbab3a27 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,7 @@ RACKETCS_SUFFIX = RACKET = RACKET_FOR_BOOTFILES = $(RACKET) RACKET_FOR_BUILD = $(RACKET) -PB_BRANCH = circa-7.8.0.10-12 +PB_BRANCH = circa-7.8.0.10-13 PB_REPO = https://github.com/racket/pb EXTRA_REPOS_BASE = CS_CROSS_SUFFIX = @@ -306,14 +306,14 @@ maybe-fetch-pb-as-is: echo done fetch-pb-from: mkdir -p racket/src/ChezScheme/boot - if [ ! -d racket/src/ChezScheme/boot/pb ] ; then git clone -q -b circa-7.8.0.10-12 https://github.com/racket/pb racket/src/ChezScheme/boot/pb ; else cd racket/src/ChezScheme/boot/pb && git fetch -q origin circa-7.8.0.10-12:remotes/origin/circa-7.8.0.10-12 ; fi - cd racket/src/ChezScheme/boot/pb && git checkout -q circa-7.8.0.10-12 + if [ ! -d racket/src/ChezScheme/boot/pb ] ; then git clone -q -b circa-7.8.0.10-13 https://github.com/racket/pb racket/src/ChezScheme/boot/pb ; else cd racket/src/ChezScheme/boot/pb && git fetch -q origin circa-7.8.0.10-13:remotes/origin/circa-7.8.0.10-13 ; fi + cd racket/src/ChezScheme/boot/pb && git checkout -q circa-7.8.0.10-13 pb-stage: - cd racket/src/ChezScheme/boot/pb && git branch circa-7.8.0.10-12 - cd racket/src/ChezScheme/boot/pb && git checkout circa-7.8.0.10-12 + cd racket/src/ChezScheme/boot/pb && git branch circa-7.8.0.10-13 + cd racket/src/ChezScheme/boot/pb && git checkout circa-7.8.0.10-13 cd racket/src/ChezScheme/boot/pb && git add . && git commit --amend -m "new build" pb-push: - cd racket/src/ChezScheme/boot/pb && git push -u origin circa-7.8.0.10-12 + cd racket/src/ChezScheme/boot/pb && git push -u origin circa-7.8.0.10-13 win-cs-base: IF "$(RACKET_FOR_BUILD)" == "" $(MAKE) win-bc-then-cs-base SETUP_BOOT_MODE=--boot WIN32_BUILD_LEVEL=bc PLAIN_RACKET=racket\racketbc DISABLE_STATIC_LIBS="$(DISABLE_STATIC_LIBS)" EXTRA_REPOS_BASE="$(EXTRA_REPOS_BASE)" GIT_CLONE_ARGS_qq="$(GIT_CLONE_ARGS_qq)" JOB_OPTIONS="$(JOB_OPTIONS)" PLT_SETUP_OPTIONS="$(PLT_SETUP_OPTIONS)" RACKETBC_SUFFIX="$(RACKETBC_SUFFIX)" RACKETCS_SUFFIX="$(RACKETCS_SUFFIX)" IF not "$(RACKET_FOR_BUILD)" == "" $(MAKE) win-just-cs-base SETUP_BOOT_MODE=--chain DISABLE_STATIC_LIBS="$(DISABLE_STATIC_LIBS)" EXTRA_REPOS_BASE="$(EXTRA_REPOS_BASE)" GIT_CLONE_ARGS_qq="$(GIT_CLONE_ARGS_qq)" JOB_OPTIONS="$(JOB_OPTIONS)" PLT_SETUP_OPTIONS="$(PLT_SETUP_OPTIONS)" RACKETCS_SUFFIX="$(RACKETCS_SUFFIX)" RACKET_FOR_BUILD="$(RACKET_FOR_BUILD)" diff --git a/pkgs/base/info.rkt b/pkgs/base/info.rkt index 9aa582818c..60f40c3eea 100644 --- a/pkgs/base/info.rkt +++ b/pkgs/base/info.rkt @@ -12,7 +12,7 @@ (define collection 'multi) -(define version "7.8.0.10") +(define version "7.8.0.11") (define deps `("racket-lib" ["racket" #:version ,version])) diff --git a/racket/src/ChezScheme/makefiles/Mf-install.in b/racket/src/ChezScheme/makefiles/Mf-install.in index b00f506c37..023f9dbcea 100644 --- a/racket/src/ChezScheme/makefiles/Mf-install.in +++ b/racket/src/ChezScheme/makefiles/Mf-install.in @@ -62,7 +62,7 @@ InstallLZ4Target= # no changes should be needed below this point # ############################################################################### -Version=csv9.5.3.38 +Version=csv9.5.3.39 Include=boot/$m PetiteBoot=boot/$m/petite.boot SchemeBoot=boot/$m/scheme.boot diff --git a/racket/src/ChezScheme/s/cmacros.ss b/racket/src/ChezScheme/s/cmacros.ss index b8d5e2e2bb..f86f6c399d 100644 --- a/racket/src/ChezScheme/s/cmacros.ss +++ b/racket/src/ChezScheme/s/cmacros.ss @@ -357,7 +357,7 @@ ;; --------------------------------------------------------------------- ;; Version and machine types: -(define-constant scheme-version #x09050326) +(define-constant scheme-version #x09050327) (define-syntax define-machine-types (lambda (x) diff --git a/racket/src/ChezScheme/s/mkgc.ss b/racket/src/ChezScheme/s/mkgc.ss index cd2094debf..e64b2336ca 100644 --- a/racket/src/ChezScheme/s/mkgc.ss +++ b/racket/src/ChezScheme/s/mkgc.ss @@ -1510,8 +1510,8 @@ "IGEN tg = TARGET_GENERATION(si);" (body) "tgc->sweep_change = SWEEP_CHANGE_PROGRESS;" - "FWDMARKER(p) = forward_marker;" "FWDADDRESS(p) = new_p;" + "FWDMARKER(p) = forward_marker;" (and (lookup 'maybe-backreferences? config #f) "ADD_BACKREFERENCE(p, tg);") "*dest = new_p;" diff --git a/racket/src/version/racket_version.h b/racket/src/version/racket_version.h index ab6838348d..d837d7b388 100644 --- a/racket/src/version/racket_version.h +++ b/racket/src/version/racket_version.h @@ -16,7 +16,7 @@ #define MZSCHEME_VERSION_X 7 #define MZSCHEME_VERSION_Y 8 #define MZSCHEME_VERSION_Z 0 -#define MZSCHEME_VERSION_W 10 +#define MZSCHEME_VERSION_W 11 /* A level of indirection makes `#` work as needed: */ #define AS_a_STR_HELPER(x) #x