From 093fcd1bc73d1aa72b709aa4d2bd91283f8adf8e Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Sat, 1 Aug 2020 13:47:04 -0600 Subject: [PATCH] makefile: make Racket CS the default The top-level makefile now builds Racket CS as `racket` by default. Use `racket bc` to build Racket BC as `racket`. Use `make both` to build both CS and BC (the latter with the `bc` suffix) overlayed in a single build. By using `make both` insted of `make cs` plus `make bc`, you can avoid redundant package downloads and documentation rendering. To build Racket BC as `racket`, use `racket bc RACKETBC_SUFFIX=`, but you must consistently use `RACKETBC_SUFFIX=` with `make` every time. --- .makefile | 14 +- Makefile | 14 +- racket/src/bc/mzconfig.h.in | 2 +- racket/src/configure | 2 +- racket/src/cs/Makefile | 2 +- racket/src/cs/c/Makefile.in | 11 +- racket/src/cs/c/configure | 8 +- racket/src/cs/c/configure.ac | 8 +- racket/src/cs/c/cs_config.h.in | 3 + racket/src/cs/c/main.c | 2 +- racket/src/cs/convert.rkt | 8 +- racket/src/cs/schemified/expander.scm | 498 +++++++++++++------------- racket/src/cs/schemified/io.scm | 120 +++---- racket/src/cs/schemified/regexp.scm | 172 ++++----- racket/src/worksp/build-at.bat | 5 +- racket/src/worksp/build.bat | 13 +- racket/src/worksp/gc2/make.rkt | 17 +- 17 files changed, 448 insertions(+), 451 deletions(-) diff --git a/.makefile b/.makefile index 95d923c967..498dcae721 100644 --- a/.makefile +++ b/.makefile @@ -64,7 +64,7 @@ PLT_SETUP_OPTIONS = CPUS = # Target selector: `cs` or `bc` -VM = bc +VM = cs # Target selector: `minimal` or `skip` INITIAL_SETUP_MODE = minimal @@ -219,7 +219,7 @@ win-base-config: # Racket BC # Can be `bc` or empty: -RACKETBC_SUFFIX = +RACKETBC_SUFFIX = bc bc: $(MAKE) bc-in-place @@ -309,7 +309,7 @@ racket/src/build/cross/Makefile: racket/src/configure racket/src/cfg-bc racket/s # Racket CS # Can be `cs` or empty: -RACKETCS_SUFFIX = cs +RACKETCS_SUFFIX = # If `RACKET` and `RACKET_FOR_BOOTFILES` are not set, the build uses the # `pb` repo to get initial portable-byte Chez Scheme boot files. @@ -483,8 +483,8 @@ racket/src/build/cross/cs/c/Makefile: racket/src/cs/c/configure racket/src/cs/c/ # ... but update packages and builds docs only once both: - $(MAKE) bc IN_PLACE_SETUP_OPTIONS="--error-out build/step" - $(MAKE) also-cs IN_PLACE_SETUP_OPTIONS="--error-in build/step" + $(MAKE) cs IN_PLACE_SETUP_OPTIONS="--error-out build/step" + $(MAKE) also-bc IN_PLACE_SETUP_OPTIONS="--error-in build/step" plain-also: $(MAKE) $(VM) INITIAL_SETUP_MODE=skip PLT_SETUP_OPTIONS="-D $(PLT_SETUP_OPTIONS)" @@ -497,8 +497,8 @@ also-bc: win-both: - $(MAKE) win-bc - $(MAKE) win-also-cs + $(MAKE) win-cs + $(MAKE) win-also-bc win-plain-also: $(MAKE) $(VM) INITIAL_SETUP_MODE=skip PLT_SETUP_OPTIONS="-D $(PLT_SETUP_OPTIONS)" diff --git a/Makefile b/Makefile index b7e302ac93..c505b1dcae 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ RUN_RACO = $(PLAIN_RACKET) $(SETUP_MACHINE_FLAGS) -G racket/etc -X racket/colle DEFAULT_SRC_CATALOG = https://pkgs.racket-lang.org PLT_SETUP_OPTIONS = CPUS = -VM = bc +VM = cs INITIAL_SETUP_MODE = minimal UPDATE_PKGS_ARGS = --all --auto --no-setup --scope installation INSTALL_PKGS_ARGS = $(JOB_OPTIONS) --no-setup --pkgs --skip-installed --scope installation --deps search-auto $(REQUIRED_PKGS) $(PKGS) @@ -36,11 +36,11 @@ SELF_FLAGS_qq = SELF_ROOT_CONFIG_FLAG="$(SELF_ROOT_CONFIG_FLAG)" PLT_SETUP_OPTIONS_qq = PLT_SETUP_OPTIONS="$(JOB_OPTIONS) $(PLT_SETUP_OPTIONS)" INSTALL_SETUP_ARGS = SELF_ROOT_CONFIG_FLAG="$(SELF_ROOT_CONFIG_FLAG)" PLT_SETUP_OPTIONS="$(JOB_OPTIONS) $(PLT_SETUP_OPTIONS)" SETUP_MACHINE_FLAGS="$(SETUP_MACHINE_FLAGS)" WIN32_BUILD_LEVEL = all -RACKETBC_SUFFIX = +RACKETBC_SUFFIX = bc CONFIG_IN_PLACE_ARGS = --disable-useprefix --enable-origtree BC_CONFIGURE_ARGS = $(CONFIGURE_ARGS) $(MORE_CONFIGURE_ARGS) $(CONFIG_IN_PLACE_ARGS) MORE_CROSS_CONFIGURE_ARGS = -RACKETCS_SUFFIX = cs +RACKETCS_SUFFIX = RACKET = RACKET_FOR_BOOTFILES = $(RACKET) RACKET_FOR_BUILD = $(RACKET) @@ -329,8 +329,8 @@ native-cs-for-cross: racket/src/build/cross/cs/c/Makefile: racket/src/cs/c/configure racket/src/cs/c/Makefile.in cd racket/src/build/cross/cs/c; ../../../../cs/c/configure --enable-csdefault both: - $(MAKE) bc IN_PLACE_SETUP_OPTIONS="--error-out build/step" CONFIGURE_ARGS="$(CONFIGURE_ARGS)" CONFIG_IN_PLACE_ARGS="$(CONFIG_IN_PLACE_ARGS)" CPUS="$(CPUS)" CS_CONFIGURE_ARGS="$(CS_CONFIGURE_ARGS)" CS_CROSS_SUFFIX="$(CS_CROSS_SUFFIX)" DEFAULT_SRC_CATALOG="$(DEFAULT_SRC_CATALOG)" EXTRA_REPOS_BASE="$(EXTRA_REPOS_BASE)" INITIAL_SETUP_MODE="$(INITIAL_SETUP_MODE)" JOB_OPTIONS="$(JOB_OPTIONS)" MORE_CONFIGURE_ARGS="$(MORE_CONFIGURE_ARGS)" PKGS="$(PKGS)" PLT_SETUP_OPTIONS="$(PLT_SETUP_OPTIONS)" RACKETBC_SUFFIX="$(RACKETBC_SUFFIX)" RACKETCS_SUFFIX="$(RACKETCS_SUFFIX)" RACKET_FOR_BOOTFILES="$(RACKET_FOR_BOOTFILES)" RACKET_FOR_BUILD="$(RACKET_FOR_BUILD)" SELF_ROOT_CONFIG_FLAG="$(SELF_ROOT_CONFIG_FLAG)" SETUP_MACHINE_FLAGS="$(SETUP_MACHINE_FLAGS)" SRC_CATALOG="$(SRC_CATALOG)" - $(MAKE) also-cs IN_PLACE_SETUP_OPTIONS="--error-in build/step" CONFIGURE_ARGS="$(CONFIGURE_ARGS)" CONFIG_IN_PLACE_ARGS="$(CONFIG_IN_PLACE_ARGS)" CPUS="$(CPUS)" CS_CONFIGURE_ARGS="$(CS_CONFIGURE_ARGS)" CS_CROSS_SUFFIX="$(CS_CROSS_SUFFIX)" DEFAULT_SRC_CATALOG="$(DEFAULT_SRC_CATALOG)" EXTRA_REPOS_BASE="$(EXTRA_REPOS_BASE)" INITIAL_SETUP_MODE="$(INITIAL_SETUP_MODE)" JOB_OPTIONS="$(JOB_OPTIONS)" MORE_CONFIGURE_ARGS="$(MORE_CONFIGURE_ARGS)" PKGS="$(PKGS)" PLT_SETUP_OPTIONS="$(PLT_SETUP_OPTIONS)" RACKETBC_SUFFIX="$(RACKETBC_SUFFIX)" RACKETCS_SUFFIX="$(RACKETCS_SUFFIX)" RACKET_FOR_BOOTFILES="$(RACKET_FOR_BOOTFILES)" RACKET_FOR_BUILD="$(RACKET_FOR_BUILD)" SELF_ROOT_CONFIG_FLAG="$(SELF_ROOT_CONFIG_FLAG)" SETUP_MACHINE_FLAGS="$(SETUP_MACHINE_FLAGS)" SRC_CATALOG="$(SRC_CATALOG)" + $(MAKE) cs IN_PLACE_SETUP_OPTIONS="--error-out build/step" CONFIGURE_ARGS="$(CONFIGURE_ARGS)" CONFIG_IN_PLACE_ARGS="$(CONFIG_IN_PLACE_ARGS)" CPUS="$(CPUS)" CS_CONFIGURE_ARGS="$(CS_CONFIGURE_ARGS)" CS_CROSS_SUFFIX="$(CS_CROSS_SUFFIX)" DEFAULT_SRC_CATALOG="$(DEFAULT_SRC_CATALOG)" EXTRA_REPOS_BASE="$(EXTRA_REPOS_BASE)" INITIAL_SETUP_MODE="$(INITIAL_SETUP_MODE)" JOB_OPTIONS="$(JOB_OPTIONS)" MORE_CONFIGURE_ARGS="$(MORE_CONFIGURE_ARGS)" PKGS="$(PKGS)" PLT_SETUP_OPTIONS="$(PLT_SETUP_OPTIONS)" RACKETBC_SUFFIX="$(RACKETBC_SUFFIX)" RACKETCS_SUFFIX="$(RACKETCS_SUFFIX)" RACKET_FOR_BOOTFILES="$(RACKET_FOR_BOOTFILES)" RACKET_FOR_BUILD="$(RACKET_FOR_BUILD)" SELF_ROOT_CONFIG_FLAG="$(SELF_ROOT_CONFIG_FLAG)" SETUP_MACHINE_FLAGS="$(SETUP_MACHINE_FLAGS)" SRC_CATALOG="$(SRC_CATALOG)" + $(MAKE) also-bc IN_PLACE_SETUP_OPTIONS="--error-in build/step" CONFIGURE_ARGS="$(CONFIGURE_ARGS)" CONFIG_IN_PLACE_ARGS="$(CONFIG_IN_PLACE_ARGS)" CPUS="$(CPUS)" CS_CONFIGURE_ARGS="$(CS_CONFIGURE_ARGS)" CS_CROSS_SUFFIX="$(CS_CROSS_SUFFIX)" DEFAULT_SRC_CATALOG="$(DEFAULT_SRC_CATALOG)" EXTRA_REPOS_BASE="$(EXTRA_REPOS_BASE)" INITIAL_SETUP_MODE="$(INITIAL_SETUP_MODE)" JOB_OPTIONS="$(JOB_OPTIONS)" MORE_CONFIGURE_ARGS="$(MORE_CONFIGURE_ARGS)" PKGS="$(PKGS)" PLT_SETUP_OPTIONS="$(PLT_SETUP_OPTIONS)" RACKETBC_SUFFIX="$(RACKETBC_SUFFIX)" RACKETCS_SUFFIX="$(RACKETCS_SUFFIX)" RACKET_FOR_BOOTFILES="$(RACKET_FOR_BOOTFILES)" RACKET_FOR_BUILD="$(RACKET_FOR_BUILD)" SELF_ROOT_CONFIG_FLAG="$(SELF_ROOT_CONFIG_FLAG)" SETUP_MACHINE_FLAGS="$(SETUP_MACHINE_FLAGS)" SRC_CATALOG="$(SRC_CATALOG)" plain-also: $(MAKE) $(VM) INITIAL_SETUP_MODE=skip PLT_SETUP_OPTIONS="-D $(PLT_SETUP_OPTIONS)" CONFIGURE_ARGS="$(CONFIGURE_ARGS)" CONFIG_IN_PLACE_ARGS="$(CONFIG_IN_PLACE_ARGS)" CPUS="$(CPUS)" CS_CONFIGURE_ARGS="$(CS_CONFIGURE_ARGS)" CS_CROSS_SUFFIX="$(CS_CROSS_SUFFIX)" DEFAULT_SRC_CATALOG="$(DEFAULT_SRC_CATALOG)" EXTRA_REPOS_BASE="$(EXTRA_REPOS_BASE)" IN_PLACE_SETUP_OPTIONS="$(IN_PLACE_SETUP_OPTIONS)" JOB_OPTIONS="$(JOB_OPTIONS)" MORE_CONFIGURE_ARGS="$(MORE_CONFIGURE_ARGS)" PKGS="$(PKGS)" RACKETBC_SUFFIX="$(RACKETBC_SUFFIX)" RACKETCS_SUFFIX="$(RACKETCS_SUFFIX)" RACKET_FOR_BOOTFILES="$(RACKET_FOR_BOOTFILES)" RACKET_FOR_BUILD="$(RACKET_FOR_BUILD)" SELF_ROOT_CONFIG_FLAG="$(SELF_ROOT_CONFIG_FLAG)" SETUP_MACHINE_FLAGS="$(SETUP_MACHINE_FLAGS)" SRC_CATALOG="$(SRC_CATALOG)" also-cs: @@ -338,8 +338,8 @@ also-cs: also-bc: $(MAKE) plain-also VM=bc CONFIGURE_ARGS="$(CONFIGURE_ARGS)" CONFIG_IN_PLACE_ARGS="$(CONFIG_IN_PLACE_ARGS)" CPUS="$(CPUS)" CS_CONFIGURE_ARGS="$(CS_CONFIGURE_ARGS)" CS_CROSS_SUFFIX="$(CS_CROSS_SUFFIX)" DEFAULT_SRC_CATALOG="$(DEFAULT_SRC_CATALOG)" EXTRA_REPOS_BASE="$(EXTRA_REPOS_BASE)" INITIAL_SETUP_MODE="$(INITIAL_SETUP_MODE)" IN_PLACE_SETUP_OPTIONS="$(IN_PLACE_SETUP_OPTIONS)" JOB_OPTIONS="$(JOB_OPTIONS)" MORE_CONFIGURE_ARGS="$(MORE_CONFIGURE_ARGS)" PKGS="$(PKGS)" PLT_SETUP_OPTIONS="$(PLT_SETUP_OPTIONS)" RACKETBC_SUFFIX="$(RACKETBC_SUFFIX)" RACKETCS_SUFFIX="$(RACKETCS_SUFFIX)" RACKET_FOR_BOOTFILES="$(RACKET_FOR_BOOTFILES)" RACKET_FOR_BUILD="$(RACKET_FOR_BUILD)" SELF_ROOT_CONFIG_FLAG="$(SELF_ROOT_CONFIG_FLAG)" SETUP_MACHINE_FLAGS="$(SETUP_MACHINE_FLAGS)" SRC_CATALOG="$(SRC_CATALOG)" win-both: - $(MAKE) win-bc DEFAULT_SRC_CATALOG="$(DEFAULT_SRC_CATALOG)" DISABLE_STATIC_LIBS="$(DISABLE_STATIC_LIBS)" EXTRA_REPOS_BASE="$(EXTRA_REPOS_BASE)" GIT_CLONE_ARGS_qq="$(GIT_CLONE_ARGS_qq)" INITIAL_SETUP_MODE="$(INITIAL_SETUP_MODE)" IN_PLACE_SETUP_OPTIONS="$(IN_PLACE_SETUP_OPTIONS)" JOB_OPTIONS="$(JOB_OPTIONS)" PKGS="$(PKGS)" PLT_SETUP_OPTIONS="$(PLT_SETUP_OPTIONS)" RACKETBC_SUFFIX="$(RACKETBC_SUFFIX)" RACKETCS_SUFFIX="$(RACKETCS_SUFFIX)" RACKET_FOR_BUILD="$(RACKET_FOR_BUILD)" SETUP_MACHINE_FLAGS="$(SETUP_MACHINE_FLAGS)" SRC_CATALOG="$(SRC_CATALOG)" WIN32_BUILD_LEVEL="$(WIN32_BUILD_LEVEL)" - $(MAKE) win-also-cs CONFIGURE_ARGS="$(CONFIGURE_ARGS)" CONFIG_IN_PLACE_ARGS="$(CONFIG_IN_PLACE_ARGS)" CPUS="$(CPUS)" CS_CONFIGURE_ARGS="$(CS_CONFIGURE_ARGS)" CS_CROSS_SUFFIX="$(CS_CROSS_SUFFIX)" DEFAULT_SRC_CATALOG="$(DEFAULT_SRC_CATALOG)" EXTRA_REPOS_BASE="$(EXTRA_REPOS_BASE)" INITIAL_SETUP_MODE="$(INITIAL_SETUP_MODE)" IN_PLACE_SETUP_OPTIONS="$(IN_PLACE_SETUP_OPTIONS)" JOB_OPTIONS="$(JOB_OPTIONS)" MORE_CONFIGURE_ARGS="$(MORE_CONFIGURE_ARGS)" PKGS="$(PKGS)" PLT_SETUP_OPTIONS="$(PLT_SETUP_OPTIONS)" RACKETBC_SUFFIX="$(RACKETBC_SUFFIX)" RACKETCS_SUFFIX="$(RACKETCS_SUFFIX)" RACKET_FOR_BOOTFILES="$(RACKET_FOR_BOOTFILES)" RACKET_FOR_BUILD="$(RACKET_FOR_BUILD)" SELF_ROOT_CONFIG_FLAG="$(SELF_ROOT_CONFIG_FLAG)" SETUP_MACHINE_FLAGS="$(SETUP_MACHINE_FLAGS)" SRC_CATALOG="$(SRC_CATALOG)" + $(MAKE) win-cs DEFAULT_SRC_CATALOG="$(DEFAULT_SRC_CATALOG)" DISABLE_STATIC_LIBS="$(DISABLE_STATIC_LIBS)" EXTRA_REPOS_BASE="$(EXTRA_REPOS_BASE)" GIT_CLONE_ARGS_qq="$(GIT_CLONE_ARGS_qq)" INITIAL_SETUP_MODE="$(INITIAL_SETUP_MODE)" IN_PLACE_SETUP_OPTIONS="$(IN_PLACE_SETUP_OPTIONS)" JOB_OPTIONS="$(JOB_OPTIONS)" PKGS="$(PKGS)" PLT_SETUP_OPTIONS="$(PLT_SETUP_OPTIONS)" RACKETBC_SUFFIX="$(RACKETBC_SUFFIX)" RACKETCS_SUFFIX="$(RACKETCS_SUFFIX)" RACKET_FOR_BUILD="$(RACKET_FOR_BUILD)" SETUP_MACHINE_FLAGS="$(SETUP_MACHINE_FLAGS)" SRC_CATALOG="$(SRC_CATALOG)" WIN32_BUILD_LEVEL="$(WIN32_BUILD_LEVEL)" + $(MAKE) win-also-bc CONFIGURE_ARGS="$(CONFIGURE_ARGS)" CONFIG_IN_PLACE_ARGS="$(CONFIG_IN_PLACE_ARGS)" CPUS="$(CPUS)" CS_CONFIGURE_ARGS="$(CS_CONFIGURE_ARGS)" CS_CROSS_SUFFIX="$(CS_CROSS_SUFFIX)" DEFAULT_SRC_CATALOG="$(DEFAULT_SRC_CATALOG)" EXTRA_REPOS_BASE="$(EXTRA_REPOS_BASE)" INITIAL_SETUP_MODE="$(INITIAL_SETUP_MODE)" IN_PLACE_SETUP_OPTIONS="$(IN_PLACE_SETUP_OPTIONS)" JOB_OPTIONS="$(JOB_OPTIONS)" MORE_CONFIGURE_ARGS="$(MORE_CONFIGURE_ARGS)" PKGS="$(PKGS)" PLT_SETUP_OPTIONS="$(PLT_SETUP_OPTIONS)" RACKETBC_SUFFIX="$(RACKETBC_SUFFIX)" RACKETCS_SUFFIX="$(RACKETCS_SUFFIX)" RACKET_FOR_BOOTFILES="$(RACKET_FOR_BOOTFILES)" RACKET_FOR_BUILD="$(RACKET_FOR_BUILD)" SELF_ROOT_CONFIG_FLAG="$(SELF_ROOT_CONFIG_FLAG)" SETUP_MACHINE_FLAGS="$(SETUP_MACHINE_FLAGS)" SRC_CATALOG="$(SRC_CATALOG)" win-plain-also: $(MAKE) $(VM) INITIAL_SETUP_MODE=skip PLT_SETUP_OPTIONS="-D $(PLT_SETUP_OPTIONS)" CONFIGURE_ARGS="$(CONFIGURE_ARGS)" CONFIG_IN_PLACE_ARGS="$(CONFIG_IN_PLACE_ARGS)" CPUS="$(CPUS)" CS_CONFIGURE_ARGS="$(CS_CONFIGURE_ARGS)" CS_CROSS_SUFFIX="$(CS_CROSS_SUFFIX)" DEFAULT_SRC_CATALOG="$(DEFAULT_SRC_CATALOG)" EXTRA_REPOS_BASE="$(EXTRA_REPOS_BASE)" IN_PLACE_SETUP_OPTIONS="$(IN_PLACE_SETUP_OPTIONS)" JOB_OPTIONS="$(JOB_OPTIONS)" MORE_CONFIGURE_ARGS="$(MORE_CONFIGURE_ARGS)" PKGS="$(PKGS)" RACKETBC_SUFFIX="$(RACKETBC_SUFFIX)" RACKETCS_SUFFIX="$(RACKETCS_SUFFIX)" RACKET_FOR_BOOTFILES="$(RACKET_FOR_BOOTFILES)" RACKET_FOR_BUILD="$(RACKET_FOR_BUILD)" SELF_ROOT_CONFIG_FLAG="$(SELF_ROOT_CONFIG_FLAG)" SETUP_MACHINE_FLAGS="$(SETUP_MACHINE_FLAGS)" SRC_CATALOG="$(SRC_CATALOG)" win-also-cs: diff --git a/racket/src/bc/mzconfig.h.in b/racket/src/bc/mzconfig.h.in index 6aabf012a9..6cf10c29ba 100644 --- a/racket/src/bc/mzconfig.h.in +++ b/racket/src/bc/mzconfig.h.in @@ -98,7 +98,7 @@ typedef unsigned long uintptr_t; /* For platforms like Linux, where context info may not be available: */ #undef MZ_NO_UNWIND_SUPPORT -/* Initialize the compiled directory path "compiled/bc": */ +/* Whether to put ".zo" files in "compiled" or "compiled/bc": */ #undef COMPILED_PATH_AS_BC #endif diff --git a/racket/src/configure b/racket/src/configure index 5876819d8f..8042dcbd00 100755 --- a/racket/src/configure +++ b/racket/src/configure @@ -20,7 +20,7 @@ for arg in $*; do --enable-cs | --enable-csdefault) use_cs=yes ;; - --enable-bc | --enable-bcdefault) + --enable-bc | --enable-bcdefault | --enable-cgcdefault) use_bc=yes ;; --enable-csonly) diff --git a/racket/src/cs/Makefile b/racket/src/cs/Makefile index e1afd7dd27..84f06d9133 100644 --- a/racket/src/cs/Makefile +++ b/racket/src/cs/Makefile @@ -27,7 +27,7 @@ EXTRA_COMPILE_DEPS = COMPILE_FILE = $(SCHEME) --script compile-file.ss $(UNSAFE_COMP) $(COMPRESS_COMP) $(DEBUG_COMP) $(CROSS_COMP) --dest "$(BUILDDIR)" COMPILE_FILE_DEPS = compile-file.ss include.ss place-register.ss $(EXTRA_COMPILE_DEPS) -RACKET_SETUP_ARGS = false ../../bin/racket ../../bin/racket ../collects ../etc 0 true false 0 "" +RACKET_SETUP_ARGS = false ../../bin/racket ../../bin/racket ../collects ../etc 0 false false 0 "" PRIMITIVES_TABLES = primitive/kernel.ss primitive/unsafe.ss primitive/flfxnum.ss \ primitive/paramz.ss primitive/extfl.ss primitive/network.ss \ diff --git a/racket/src/cs/c/Makefile.in b/racket/src/cs/c/Makefile.in index 7e062ed025..a6da36286f 100644 --- a/racket/src/cs/c/Makefile.in +++ b/racket/src/cs/c/Makefile.in @@ -379,15 +379,14 @@ DEF_CONFIG_DIR@NOT_MINGW@ = -DINITIAL_CONFIG_DIRECTORY='"'"`cd $(srcdir)/../../. DEF_COLLECTS_DIR@MINGW@ = DEF_CONFIG_DIR@MINGW@ = DEF_C_DIRS = $(DEF_COLLECTS_DIR) $(DEF_CONFIG_DIR) -COMP_SUBDIR = -DCS_COMPILED_SUBDIR=@CS_COMPILED_SUBDIR@ -MAIN_DEPS = $(srcdir)/main.c $(srcdir)/boot.h $(srcdir)/../../start/config.inc +MAIN_DEPS = $(srcdir)/main.c $(srcdir)/boot.h $(srcdir)/../../start/config.inc cs_config.h main.o: $(MAIN_DEPS) - $(CC) $(CFLAGS) $(DEF_C_DIRS) $(COMP_SUBDIR) -c -o main.o $(srcdir)/main.c + $(CC) $(CFLAGS) $(DEF_C_DIRS) -c -o main.o $(srcdir)/main.c grmain.o: $(srcdir)/grmain.c $(MAIN_DEPS) $(srcdir)/../../start/gui_filter.inc - $(CC) $(CFLAGS) $(DEF_C_DIRS) $(COMP_SUBDIR) -c -o grmain.o $(srcdir)/grmain.c + $(CC) $(CFLAGS) $(DEF_C_DIRS) -c -o grmain.o $(srcdir)/grmain.c boot.o: $(srcdir)/boot.c $(srcdir)/../../rktio/rktio.inc $(srcdir)/boot.h $(CC) $(CFLAGS) -c -o boot.o $(srcdir)/boot.c @@ -550,8 +549,6 @@ check-racketcs: # ---------------------------------------- # Reconfigure -COMP_SUBDIR_CONFIGURE_ARGS=@COMP_SUBDIR_CONFIGURE_ARGS@ - CONFIGURE_SRCS = $(srcdir)/configure $(srcdir)/Makefile.in \ $(srcdir)/../../rktio/Makefile.in $(srcdir)/../../rktio/configure @@ -563,7 +560,7 @@ reconfigure: $(MAKE) Makefile NO_RECONFIG=no ON_RECONFIG= Makefile$(ON_RECONFIG): $(CONFIGURE_SRCS) - $(srcdir)/configure $(COMP_SUBDIR_CONFIGURE_ARGS) $(CONFIGURE_ARGS_qq) $(MORE_CONFIGURE_ARGS) + $(srcdir)/configure $(CONFIGURE_ARGS_qq) $(MORE_CONFIGURE_ARGS) Makefile$(NO_RECONFIG): $(NOOP) diff --git a/racket/src/cs/c/configure b/racket/src/cs/c/configure index ec05ffd5cd..6659b22e98 100755 --- a/racket/src/cs/c/configure +++ b/racket/src/cs/c/configure @@ -2958,13 +2958,9 @@ if test "${enable_csdefault}" = "yes" ; then CS_INSTALLED="" else CS_INSTALLED=cs -fi -CS_COMPILED_SUBDIR=1 -COMP_SUBDIR_CONFIGURE_ARGS= -if test "${enable_csdefault}" = "yes" ; then - CS_COMPILED_SUBDIR=0 - COMP_SUBDIR_CONFIGURE_ARGS=--enable-csdefault +$as_echo "#define CS_COMPILED_SUBDIR 1" >>confdefs.h + fi ############## Install targets ################ diff --git a/racket/src/cs/c/configure.ac b/racket/src/cs/c/configure.ac index 135977928f..1a56e476cc 100644 --- a/racket/src/cs/c/configure.ac +++ b/racket/src/cs/c/configure.ac @@ -104,13 +104,7 @@ if test "${enable_csdefault}" = "yes" ; then CS_INSTALLED="" else CS_INSTALLED=cs -fi - -CS_COMPILED_SUBDIR=1 -COMP_SUBDIR_CONFIGURE_ARGS= -if test "${enable_csdefault}" = "yes" ; then - CS_COMPILED_SUBDIR=0 - COMP_SUBDIR_CONFIGURE_ARGS=--enable-csdefault + AC_DEFINE(CS_COMPILED_SUBDIR,1,[Use a subdirectory of "compiled"]) fi ############## Install targets ################ diff --git a/racket/src/cs/c/cs_config.h.in b/racket/src/cs/c/cs_config.h.in index 71e77054f1..5cdf6a5028 100644 --- a/racket/src/cs/c/cs_config.h.in +++ b/racket/src/cs/c/cs_config.h.in @@ -1,2 +1,5 @@ /* The size of a `void *', as computed by sizeof. */ #undef SIZEOF_VOID_P + +/* Whether use put ".zo" files in a subdirectory of "compiled" */ +#undef CS_COMPILED_SUBDIR diff --git a/racket/src/cs/c/main.c b/racket/src/cs/c/main.c index 883ec28d39..a05286444f 100644 --- a/racket/src/cs/c/main.c +++ b/racket/src/cs/c/main.c @@ -24,7 +24,7 @@ static int scheme_utf8_encode(unsigned int *path, int zero_offset, int len, #endif #ifndef CS_COMPILED_SUBDIR -# define CS_COMPILED_SUBDIR 1 +# define CS_COMPILED_SUBDIR 0 #endif #define XFORM_SKIP_PROC /* empty */ diff --git a/racket/src/cs/convert.rkt b/racket/src/cs/convert.rkt index fd6c85ba80..c26975b55e 100644 --- a/racket/src/cs/convert.rkt +++ b/racket/src/cs/convert.rkt @@ -341,9 +341,11 @@ [(hash-equal? k) 'hash] [(hash-eqv? k) 'hasheqv] [else 'hasheq]) - ,@(for*/list ([(k v) (in-hash k)] - [e (in-list (list k v))]) - `(quote ,e)))] + ,@(apply append + (hash-map k + (lambda (k v) + (list `(quote ,k) + `(quote ,v))))))] [(pair? k) `(cons ,(loop (car k)) ,(loop (cdr k)))] [(keyword? k) diff --git a/racket/src/cs/schemified/expander.scm b/racket/src/cs/schemified/expander.scm index 1fdfba12eb..c4e1ca5ed2 100644 --- a/racket/src/cs/schemified/expander.scm +++ b/racket/src/cs/schemified/expander.scm @@ -125,296 +125,296 @@ (define kw2194 (string->keyword "set-hash!")) (define hash2936 (hasheq - kw2535 - '17 - kw2333 - '14 - kw2603 - '1 - kw2802 - '12 - kw2967 - '12 - kw2804 - '24 - kw2473 - '14 - kw2496 - '7 - kw2707 - '22 - kw2645 - '19 - kw2796 - '13 kw2755 '25 - kw2129 - '16 - kw2607 - '3 - kw2582 - '13 - kw2201 - '20 - kw3163 - '9 - kw2626 - '8 - kw2931 - '15 - kw2525 - '10 - kw2677 - '26 - kw2762 - '27 - kw1932 - '2 - kw2169 - '21 - kw2241 - '18 - kw3357 - '14 - kw2897 - '28 kw2641 '4 + kw2129 + '16 kw2821 '11 + kw2607 + '3 kw3245 '13 + kw2582 + '13 kw2099 '5 + kw2201 + '20 kw2226 '6 + kw2535 + '17 + kw3163 + '9 kw2600 - '23)) + '23 + kw2333 + '14 + kw2626 + '8 + kw2603 + '1 + kw2931 + '15 + kw2802 + '12 + kw2525 + '10 + kw2967 + '12 + kw2677 + '26 + kw2804 + '24 + kw2762 + '27 + kw2473 + '14 + kw1932 + '2 + kw2496 + '7 + kw2169 + '21 + kw2707 + '22 + kw2241 + '18 + kw2645 + '19 + kw3357 + '14 + kw2796 + '13 + kw2897 + '28)) (define kw2162 (string->keyword "not-recorded")) (define hash2430 (hasheq - 'values - '3 - 'begin - '5 - 'void - '4 - 'make-struct-type - '8 - 'let-values - '2 - 'if - '13 - 'quote - '1 - 'make-parameter - '7 'letrec-values '2 - 'make-struct-field-mutator - '10 - 'begin0 - '6 '|#%variable-reference| '1 - 'lambda + 'if + '13 + 'let-values + '2 + 'make-struct-type + '8 + 'make-struct-type-property + '11 + 'quote '1 'case-lambda '1 - 'make-struct-type-property - '11 + 'make-parameter + '7 'gensym '12 + 'begin0 + '6 'make-struct-field-accessor - '9)) + '9 + 'make-struct-field-mutator + '10 + 'lambda + '1 + 'begin + '5 + 'values + '3 + 'void + '4)) (define kw2208 (string->keyword "cross-phase-persistent")) (define kw2910 (string->keyword "empty-namespace")) (define hash3012 (hash - '|prim-#%stratified| + '|prim-#%datum| + '1 + 'lift-loop + '1 + 'module-lift-end-loop + '1 + 'exit-local + '1 + 'prim-case-lambda + '1 + 'enter-bind + '0 + 'tag + '1 + 'prim-letrec-values + '1 + 'module-end-lifts + '1 + 'exit-case + '1 + 'prim-begin0 + '1 + 'splice + '1 + 'rename-one + '1 + 'start + '0 + 'enter-block + '1 + 'block->letrec + '3 + 'prim-provide + '1 + 'exit-prim + '1 + 'exit-begin-for-syntax + '0 + 'next-group + '0 + 'module-lift-loop + '1 + '|prim-#%top| '1 'lambda-renames '2 + 'block->list + '0 + 'visit + '1 + 'local-bind + '1 + 'prim-stop + '1 + 'prim-letrec-syntaxes+values + '1 + 'prim-if + '1 + '|prim-#%expression| + '1 + 'lift-module + '2 + 'local-pre + '1 + 'phase-up + '0 + 'prim-begin-for-syntax + '1 + 'enter-begin-for-syntax + '0 + 'prim-submodule* + '1 + 'tag/context + '1 'letX-renames '5 + 'prepare-env + '0 + 'letlift-loop + '1 + 'lift-provide + '1 + 'prim-let-values + '1 + 'prim-define-syntaxes + '1 + '|prim-#%app| + '1 + 'enter-list + '1 + 'prim-set! + '1 + 'rename-transformer + '1 + 'prim-begin + '1 + 'exit-macro + '2 + 'module-pass2-lifts + '3 + 'rename-list + '1 + 'enter-macro + '2 + 'tag2 + '2 + 'prim-require + '1 + 'enter-prim + '1 + 'local-post + '1 + 'lift-require + '3 + 'exit-prim/return + '1 + 'exit-list + '1 'variable '2 'macro-post-x '2 - 'splice + 'finish-block + '1 + '|prim-#%stratified| '1 'exit-local-bind '0 - 'enter-begin-for-syntax - '0 - 'prim-submodule + 'enter-local '1 - 'prim-letrec-values + 'macro-pre-x '1 - 'enter-macro - '2 'opaque-expr '1 - 'prim-set! - '1 - 'prim-if - '1 - 'prim-define-values - '1 - 'block->letrec - '3 - 'tag/context - '1 - 'prim-letrec-syntaxes+values - '1 - 'enter-prim - '1 - 'prim-define-syntaxes - '1 - 'start - '0 - 'prim-begin0 - '1 - 'lift-loop - '1 - 'phase-up - '0 - 'local-post - '1 - 'prim-require - '1 - 'prim-with-continuation-mark - '1 - 'prim-stop - '1 - 'start-top - '0 - 'enter-block - '1 - 'prim-module-begin - '1 - '|prim-#%datum| - '1 - 'enter-list - '1 - 'lift-end-decl - '3 - 'prim-declare - '1 - 'enter-bind - '0 - 'return - '1 - 'rename-list - '1 - 'next-group - '0 - 'prim-quote-syntax - '1 - 'lift-expr - '3 - 'exit-prim - '1 - 'module-lift-loop - '1 - 'rename-transformer - '1 - 'exit-bind - '0 - 'module-body - '1 - 'module-end-lifts - '1 - '|prim-#%app| - '1 - 'module-pass1-case - '1 'prim-lambda '1 - 'exit-list - '1 - 'block-renames - '2 - 'prim-quote - '1 - 'block->list - '0 - 'macro-pre-x - '1 - 'module-pass2-lifts - '3 - 'prim-begin-for-syntax - '1 - 'stop/return - '1 - 'tag - '1 - 'local-bind - '1 - 'exit-prim/return - '1 - 'exit-case - '1 - 'enter-local - '1 - 'local-pre - '1 - '|prim-#%top| - '1 - 'lift-require - '3 - 'track-syntax - '3 - 'exit-macro - '2 - 'prim-submodule* - '1 - 'lift-module - '2 - 'lift-provide - '1 - 'prim-begin - '1 - 'finish-block - '1 - 'local-value-result - '1 - 'module-lift-end-loop - '1 - 'letlift-loop - '1 - 'exit-local - '1 - 'prim-provide - '1 - 'prim-module - '1 - 'tag2 - '2 - '|prim-#%expression| - '1 - 'next - '0 - 'exit-begin-for-syntax - '0 - 'local-value + 'prim-quote-syntax '1 '|prim-#%variable-reference| '1 - 'rename-one - '1 - 'prepare-env + 'next '0 - 'prim-case-lambda + 'return '1 - 'visit + 'prim-submodule '1 - 'prim-let-values + 'module-pass1-case + '1 + 'module-body + '1 + 'start-top + '0 + 'exit-bind + '0 + 'lift-end-decl + '3 + 'track-syntax + '3 + 'block-renames + '2 + 'prim-module-begin + '1 + 'prim-quote + '1 + 'prim-with-continuation-mark '1 'module-pass1-lifts '3 + 'local-value-result + '1 + 'lift-expr + '3 + 'prim-declare + '1 + 'prim-module + '1 + 'local-value + '1 'resolve + '1 + 'prim-define-values + '1 + 'stop/return '1)) (define kw2836 (string->keyword "missing")) (define nhash2607 (cons #f (hasheq))) @@ -425,32 +425,32 @@ (define kw2186 (string->keyword "local")) (define hash2294 (hasheq - 'rename - '5 - 'all-from-except - '8 - 'for-meta - '1 - 'all-defined-except - '10 + 'protect + '4 'for-syntax '2 'all-from '7 - 'prefix-all-defined - '11 - 'protect - '4 - 'prefix-all-defined-except - '12 + 'all-from-except + '8 'struct '6 - 'all-defined - '9 'expand '13 + 'prefix-all-defined-except + '12 + 'all-defined-except + '10 + 'prefix-all-defined + '11 + 'for-meta + '1 'for-label - '3)) + '3 + 'rename + '5 + 'all-defined + '9)) (define kws2094 (cons (string->keyword "cross-phase-persistent") diff --git a/racket/src/cs/schemified/io.scm b/racket/src/cs/schemified/io.scm index 55ac428980..81ed06eb0d 100644 --- a/racket/src/cs/schemified/io.scm +++ b/racket/src/cs/schemified/io.scm @@ -360,91 +360,91 @@ (define hash2725 (hash)) (define hash2337 (hasheq - 'host-config-dir - '5 - 'init-file - '17 - 'collects-dir - '4 - 'run-file - '2 - 'desk-dir - '14 'orig-dir '7 - 'sys-dir - '9 - 'addon-dir - '12 + 'home-dir + '13 + 'host-config-dir + '5 'host-collects-dir '6 'config-dir '3 - 'temp-dir - '8 - 'home-dir - '13 + 'init-file + '17 + 'collects-dir + '4 'exec-file '1 - 'doc-dir - '15 - 'pref-dir - '10 + 'temp-dir + '8 + 'init-dir + '16 'pref-file '11 - 'init-dir - '16)) + 'desk-dir + '14 + 'sys-dir + '9 + 'addon-dir + '12 + 'run-file + '2 + 'pref-dir + '10 + 'doc-dir + '15)) (define hash2610 (hasheq)) (define hash3229 (hasheq - 'SW_MINIMIZE - '3 - 'SW_SHOW - '5 - 'SW_SHOWNORMAL - '12 - 'sw_showminimized - '8 - 'SW_SHOWMAXIMIZED - '7 - 'SW_SHOWMINNOACTIVE - '9 - 'sw_showdefault - '6 + 'sw_maximize + '2 'SW_RESTORE '4 - 'SW_MAXIMIZE - '2 - 'sw_showmaximized - '7 - 'SW_SHOWNA - '10 'SW_SHOWDEFAULT '6 + 'SW_MINIMIZE + '3 + 'sw_showna + '10 + 'sw_showmaximized + '7 + 'sw_minimize + '3 + 'sw_showdefault + '6 + 'SW_SHOWMINNOACTIVE + '9 + 'sw_showminimized + '8 + 'SW_SHOWNOACTIVATE + '11 + 'SW_SHOWNA + '10 + 'SW_SHOWNORMAL + '12 + 'SW_SHOWMAXIMIZED + '7 + 'sw_show + '5 + 'SW_MAXIMIZE + '2 + 'SW_HIDE + '1 + 'SW_SHOWMINIMIZED + '8 'sw_shownoactivate '11 'sw_restore '4 + 'sw_hide + '1 'sw_showminnoactive '9 - 'sw_showna - '10 - 'SW_SHOWNOACTIVATE - '11 - 'sw_maximize - '2 - 'sw_show - '5 - 'SW_SHOWMINIMIZED - '8 - 'SW_HIDE - '1 'sw_shownormal '12 - 'sw_minimize - '3 - 'sw_hide - '1)) + 'SW_SHOW + '5)) (define call/ec call-with-escape-continuation) (define bad-list$1 (|#%name| diff --git a/racket/src/cs/schemified/regexp.scm b/racket/src/cs/schemified/regexp.scm index f698e7f2db..76692fd742 100644 --- a/racket/src/cs/schemified/regexp.scm +++ b/racket/src/cs/schemified/regexp.scm @@ -26,112 +26,112 @@ (1/regexp? regexp?))) (define hash1688 (hash - '#vu8(108 111 119 101 114) - '3 - '#vu8(119 111 114 100) - '7 - '#vu8(97 108 110 117 109) - '6 - '#vu8(112 114 105 110 116) - '10 '#vu8(97 115 99 105 105) '12 '#vu8(115 112 97 99 101) '9 - '#vu8(117 112 112 101 114) - '2 + '#vu8(97 108 110 117 109) + '6 + '#vu8(119 111 114 100) + '7 '#vu8(103 114 97 112 104) '10 - '#vu8(100 105 103 105 116) - '4 - '#vu8(98 108 97 110 107) - '8 '#vu8(97 108 112 104 97) '1 + '#vu8(112 114 105 110 116) + '10 '#vu8(99 110 116 114 108) '11 + '#vu8(98 108 97 110 107) + '8 + '#vu8(100 105 103 105 116) + '4 + '#vu8(108 111 119 101 114) + '3 '#vu8(120 100 105 103 105 116) - '5)) + '5 + '#vu8(117 112 112 101 114) + '2)) (define hash2956 (hash - '#vu8(78) - '11 - '#vu8(76) - '7 - '#vu8(80) - '19 - '#vu8(67) - '38 - '#vu8(46) - '39 - '#vu8(67 111) - '37 - '#vu8(76 117) - '2 - '#vu8(80 115) - '12 - '#vu8(77 110) - '20 - '#vu8(90 108) - '29 - '#vu8(67 115) - '35 - '#vu8(80 111) - '18 - '#vu8(76 111) - '6 - '#vu8(90 112) - '30 - '#vu8(76 109) - '4 - '#vu8(80 105) - '14 - '#vu8(78 111) - '10 - '#vu8(80 100) - '17 - '#vu8(83 99) - '24 - '#vu8(67 102) - '34 - '#vu8(78 100) - '8 '#vu8(77 101) '22 - '#vu8(76 38) - '5 - '#vu8(77 99) - '21 - '#vu8(80 102) - '15 - '#vu8(90) - '32 - '#vu8(83) - '28 - '#vu8(77) - '23 - '#vu8(76 116) - '3 - '#vu8(78 108) - '9 - '#vu8(83 111) - '27 + '#vu8(76 117) + '2 + '#vu8(78 111) + '10 + '#vu8(76 111) + '6 '#vu8(76 108) '1 - '#vu8(90 115) - '31 - '#vu8(83 109) - '26 - '#vu8(67 110) - '36 - '#vu8(83 107) - '25 - '#vu8(80 99) - '16 + '#vu8(77 110) + '20 + '#vu8(78 108) + '9 + '#vu8(76 38) + '5 + '#vu8(76 116) + '3 + '#vu8(77 99) + '21 + '#vu8(78 100) + '8 + '#vu8(76 109) + '4 '#vu8(67 99) '33 + '#vu8(67 115) + '35 + '#vu8(67 102) + '34 + '#vu8(67 111) + '37 + '#vu8(67 110) + '36 + '#vu8(67) + '38 + '#vu8(83) + '28 + '#vu8(46) + '39 + '#vu8(78) + '11 + '#vu8(80) + '19 + '#vu8(90) + '32 + '#vu8(76) + '7 + '#vu8(77) + '23 + '#vu8(90 112) + '30 + '#vu8(90 108) + '29 + '#vu8(90 115) + '31 + '#vu8(80 115) + '12 + '#vu8(83 99) + '24 + '#vu8(80 99) + '16 + '#vu8(80 111) + '18 + '#vu8(83 111) + '27 + '#vu8(80 105) + '14 + '#vu8(83 109) + '26 + '#vu8(80 102) + '15 + '#vu8(80 100) + '17 '#vu8(80 101) - '13)) + '13 + '#vu8(83 107) + '25)) (define hash2589 (hasheqv)) (define-values (prop:keyword-impersonator keyword-impersonator? keyword-impersonator-ref) diff --git a/racket/src/worksp/build-at.bat b/racket/src/worksp/build-at.bat index 72b418a9ca..4c46087f6c 100644 --- a/racket/src/worksp/build-at.bat +++ b/racket/src/worksp/build-at.bat @@ -1,7 +1,10 @@ cd %1 set BUILD_CONFIG=%2 set BUILD_LEVEL=%3 -set BC_SUFFIX=%4 +set UNDERSCORE_BC_SUFFIX=%4 + +if "%UNDERSCORE_BC_SUFFIX%"=="_bc" set BC_SUFFIX=BC +if "%UNDERSCORE_BC_SUFFIX%"=="_" set BC_SUFFIX= set PLT_SETUP_OPTIONS=--no-foreign-libs :suloop diff --git a/racket/src/worksp/build.bat b/racket/src/worksp/build.bat index c8084dab0b..b7df5fab57 100644 --- a/racket/src/worksp/build.bat +++ b/racket/src/worksp/build.bat @@ -12,7 +12,7 @@ cl genvsx.c genvsx.exe if errorlevel 1 (set PLTSLNVER=X) -echo #define COMPILED_PATH_AS%BC_SUFFIX% > bc_suffix_new.h +echo #define COMPILED_PATH_AS_%BC_SUFFIX% > bc_suffix_new.h fc bc_suffix.h bc_suffix_new.h if errorlevel 1 (copy bc_suffix_new.h bc_suffix.h) del bc_suffix_new.h @@ -46,8 +46,11 @@ cd .. REM Assumes that Racket is started in a subdirectory of here: set BOOT_SETUP=-W "info@compiler/cm error" -l- setup --boot ../../setup-go.rkt ../compiled +REM Set after BC_SUFFIX is used to determine the "compiled" subdirectory +if "%BUILD_LEVEL%"=="bc" set BC_SUFFIX=BC + cd gc2 -..\..\..\racketcgc -G ..\%BUILD_CONFIG% %BOOT_SETUP% make.none ../compiled/make.dep make.rkt --build-level %BUILD_LEVEL% +..\..\..\racketcgc -G ..\%BUILD_CONFIG% %BOOT_SETUP% make.none ../compiled/make.dep make.rkt --suffix "%BC_SUFFIX%" if errorlevel 1 exit /B 1 cd .. @@ -68,7 +71,7 @@ if errorlevel 1 exit /B 1 cd .. cd mzcom -..\..\..\racket -G ..\%BUILD_CONFIG% %BOOT_SETUP% mzcom.none ../compiled/mzcom.dep xform.rkt +..\..\..\racket%BC_SUFFIX% -G ..\%BUILD_CONFIG% %BOOT_SETUP% mzcom.none ../compiled/mzcom.dep xform.rkt if errorlevel 1 exit /B 1 cd .. @@ -89,10 +92,10 @@ copy ..\LICENSE-GPL.txt ..\..\share\ if errorlevel 1 exit /B 1 set PLT_REPLACE_INDEPENDENT_LAUNCHERS=yes -..\..\racket -G %BUILD_CONFIG% -N "raco" %SELF_RACKET_FLAGS% -l- setup %PLT_SETUP_OPTIONS% +..\..\racket%BC_SUFFIX% -G %BUILD_CONFIG% -N "raco" %SELF_RACKET_FLAGS% -l- setup %PLT_SETUP_OPTIONS% if errorlevel 1 exit /B 1 -..\..\racket -G ..\%BUILD_CONFIG% -u gendef.rkt +..\..\racket%BC_SUFFIX% -G ..\%BUILD_CONFIG% -u gendef.rkt if errorlevel 1 exit /B 1 :doneBuilding diff --git a/racket/src/worksp/gc2/make.rkt b/racket/src/worksp/gc2/make.rkt index 66df113411..ebb9f7e163 100644 --- a/racket/src/worksp/gc2/make.rkt +++ b/racket/src/worksp/gc2/make.rkt @@ -3,15 +3,12 @@ racket/cmdline (for-label "../../bc/gc2/xform-mod.rkt")) -(define suffix "") +(define bc-suffix "") (command-line #:once-each - [("--build-level") level "Specify a suffix-determining build level" - (unless (equal? level "all") - (set! suffix (if (equal? level "bc") - "BC" - level)))] + [("--suffix") suffix "Specify an executable suffix" + (set! bc-suffix suffix)] #:args () (void)) @@ -236,6 +233,8 @@ (try "../../bc/main.c" (list* "../../bc/main.c" + "../bc_suffix.h" + "../mzconfig.h" common-deps) "xsrc/main.c" "xsrc/main.obj" @@ -289,7 +288,7 @@ (c-compile "../../bc/src/mzsj86.c" "xsrc/mzsj86.obj" '() mz-inc) (define dll "../../../lib/libracket3mxxxxxxx.dll") -(define exe (format "../../../Racket~a.exe" suffix)) +(define exe (format "../../../Racket~a.exe" bc-suffix)) (define libs "kernel32.lib user32.lib ws2_32.lib shell32.lib advapi32.lib winmm.lib") @@ -408,7 +407,7 @@ (check-rc "gracket.res" "../gracket/gracket.rc" "../gracket/gracket.ico") -(define gui-exe (format "../../../lib/GRacket~a.exe" suffix)) +(define gui-exe (format "../../../lib/GRacket~a.exe" bc-suffix)) (link-exe (list "gracket.res" @@ -436,6 +435,6 @@ (copy-file/diff "mzdyn3m.exp" "../../../lib/msvc/mzdyn3m.exp") (copy-file/diff "mzdyn3m.obj" "../../../lib/msvc/mzdyn3m.obj") -(when (equal? suffix "") +(when (equal? bc-suffix "") (parameterize ([current-command-line-arguments (vector "../../../lib/system.rktd")]) (dynamic-require "../../bc/mksystem.rkt" #f)))