move "racket/src/racket" -> "racket/src/bc"

Also, move "racket/src/gracket" and "racket/src/foreign" to
subdirectories of "racket/src/bc".

.makefile

@@ -266,12 +266,12 @@ bc-base:
 	if [ "$(RACKETBC_SUFFIX)" = "" ] ; \
 	  then $(MAKE) bc-configure MORE_CONFIGURE_ARGS="$(MORE_CONFIGURE_ARGS) --enable-bcdefault" ; \
 	  else $(MAKE) bc-configure MORE_CONFIGURE_ARGS="$(MORE_CONFIGURE_ARGS) --disable-bcdefault" ; fi
-	cd racket/src/build && $(MAKE) bc $(SELF_FLAGS_qq)
+	cd racket/src/build && $(MAKE) racketbc $(SELF_FLAGS_qq)
 	cd racket/src/build && $(MAKE) install-bc $(INSTALL_SETUP_ARGS)
 
 win-bc-base:
 	$(MAKE) win-remove-setup-dlls
-	cmd /c racket\src\worksp\build-at racket\src\worksp ..\..\..\build\config $(WIN32_BUILD_LEVEL) $(JOB_OPTIONS) _$(RACKETBC_SUFFIX) $(PLT_SETUP_OPTIONS)
+	cmd /c racket\src\worksp\build-at racket\src\worksp ..\..\..\build\config $(WIN32_BUILD_LEVEL) _$(RACKETBC_SUFFIX) $(JOB_OPTIONS) $(PLT_SETUP_OPTIONS)
 
 # Start by removing DLLs that may be loaded by `raco setup`
 win-remove-setup-dlls:
@@ -285,10 +285,10 @@ CONFIG_IN_PLACE_ARGS = --disable-useprefix --enable-origtree
 BC_CONFIGURE_ARGS == $(CONFIGURE_ARGS) $(MORE_CONFIGURE_ARGS) $(CONFIG_IN_PLACE_ARGS)
 
 bc-configure:
-	$(MAKE) racket/src/build/racket/Makefile
+	$(MAKE) racket/src/build/bc/Makefile
 	cd racket/src/build && $(MAKE) reconfigure MORE_CONFIGURE_ARGS="$(BC_CONFIGURE_ARGS)"
 
-racket/src/build/racket/Makefile: racket/src/configure racket/src/Makefile.in
+racket/src/build/bc/Makefile: racket/src/configure racket/src/Makefile.in
 	mkdir -p racket/src/build
 	cd racket/src/build && ../configure --enable-bc $(CONFIGURE_ARGS_qq) $(BC_CONFIGURE_ARGS)
 

Makefile

@@ -222,11 +222,11 @@ win-bc-in-place-setup:
 	$(MAKE) plain-in-place-setup PLAIN_RACKET=racket\racket$(RACKETBC_SUFFIX) IN_PLACE_SETUP_OPTIONS="$(IN_PLACE_SETUP_OPTIONS)" JOB_OPTIONS="$(JOB_OPTIONS)" PLT_SETUP_OPTIONS="$(PLT_SETUP_OPTIONS)" SETUP_MACHINE_FLAGS="$(SETUP_MACHINE_FLAGS)"
 bc-base:
 	if [ "$(RACKETBC_SUFFIX)" = "" ] ; 	  then $(MAKE) bc-configure MORE_CONFIGURE_ARGS="$(MORE_CONFIGURE_ARGS) --enable-bcdefault" CONFIGURE_ARGS="$(CONFIGURE_ARGS)" CONFIG_IN_PLACE_ARGS="$(CONFIG_IN_PLACE_ARGS)" ; 	  else $(MAKE) bc-configure MORE_CONFIGURE_ARGS="$(MORE_CONFIGURE_ARGS) --disable-bcdefault" CONFIGURE_ARGS="$(CONFIGURE_ARGS)" CONFIG_IN_PLACE_ARGS="$(CONFIG_IN_PLACE_ARGS)" ; fi
-	cd racket/src/build && $(MAKE) bc  SELF_ROOT_CONFIG_FLAG="$(SELF_ROOT_CONFIG_FLAG)"
+	cd racket/src/build && $(MAKE) racketbc  SELF_ROOT_CONFIG_FLAG="$(SELF_ROOT_CONFIG_FLAG)"
 	cd racket/src/build && $(MAKE) install-bc   SELF_ROOT_CONFIG_FLAG="$(SELF_ROOT_CONFIG_FLAG)"  PLT_SETUP_OPTIONS="$(JOB_OPTIONS) $(PLT_SETUP_OPTIONS)" SETUP_MACHINE_FLAGS="$(SETUP_MACHINE_FLAGS)"
 win-bc-base:
 	$(MAKE) win-remove-setup-dlls
-	cmd /c racket\src\worksp\build-at racket\src\worksp ..\..\..\build\config $(WIN32_BUILD_LEVEL) $(JOB_OPTIONS) _$(RACKETBC_SUFFIX) $(PLT_SETUP_OPTIONS)
+	cmd /c racket\src\worksp\build-at racket\src\worksp ..\..\..\build\config $(WIN32_BUILD_LEVEL) _$(RACKETBC_SUFFIX) $(JOB_OPTIONS) $(PLT_SETUP_OPTIONS)
 win-remove-setup-dlls:
 	IF EXIST racket\lib\longdouble.dll cmd /c del racket\lib\longdouble.dll
 	IF EXIST racket\lib\libiconv-2.dll cmd /c del racket\lib\libiconv-2.dll
@@ -234,9 +234,9 @@ win-remove-setup-dlls:
 	IF EXIST racket\lib\libeay32.dll cmd /c del racket\lib\libeay32.dll
 	IF EXIST racket\lib\ssleay32.dll cmd /c del racket\lib\ssleay32.dll
 bc-configure:
-	$(MAKE) racket/src/build/racket/Makefile CONFIGURE_ARGS="$(CONFIGURE_ARGS)" CONFIG_IN_PLACE_ARGS="$(CONFIG_IN_PLACE_ARGS)" MORE_CONFIGURE_ARGS="$(MORE_CONFIGURE_ARGS)"
+	$(MAKE) racket/src/build/bc/Makefile CONFIGURE_ARGS="$(CONFIGURE_ARGS)" CONFIG_IN_PLACE_ARGS="$(CONFIG_IN_PLACE_ARGS)" MORE_CONFIGURE_ARGS="$(MORE_CONFIGURE_ARGS)"
 	cd racket/src/build && $(MAKE) reconfigure MORE_CONFIGURE_ARGS=" $(CONFIGURE_ARGS) $(MORE_CONFIGURE_ARGS) $(CONFIG_IN_PLACE_ARGS)"
-racket/src/build/racket/Makefile: racket/src/configure racket/src/Makefile.in
+racket/src/build/bc/Makefile: racket/src/configure racket/src/Makefile.in
 	mkdir -p racket/src/build
 	cd racket/src/build && ../configure --enable-bc $(CONFIGURE_ARGS_qq)  $(CONFIGURE_ARGS) $(MORE_CONFIGURE_ARGS) $(CONFIG_IN_PLACE_ARGS)
 native-for-cross:
@@ -283,7 +283,7 @@ cs-base:
 cs-configure:
 	$(MAKE) racket/src/build/cs/c/Makefile CONFIGURE_ARGS="$(CONFIGURE_ARGS)" CONFIG_IN_PLACE_ARGS="$(CONFIG_IN_PLACE_ARGS)" MORE_CONFIGURE_ARGS="$(MORE_CONFIGURE_ARGS)"
 	cd racket/src/build/cs/c && $(MAKE) reconfigure MORE_CONFIGURE_ARGS=" $(CONFIGURE_ARGS) $(MORE_CONFIGURE_ARGS) $(CONFIG_IN_PLACE_ARGS)"
-racket/src/build/cs/c/Makefile: racket/src/cs/c/configure racket/src/cs/c/Makefile.in racket/src/cfg-cs
+racket/src/build/cs/c/Makefile: racket/src/cs/c/configure racket/src/cs/c/Makefile.in racket/src/cfg-cs racket/src/Makefile.in 
 	mkdir -p racket/src/build/cs/c
 	cd racket/src/build/cs/c && ../../../cs/c/configure $(CONFIGURE_ARGS_qq)  $(CONFIGURE_ARGS) $(MORE_CONFIGURE_ARGS) $(CONFIG_IN_PLACE_ARGS)
 	cd racket/src/build && ../cfg-cs $(CONFIGURE_ARGS_qq)  $(CONFIGURE_ARGS) $(MORE_CONFIGURE_ARGS) $(CONFIG_IN_PLACE_ARGS)

racket/collects/version/utils.rkt

@@ -3,7 +3,7 @@
 
 (define rx:version
   ;; (this restricts the last component to be below 999 too, which is
-  ;; not really proper according to the spec in schvers.h)
+  ;; not really proper according to the spec in "racket_version.h")
   (pregexp (string-append "^(0|[1-9][0-9]*)[.]"
                           "(0|(0|[1-9][0-9]{0,1})([.](0|[1-9][0-9]{0,2})){0,2}"
                           "(?<![.]0))$")))

racket/src/Makefile.in

@@ -28,9 +28,9 @@ ICP = @ICP@
 # but it can also redirect to an existing Racket executable
 # that is the same as the version being built (which is
 # useful for cross-compilation, for example).
-RUN_THIS_RACKET_CGC = racket/racket@CGC@
-RUN_THIS_RACKET_MMM = racket/racket@MMM@
-RUN_THIS_RACKET_MAIN_VARIANT = racket/racket@MAIN_VARIANT@
+RUN_THIS_RACKET_CGC = bc/racket@CGC@
+RUN_THIS_RACKET_MMM = bc/racket@MMM@
+RUN_THIS_RACKET_MAIN_VARIANT = bc/racket@MAIN_VARIANT@
 
 ALLDIRINFO = "$(DESTDIR)$(bindir)" \
              "$(DESTDIR)$(collectsdir)" \
@@ -52,30 +52,35 @@ COPYING = "$(srcdir)/LICENSE-libscheme.txt" \
 all:
 	$(MAKE) @MAIN_MAKE_TARGET@
 
-bc:
+racketbc:
 	$(MAKE) @MAIN_VARIANT@
 
+.PHONY: bc
+bc:
+	$(MAKE) racketbc
+
 TAGS:
 	etags `find "@srcdir@/racket" -type f`
 
 3m:
 	$(MAKE) @MAKE_LOCAL_RACKET@
-	cd racket; $(MAKE) 3m
+	cd bc && $(MAKE) 3m
 	$(MAKE) @MAKE_GRACKET@-3m
 
 gracket-3m:
-	cd gracket; $(MAKE) 3m
+	cd bc/gracket && $(MAKE) 3m
 
 no-3m:
 	$(NOOP)
 
+.PHONY: cgc
 cgc:
 	$(MAKE) @MAKE_LOCAL_RACKET@
-	cd racket; $(MAKE) cgc
+	cd bc && $(MAKE) cgc
 	$(MAKE) @MAKE_GRACKET@-cgc
 
 gracket-cgc:
-	cd gracket; $(MAKE) cgc
+	cd bc/gracket && $(MAKE) cgc
 
 no-cgc:
 	$(NOOP)
@@ -87,7 +92,7 @@ both:
 racketcs:
 	if [ ! -f cs/c/Makefile ]; then $(MAKE) cs-explain-configure; fi
 	$(MAKE) @CS_BOOTSTRAP_HELP@
-	cd cs/c; $(MAKE)
+	cd cs/c && $(MAKE)
 
 .PHONY: cs
 cs:
@@ -102,13 +107,13 @@ cs-explain-configure:
 no-local-racket:
 	$(NOOP)
 
-local/racket/racket3m:
+local/bc/racket3m:
 	mkdir -p local
 	$(MAKE) local/Makefile
-	cd local ; $(MAKE)
+	cd local  && $(MAKE)
 
 local/Makefile:
-	cd local ; `cd ..; cd $(srcdir); pwd`/configure --disable-gracket
+	cd local  && `cd ..; cd $(srcdir); pwd`/configure --disable-gracket
 
 # Install (common) ----------------------------------------
 
@@ -182,7 +187,7 @@ preserve-raco-pkg-default-scope:
 	$(NOOP)
 
 install-gracket-post-collects:
-	cd gracket; $(MAKE) install-post-collects
+	cd bc/gracket && $(MAKE) install-post-collects
 
 install-no-post-collects:
 	$(NOOP)
@@ -201,7 +206,7 @@ fix-paths:
 
 install-3m-common:
 	$(MAKE) install-common-first
-	cd racket; $(MAKE) install-3m
+	cd bc && $(MAKE) install-3m
 	$(MAKE) install-@MAKE_GRACKET@-3m
 	$(MAKE) install-common-middle
 
@@ -218,13 +223,13 @@ install-no-3m:
 	$(NOOP)
 
 install-gracket-3m:
-	cd gracket; $(MAKE) install-3m
+	cd bc/gracket && $(MAKE) install-3m
 
 # CGC install ----------------------------------------
 
 install-cgc-common:
 	$(MAKE) install-common-first
-	cd racket; $(MAKE) install-cgc
+	cd bc && $(MAKE) install-cgc
 	$(MAKE) install-@MAKE_GRACKET@-cgc
 	$(MAKE) install-common-middle
 
@@ -241,13 +246,13 @@ install-no-cgc:
 	$(NOOP)
 
 install-gracket-cgc:
-	cd gracket; $(MAKE) install-cgc
+	cd bc/gracket && $(MAKE) install-cgc
 
 # Both install ----------------------------------------
 
 install-both-common:
 	$(MAKE) install-common-first
-	cd racket; $(MAKE) install-both
+	cd bc && $(MAKE) install-both
 	$(MAKE) install-@MAKE_GRACKET@-both
 	$(MAKE) install-common-middle
 
@@ -264,7 +269,7 @@ install-no-both:
 	$(NOOP)
 
 install-gracket-both:
-	cd gracket; $(MAKE) install-both
+	cd bc/gracket && $(MAKE) install-both
 
 # CS install ----------------------------------------
 
@@ -272,9 +277,9 @@ CS_SETUP_INSTALL_TARGET = setup-install
 
 install-cs-common:
 	$(MAKE) install-common-first
-	cd cs/c; $(MAKE) plain-install
+	cd cs/c && $(MAKE) plain-install
 	$(MAKE) install-common-middle MIDDLE_POST_COLLECTS=install-no-post-collects
-	cd cs/c; $(MAKE) $(CS_SETUP_INSTALL_TARGET) $(PROPAGATE_VARIABLES)
+	cd cs/c && $(MAKE) $(CS_SETUP_INSTALL_TARGET) $(PROPAGATE_VARIABLES)
 	$(MAKE) install-common-last
 
 install-racketcs:
@@ -301,17 +306,17 @@ install-pdf:
 # Clean ----------------------------------------
 
 clean:
-	cd racket; $(MAKE) clean
-	if [ -d gracket ]; then cd gracket; $(MAKE) clean; fi
+	cd bc && $(MAKE) clean
+	if [ -d bc/gracket ]; then cd bc/gracket; $(MAKE) clean; fi
 	rm -rf compiled
 	rm -f TAGS
 
 # Reconfigure ----------------------------------------
 
-SRC_MAKEFILES = $(srcdir)/Makefile.in $(srcdir)/racket/Makefile.in \
-                $(srcdir)/racket/src/Makefile.in $(srcdir)/gracket/Makefile.in \
-                $(srcdir)/racket/gc2/Makefile.in $(srcdir)/gracket/gc2/Makefile.in \
-                $(srcdir)/rktio/Makefile.in $(srcdir)/racket/dynsrc/Makefile.in
+SRC_MAKEFILES = $(srcdir)/Makefile.in $(srcdir)/bc/Makefile.in \
+                $(srcdir)/bc/src/Makefile.in $(srcdir)/bc/gracket/Makefile.in \
+                $(srcdir)/bc/gc2/Makefile.in $(srcdir)/bc/gracket/gc2/Makefile.in \
+                $(srcdir)/rktio/Makefile.in $(srcdir)/bc/dynsrc/Makefile.in
 
 # Only fire the `Makefile` rule explicitly via `reconfigure`
 NO_RECONFIG =

racket/src/README.txt

@@ -44,7 +44,7 @@ To build Racket BC on Windows, see See "worksp\README.txt" for
 information.
 
 If you need more information specific to Racket BC, see
-"racket/README.txt".
+"bc/README.txt".
 
 Racket CS
 ---------
@@ -317,7 +317,7 @@ but note the following:
 ========================================================================
 
 To compile with Microsoft Visual C, see the instructions in
-"racket\src\worksp\README.txt".
+"worksp\README.txt".
 
 To compile with MinGW tools, follow the Unix instructions above; do
 not use `--enable-shared`, because DLLs will be generated
@@ -443,23 +443,22 @@ minimal Racket distribution.
 Sources for the Racket BC implementation
 -------------------------------------------------
 
- * "racket" --- `racket` BC executable
+ * "bc" --- `racket` BC executable
 
    This implementation can build from "scratch" with a C compiler, but
    first by building a CGC variant of Racket to transform the C
    sourses to build a (normal) 3m variant.
 
- * "gracket" --- `gracket` executable
-
- * "foreign" --- FFI implementation for "racket"
-
-   This directory includes a copy of "libffi" (as needed for some
-   platforms).
-
  * "mzcom" --- MzCOM executable (for Windows)
 
  * "mysink" --- `ffi/unsafe/com` helper DLL (for Windows)
 
+ * "cify" --- a Racket-to-C compiler
+
+   This compiler is used only when embedding the expander as C code in
+   Racket BC, instead of Racket bytecode, which is the default for
+   platforms where the Racket BC JIT is not supported.
+
 See also the shared sources below, which includes rktio and the macro
 expander.
 
@@ -507,12 +506,6 @@ Sources shared by both Racket implementations
    libraries for inclusion in "cs". If you change it, be sure to run
    `make` in "cs".
 
- * "cify" --- a Racket-to-C compiler
-
-   This compiler is used only when embedding the expander as C code in
-   Racket BC, instead of Racket bytecode, which is the default for
-   platforms where the Racket BC JIT is not supported.
-
  * "start" --- main-executable wrapper
 
    Startup wrappers used by both the Racket CS and BC implementations.

racket/src/ac/make-configure

@@ -1,7 +1,7 @@
 #!/bin/sh
 #|
 cd "`dirname \"$0\"`"
-src="../racket/configure.ac"
+src="../bc/configure.ac"
 tgt="../cfg-bc"
 if [ ! -e "$src" ]; then echo "abort: did not find $src"; exit 1; fi
 echo "Creating $tgt from $src"

racket/src/bc/Makefile.in

@@ -52,12 +52,12 @@ SETUP_BOOT = -O "info@compiler/cm" -l- setup @BOOT_MODE@ $(srcdir)/../setup-go.r
 
 MZSRC = $(srcdir)/src
 
-FOREIGN_DIR = ../foreign
+FOREIGN_DIR = foreign
 FOREIGN_OBJ = $(FOREIGN_DIR)/foreign.@LTO@
 LIBFFI_OBJ_ON = $(FOREIGN_DIR)/libffi/src/*.@LTO@ $(FOREIGN_DIR)/libffi/src/*/*.@LTO@
 LIBFFI_OBJ_OFF = 
 FOREIGN_OBJS = $(FOREIGN_OBJ) $(LIBFFI_OBJ_@OWN_LIBFFI@)
-LIBFFI_LIB_ON = ../foreign/libffi/libffi@FOREIGN_CONVENIENCE@.la
+LIBFFI_LIB_ON = foreign/libffi/libffi@FOREIGN_CONVENIENCE@.la
 LIBFFI_LIB_OFF = 
 FOREIGN_LIB = $(FOREIGN_OBJ) $(LIBFFI_LIB_@OWN_LIBFFI@)
 FOREIGN_STUB_LIB = $(FOREIGN_OBJ)
@@ -169,7 +169,7 @@ no-cgc-needed:
 	$(MAKE) mingw-other
 	cd dynsrc; $(MAKE) ../starter@EXE_SUFFIX@
 
-ALL_CPPFLAGS = -I$(builddir) -I$(srcdir)/include -I$(srcdir)/src $(CPPFLAGS) @OPTIONS@ @GC2OPTIONS@ @MZOPTIONS@ 
+ALL_CPPFLAGS = -I$(builddir) -I$(srcdir)/include -I$(srcdir)/src -I$(srcdir)/../version $(CPPFLAGS) @OPTIONS@ @GC2OPTIONS@ @MZOPTIONS@ 
 MKSYSTEM_ARGS = -cqu $(srcdir)/mksystem.rkt system.rktd "$(CPP) $(ALL_CPPFLAGS) $(srcdir)/src/systype.c" "@MMM_INSTALLED@" @CROSS_COMPILE_TARGET_KIND@
 
 sysinfer@CGC@:
@@ -282,11 +282,13 @@ MAIN_HEADER_DEPS = $(srcdir)/include/scheme.h $(srcdir)/include/schthread.h $(sr
 	           $(srcdir)/../start/config.inc $(srcdir)/../start/delayed.inc \
 	           $(srcdir)/../start/embedded_dll.inc
 
+MAIN_INCLUDES = -I$(builddir) -I$(srcdir)/include -I$(srcdir)/../version
+
 main.@LTO@: $(srcdir)/main.c $(MAIN_HEADER_DEPS)
-	$(CC) -I$(builddir) -I$(srcdir)/include $(CFLAGS) $(CPPFLAGS) @OPTIONS@ @MZOPTIONS@ $(DEF_C_DIRS) -c $(srcdir)/main.c -o main.@LTO@
+	$(CC) $(MAIN_INCLUDES) $(CFLAGS) $(CPPFLAGS) @OPTIONS@ @MZOPTIONS@ $(DEF_C_DIRS) -c $(srcdir)/main.c -o main.@LTO@
 
 main_ee.@LTO@: main.@LTO@
-	$(CC) -I$(builddir) -I$(srcdir)/include $(CFLAGS) $(CPPFLAGS) @OPTIONS@ @MZOPTIONS@ $(DEF_C_DIRS) -DSTANDALONE_WITH_EMBEDDED_EXTENSION -c $(srcdir)/main.c -o main_ee.@LTO@
+	$(CC) $(MAIN_INCLUDES) $(CFLAGS) $(CPPFLAGS) @OPTIONS@ @MZOPTIONS@ $(DEF_C_DIRS) -DSTANDALONE_WITH_EMBEDDED_EXTENSION -c $(srcdir)/main.c -o main_ee.@LTO@
 
 ee-main:
 	$(MAKE) main_ee.@LTO@
@@ -297,13 +299,13 @@ ee-app: $(RACKET) main_ee.@LTO@
 MZCOM_DEPS = $(MAIN_HEADER_DEPS) $(srcdir)/../mzcom/com_glue.h $(srcdir)/../mzcom/resource.h
 
 mzcom.@LTO@: $(srcdir)/../mzcom/mzcom.cxx $(MZCOM_DEPS)
-	$(CC) -fno-exceptions -I$(builddir) -I$(srcdir)/include $(CFLAGS) $(CPPFLAGS) @OPTIONS@ @MZOPTIONS@ $(DEF_C_DIRS) -c $(srcdir)/../mzcom/mzcom.cxx -o mzcom.@LTO@
+	$(CC) -fno-exceptions $(MAIN_INCLUDES) $(CFLAGS) $(CPPFLAGS) @OPTIONS@ @MZOPTIONS@ $(DEF_C_DIRS) -c $(srcdir)/../mzcom/mzcom.cxx -o mzcom.@LTO@
 
 mzobj.@LTO@: $(srcdir)/../mzcom/mzobj.cxx $(MZCOM_DEPS)
-	$(CC) -fno-exceptions -I$(builddir) -I$(srcdir)/include $(CFLAGS) $(CPPFLAGS) @OPTIONS@ @MZOPTIONS@ -c $(srcdir)/../mzcom/mzobj.cxx -o mzobj.@LTO@
+	$(CC) -fno-exceptions $(MAIN_INCLUDES) $(CFLAGS) $(CPPFLAGS) @OPTIONS@ @MZOPTIONS@ -c $(srcdir)/../mzcom/mzobj.cxx -o mzobj.@LTO@
 
 com_glue.@LTO@: $(srcdir)/../mzcom/com_glue.c $(MZCOM_DEPS)
-	$(CC) -I$(builddir) -I$(srcdir)/include $(CFLAGS) $(CPPFLAGS) @OPTIONS@ @MZOPTIONS@ -c $(srcdir)/../mzcom/com_glue.c -o com_glue.@LTO@
+	$(CC) $(MAIN_INCLUDES) $(CFLAGS) $(CPPFLAGS) @OPTIONS@ @MZOPTIONS@ -c $(srcdir)/../mzcom/com_glue.c -o com_glue.@LTO@
 
 exn:
 	$(RACKET) -um $(srcdir)/src/makeexn > $(srcdir)/src/schexn.h
@@ -316,11 +318,11 @@ MZCONFIGDIR@MINGW@ = "$(srcdir)/../worksp"
 
 headers:
 	@RUN_RACKET_CGC@ -cqu $(srcdir)/mkincludes.rkt @DIRCVTPRE@"$(DESTDIR)$(includepltdir)"@DIRCVTPOST@ "$(srcdir)" $(MZCONFIGDIR)
-	cd ..; cp racket/system.rktd "$(DESTDIR)$(libpltdir)/system.rktd"
+	cd ..; cp bc/system.rktd "$(DESTDIR)$(libpltdir)/system.rktd"
 
 # The `cstartup` target may update "cstartup.inc", either replacing a
 # stub "cstartup.inc" that redirects to "startup.inc" or rebuilding
-# because "startup.inc" or "schvers.h" changed; so, during a CGC
+# because "startup.inc" or "racket_version.h" changed; so, during a CGC
 # build, we try again after building this target to potentially update
 # the CGC build to a compiled-startup build. A particular `cstartup`
 # target variant is selected by the `configure` script based on whether
@@ -333,7 +335,7 @@ cstartup@STARTUP_AS_AUTO@:
 
 # For compiling the startup code to bytecode
 cstartup@STARTUP_AS_BYTECODE@:
-	@RUN_RACKET_CGC@ -cu $(srcdir)/src/compile-startup.rkt $(CSTARTUPDEST) cstartup.zo $(srcdir)/src/startup.inc $(srcdir)/src/schvers.h
+	@RUN_RACKET_CGC@ -cu $(srcdir)/src/compile-startup.rkt $(CSTARTUPDEST) cstartup.zo $(srcdir)/src/startup.inc $(srcdir)/../version/racket_version.h
 
 # For compiling the startup code to C
 cstartup@STARTUP_AS_C@:
@@ -346,8 +348,8 @@ cstartup_:
 
 # Running "cify-startup.rkt" through "$(SETUP_BOOT)" generates more
 # dependencies in "cstartup.d" for `$(CSTARTUPDEST)`
-$(CSTARTUPDEST): $(srcdir)/src/startup.inc $(srcdir)/src/schvers.h
-	@RUN_RACKET_CGC@ $(SETUP_BOOT) cstartup.inc cstartup.d $(srcdir)/src/cify-startup.rkt $(srcdir)/src/startup.inc $(srcdir)/src/schvers.h
+$(CSTARTUPDEST): $(srcdir)/src/startup.inc $(srcdir)/../version/racket_version.h
+	@RUN_RACKET_CGC@ $(SETUP_BOOT) cstartup.inc cstartup.d $(srcdir)/src/cify-startup.rkt $(srcdir)/src/startup.inc $(srcdir)/../version/racket_version.h
 @INCLUDEDEP@ cstartup.d
 
 mark:
@@ -406,9 +408,9 @@ install-both:
 unix-install:
 	cd ..; rm -f "$(DESTDIR)@MZINSTALLBINDIR@/racket@CGC_INSTALLED@"
 	cd ..; rm -f "$(DESTDIR)@MZINSTALLBINDIR@/racket@MMM_INSTALLED@"
-	cd ..; cp racket/starter@EXE_SUFFIX@ "$(DESTDIR)$(libpltdir)/starter@EXE_SUFFIX@"
+	cd ..; cp bc/starter@EXE_SUFFIX@ "$(DESTDIR)$(libpltdir)/starter@EXE_SUFFIX@"
 	cp $(srcdir)/../start/starter-sh .
-	cd ..; cp racket/starter-sh "$(DESTDIR)$(libpltdir)/starter-sh"
+	cd ..; cp bc/starter-sh "$(DESTDIR)$(libpltdir)/starter-sh"
 	cd ..; $(STRIP_DEBUG) "$(DESTDIR)$(libpltdir)/starter@EXE_SUFFIX@"
 	@RUN_RACKET_CGC@ -cu "$(srcdir)/collects-path.rkt" "$(DESTDIR)$(libpltdir)/starter@EXE_SUFFIX@" $(DESTDIR)@COLLECTS_PATH@ $(DESTDIR)@CONFIG_PATH@
 	cd ..; echo 'CC=@CC@' > "$(BUILDINFO)"
@@ -420,14 +422,14 @@ unix-install:
 
 unix-install-cgc:
 	$(MAKE) unix-@INSTALL_LIBS_ENABLE@-libs-cgc
-	cd ..; $(ICP) racket/racket@CGC@ "$(DESTDIR)$(bindir)/racket@CGC_INSTALLED@"
+	cd ..; $(ICP) bc/racket@CGC@ "$(DESTDIR)$(bindir)/racket@CGC_INSTALLED@"
 	cd ..; $(STRIP_DEBUG) "$(DESTDIR)$(bindir)/racket@CGC_INSTALLED@"
-	cd ..; cp racket/mzdyn.o "$(DESTDIR)$(libpltdir)/mzdyn.o"
+	cd ..; cp bc/mzdyn.o "$(DESTDIR)$(libpltdir)/mzdyn.o"
 	@RUN_RACKET_CGC@ -cu "$(srcdir)/collects-path.rkt" "$(DESTDIR)$(bindir)/racket@CGC_INSTALLED@@EXE_SUFFIX@" $(DESTDIR)@COLLECTS_PATH@ $(DESTDIR)@CONFIG_PATH@
 
 unix-install-libs-cgc:
-	cd ..; $(ICP_LIB) racket/libmzgc.@LIBSFX@ "$(DESTDIR)$(libdir)/libmzgc.@LIBSFX@"
-	cd ..; $(ICP_LIB) racket/libracket.@LIBSFX@ "$(DESTDIR)$(libdir)/libracket.@LIBSFX@"
+	cd ..; $(ICP_LIB) bc/libmzgc.@LIBSFX@ "$(DESTDIR)$(libdir)/libmzgc.@LIBSFX@"
+	cd ..; $(ICP_LIB) bc/libracket.@LIBSFX@ "$(DESTDIR)$(libdir)/libracket.@LIBSFX@"
 	cd ..; $(ICP_STATIC_LIB) rktio/librktio.@LIBSFX@ "$(DESTDIR)$(libdir)/librktio.@LIBSFX@"
 	cd ..; $(STRIP_LIB_DEBUG) "$(DESTDIR)$(libdir)/libmzgc.@LIBSFX@"
 	cd ..; $(STRIP_LIB_DEBUG) "$(DESTDIR)$(libdir)/libracket.@LIBSFX@"
@@ -439,14 +441,14 @@ unix-install-cgc-final:
 	$(NOOP)
 
 unix-install-3m:
-	cd ..; $(ICP) racket/racket@MMM@ "$(DESTDIR)$(bindir)/racket@MMM_INSTALLED@"
+	cd ..; $(ICP) bc/racket@MMM@ "$(DESTDIR)$(bindir)/racket@MMM_INSTALLED@"
 	cd ..; $(STRIP_DEBUG) "$(DESTDIR)$(bindir)/racket@MMM_INSTALLED@"
 	$(MAKE) unix-@INSTALL_LIBS_ENABLE@-libs-3m
-	cd ..; $(ICP) racket/mzdyn3m.o "$(DESTDIR)$(libpltdir)/mzdyn3m.o"
+	cd ..; $(ICP) bc/mzdyn3m.o "$(DESTDIR)$(libpltdir)/mzdyn3m.o"
 	@RUN_RACKET_MMM@ -cu "$(srcdir)/collects-path.rkt" "$(DESTDIR)$(bindir)/racket@MMM_INSTALLED@@EXE_SUFFIX@" $(DESTDIR)@COLLECTS_PATH@ $(DESTDIR)@CONFIG_PATH@
 
 unix-install-libs-3m:
-	cd ..; $(ICP_LIB) racket/libracket3m.@LIBSFX@ "$(DESTDIR)$(libdir)/libracket3m.@LIBSFX@"
+	cd ..; $(ICP_LIB) bc/libracket3m.@LIBSFX@ "$(DESTDIR)$(libdir)/libracket3m.@LIBSFX@"
 	cd ..; $(ICP_STATIC_LIB) rktio/librktio.@LIBSFX@ "$(DESTDIR)$(libdir)/librktio.@LIBSFX@"
 	cd ..; $(STRIP_LIB_DEBUG) "$(DESTDIR)$(libdir)/libracket3m.@LIBSFX@"
 
@@ -461,27 +463,27 @@ unix-install-3m-final:
 mingw-install:
 	cd ..; rm -f "$(DESTDIR)@MZINSTALLBINDIR@/racket@CGC_INSTALLED@"
 	cd ..; rm -f "$(DESTDIR)@MZINSTALLBINDIR@/racket@MMM_INSTALLED@"
-	cd ..; cp racket/starter@EXE_SUFFIX@ "$(DESTDIR)$(libpltdir)/MzStart@EXE_SUFFIX@"
-	cd ..; cp racket/mrstarter@EXE_SUFFIX@ "$(DESTDIR)$(libpltdir)/MrStart@EXE_SUFFIX@"
+	cd ..; cp bc/starter@EXE_SUFFIX@ "$(DESTDIR)$(libpltdir)/MzStart@EXE_SUFFIX@"
+	cd ..; cp bc/mrstarter@EXE_SUFFIX@ "$(DESTDIR)$(libpltdir)/MrStart@EXE_SUFFIX@"
 	cd ..; $(STRIP_DEBUG) "$(DESTDIR)$(libpltdir)/MzStart@EXE_SUFFIX@"
 	cd ..; $(STRIP_DEBUG) "$(DESTDIR)$(libpltdir)/MrStart@EXE_SUFFIX@"
 	cp "$(srcdir)/../mzcom/prebuilt/MzCOM.tlb" MzCOM.tlb
-	cd ..; cp racket/MzCOM.tlb "$(DESTDIR)$(libpltdir)/MzCOM.tlb"
+	cd ..; cp bc/MzCOM.tlb "$(DESTDIR)$(libpltdir)/MzCOM.tlb"
 
 mingw-install-cgc:
 	cd ..; mkdir -p "$(DESTDIR)$(libdir)/gcc"
-	cd ..; $(ICP) racket/libmzgcxxxxxxx.lib "$(DESTDIR)$(libdir)/gcc/libmzgcxxxxxxx.lib"
-	cd ..; $(ICP) racket/libmzgcxxxxxxx.exp "$(DESTDIR)$(libdir)/gcc/libmzgcxxxxxxx.exp"
-	cd ..; $(ICP) racket/libmzgc.def "$(DESTDIR)$(libdir)/libmzgcxxxxxxx.def"
-	cd ..; $(ICP) racket/libracketxxxxxxx.lib "$(DESTDIR)$(libdir)/gcc/libracketxxxxxxx.lib"
-	cd ..; $(ICP) racket/libracketxxxxxxx.exp "$(DESTDIR)$(libdir)/gcc/libracketxxxxxxx.exp"
-	cd ..; $(ICP) racket/libracket.def "$(DESTDIR)$(libdir)/libracketxxxxxxx.def"
-	cd ..; $(ICP) racket/mzdyncgc.o "$(DESTDIR)$(libdir)/gcc/mzdyn.obj"
-	cd ..; $(ICP) racket/mzdyncgc.exp "$(DESTDIR)$(libdir)/gcc/mzdyn.exp"
-	cd ..; $(ICP) racket/lib/libmzgcxxxxxxx.dll "$(DESTDIR)$(libdir)/libmzgcxxxxxxx.dll"
-	cd ..; $(ICP) racket/lib/libracketxxxxxxx.dll "$(DESTDIR)$(libdir)/libracketxxxxxxx.dll"
-	cd ..; $(ICP) racket/racket@CGC@@EXE_SUFFIX@ "$(DESTDIR)@MZINSTALLBINDIR@/Racket@CGC_INSTALLED@@EXE_SUFFIX@"
-	cd ..; $(ICP) racket/mzcom@CGC@@EXE_SUFFIX@ "$(DESTDIR)$(libdir)/MzCOM@CGC_INSTALLED@@EXE_SUFFIX@"
+	cd ..; $(ICP) bc/libmzgcxxxxxxx.lib "$(DESTDIR)$(libdir)/gcc/libmzgcxxxxxxx.lib"
+	cd ..; $(ICP) bc/libmzgcxxxxxxx.exp "$(DESTDIR)$(libdir)/gcc/libmzgcxxxxxxx.exp"
+	cd ..; $(ICP) bc/libmzgc.def "$(DESTDIR)$(libdir)/libmzgcxxxxxxx.def"
+	cd ..; $(ICP) bc/libracketxxxxxxx.lib "$(DESTDIR)$(libdir)/gcc/libracketxxxxxxx.lib"
+	cd ..; $(ICP) bc/libracketxxxxxxx.exp "$(DESTDIR)$(libdir)/gcc/libracketxxxxxxx.exp"
+	cd ..; $(ICP) bc/libracket.def "$(DESTDIR)$(libdir)/libracketxxxxxxx.def"
+	cd ..; $(ICP) bc/mzdyncgc.o "$(DESTDIR)$(libdir)/gcc/mzdyn.obj"
+	cd ..; $(ICP) bc/mzdyncgc.exp "$(DESTDIR)$(libdir)/gcc/mzdyn.exp"
+	cd ..; $(ICP) bc/lib/libmzgcxxxxxxx.dll "$(DESTDIR)$(libdir)/libmzgcxxxxxxx.dll"
+	cd ..; $(ICP) bc/lib/libracketxxxxxxx.dll "$(DESTDIR)$(libdir)/libracketxxxxxxx.dll"
+	cd ..; $(ICP) bc/racket@CGC@@EXE_SUFFIX@ "$(DESTDIR)@MZINSTALLBINDIR@/Racket@CGC_INSTALLED@@EXE_SUFFIX@"
+	cd ..; $(ICP) bc/mzcom@CGC@@EXE_SUFFIX@ "$(DESTDIR)$(libdir)/MzCOM@CGC_INSTALLED@@EXE_SUFFIX@"
 	cd ..; $(STRIP_DEBUG) "$(DESTDIR)$(libdir)/libmzgcxxxxxxx.dll"
 	cd ..; $(STRIP_DEBUG) "$(DESTDIR)$(libdir)/libracketxxxxxxx.dll"
 	cd ..; $(STRIP_DEBUG) "$(DESTDIR)@MZINSTALLBINDIR@/Racket@CGC_INSTALLED@@EXE_SUFFIX@"
@@ -493,14 +495,14 @@ mingw-install-cgc-final:
 
 mingw-install-3m:
 	cd ..; mkdir -p "$(DESTDIR)$(libdir)/gcc"
-	cd ..; $(ICP) racket/gc2/libracket3mxxxxxxx.lib "$(DESTDIR)$(libdir)/gcc/libracket3mxxxxxxx.lib"
-	cd ..; $(ICP) racket/gc2/libracket3mxxxxxxx.exp "$(DESTDIR)$(libdir)/gcc/libracket3mxxxxxxx.exp"
-	cd ..; $(ICP) racket/gc2/libracket3m.def "$(DESTDIR)$(libdir)/libracket3mxxxxxxx.def"
-	cd ..; $(ICP) racket/mzdyn3m.o "$(DESTDIR)$(libdir)/gcc/mzdyn3m.obj"
-	cd ..; $(ICP) racket/mzdyn3m.exp "$(DESTDIR)$(libdir)/gcc/mzdyn3m.exp"
-	cd ..; $(ICP) racket/racket@MMM@@EXE_SUFFIX@ "$(DESTDIR)@MZINSTALLBINDIR@/Racket@MMM_INSTALLED@@EXE_SUFFIX@"
-	cd ..; $(ICP) racket/mzcom@MMM@@EXE_SUFFIX@ "$(DESTDIR)$(libdir)/MzCOM@MMM_INSTALLED@@EXE_SUFFIX@"
-	cd ..; $(ICP) racket/lib/libracket3mxxxxxxx.dll "$(DESTDIR)$(libdir)/libracket3mxxxxxxx.dll"
+	cd ..; $(ICP) bc/gc2/libracket3mxxxxxxx.lib "$(DESTDIR)$(libdir)/gcc/libracket3mxxxxxxx.lib"
+	cd ..; $(ICP) bc/gc2/libracket3mxxxxxxx.exp "$(DESTDIR)$(libdir)/gcc/libracket3mxxxxxxx.exp"
+	cd ..; $(ICP) bc/gc2/libracket3m.def "$(DESTDIR)$(libdir)/libracket3mxxxxxxx.def"
+	cd ..; $(ICP) bc/mzdyn3m.o "$(DESTDIR)$(libdir)/gcc/mzdyn3m.obj"
+	cd ..; $(ICP) bc/mzdyn3m.exp "$(DESTDIR)$(libdir)/gcc/mzdyn3m.exp"
+	cd ..; $(ICP) bc/racket@MMM@@EXE_SUFFIX@ "$(DESTDIR)@MZINSTALLBINDIR@/Racket@MMM_INSTALLED@@EXE_SUFFIX@"
+	cd ..; $(ICP) bc/mzcom@MMM@@EXE_SUFFIX@ "$(DESTDIR)$(libdir)/MzCOM@MMM_INSTALLED@@EXE_SUFFIX@"
+	cd ..; $(ICP) bc/lib/libracket3mxxxxxxx.dll "$(DESTDIR)$(libdir)/libracket3mxxxxxxx.dll"
 	cd ..; $(STRIP_DEBUG) "$(DESTDIR)$(libdir)/libracket3mxxxxxxx.dll"
 	cd ..; $(STRIP_DEBUG) "$(DESTDIR)@MZINSTALLBINDIR@/Racket@MMM_INSTALLED@@EXE_SUFFIX@"
 	cd ..; $(STRIP_DEBUG) "$(DESTDIR)$(libdir)/MzCOM@MMM_INSTALLED@@EXE_SUFFIX@"

racket/src/bc/README.txt

@@ -98,9 +98,9 @@ information.
 
 If you modify Racket and change any primitive syntax or the collection
 of built-in identifiers, be sure to update the version number in
-"racket/src/schvers.h", so that various tools know to rebuild
+"../version/racket_version.h", so that various tools know to rebuild
 bytecode. If you add or remove primitives, you'll also need to adjust
-the counter in "racket/src/schminc.h" .
+the counter in "src/schminc.h" .
 
 Some general guidelines for modying this code:
 

racket/src/bc/configure.ac

@@ -20,8 +20,8 @@
 # hence PREFLAGS, which is initialized to the original CPPFLAGS.
 
 AC_INIT([Racket])
-AC_CONFIG_SRCDIR(racket/src/bignum.c)
-AC_CONFIG_HEADERS([racket/mzconfig.h])
+AC_CONFIG_SRCDIR(bc/src/bignum.c)
+AC_CONFIG_HEADERS([bc/mzconfig.h])
 
 AC_CONFIG_AUX_DIR(lt)
 AC_CANONICAL_SYSTEM
@@ -142,7 +142,7 @@ m4_include(../ac/path.m4)
 ###### Make sure GRacket is really there ######
 
 if test "${enable_gracket}" = "yes" ; then
-  if test ! -d $srcdir/gracket ; then
+  if test ! -d $srcdir/bc/gracket ; then
     enable_gracket=no
   fi
 fi
@@ -549,7 +549,7 @@ case "$host_os" in
     ;;
   aix*)
     enable_cgcdefault="yes"
-    EXTRALIBS="-Wl,-brtl,-bE:\$(srcdir)/../racket/include/racket.exp"
+    EXTRALIBS="-Wl,-brtl,-bE:\$(srcdir)/../bc/include/racket.exp"
     ;;
   *freebsd*)
     LIBS="$LIBS -rdynamic"
@@ -1286,8 +1286,8 @@ fi
 ############## Racket for Racket ################
 
 if test "${enable_racket}" = "auto" ; then
-  enable_racket="`pwd`/local/racket/racket3m"
-  MAKE_LOCAL_RACKET="local/racket/racket3m"
+  enable_racket="`pwd`/local/bc/racket3m"
+  MAKE_LOCAL_RACKET="local/bc/racket3m"
 fi
 
 if test "${enable_racket}" = "" ; then
@@ -1343,10 +1343,10 @@ if test "${enable_shared}" = "yes" ; then
   if test "$INCLUDEDEP" = "-include" ; then
     plt_lib_version="\$(FWVERSION)"
   else
-    VERSION_X=`grep 'define MZSCHEME_VERSION_X ' ${srcdir}/racket/src/schvers.h | cut -d ' ' -f 3`
-    VERSION_Y=`grep 'define MZSCHEME_VERSION_Y ' ${srcdir}/racket/src/schvers.h | cut -d ' ' -f 3`
-    VERSION_Z=`grep 'define MZSCHEME_VERSION_Z ' ${srcdir}/racket/src/schvers.h | cut -d ' ' -f 3`
-    VERSION_W=`grep 'define MZSCHEME_VERSION_W ' ${srcdir}/racket/src/schvers.h | cut -d ' ' -f 3`
+    VERSION_X=`grep 'define MZSCHEME_VERSION_X ' ${srcdir}/bc/src/schvers.h | cut -d ' ' -f 3`
+    VERSION_Y=`grep 'define MZSCHEME_VERSION_Y ' ${srcdir}/bc/src/schvers.h | cut -d ' ' -f 3`
+    VERSION_Z=`grep 'define MZSCHEME_VERSION_Z ' ${srcdir}/bc/src/schvers.h | cut -d ' ' -f 3`
+    VERSION_W=`grep 'define MZSCHEME_VERSION_W ' ${srcdir}/bc/src/schvers.h | cut -d ' ' -f 3`
 
     if test "${VERSION_W}" != "0" ; then
       plt_lib_version="${VERSION_X}.${VERSION_Y}.${VERSION_Z}.${VERSION_W}"
@@ -1516,9 +1516,9 @@ mk_needed_dir()
 }
 
 makefiles="Makefile
-           racket/Makefile
-             racket/src/Makefile racket/dynsrc/Makefile
-             racket/sgc/Makefile racket/gc2/Makefile"
+           bc/Makefile
+             bc/src/Makefile bc/dynsrc/Makefile
+             bc/sgc/Makefile bc/gc2/Makefile"
 
 # Make sure the --enable-shared default is propagated:
 if test "${enable_shared}" = "yes" ; then
@@ -1541,10 +1541,10 @@ fi
 
 FOREIGNTARGET=
 FOREIGN_IF_USED="FOREIGN_NOT_USED"
-if test -d "${srcdir}/foreign" && test "${enable_foreign}" = "yes" ; then
+if test -d "${srcdir}/bc/foreign" && test "${enable_foreign}" = "yes" ; then
   if test "${have_libffi}" != "yes" ; then
-    AC_CONFIG_AUX_DIR( foreign/libffi )
-    AC_CONFIG_SUBDIRS( foreign/libffi )
+    AC_CONFIG_AUX_DIR( bc/foreign/libffi )
+    AC_CONFIG_SUBDIRS( bc/foreign/libffi )
   fi
   FOREIGNTARGET="foreign-stuff"
   FOREIGN_IF_USED="FOREIGN_USED"
@@ -1552,7 +1552,7 @@ else
   FOREIGNTARGET="foreign-stub"
   MZOPTIONS="$MZOPTIONS -DDONT_USE_FOREIGN"
 fi
-makefiles="$makefiles foreign/Makefile"
+makefiles="$makefiles bc/foreign/Makefile"
 
 AC_CONFIG_SUBDIRS( rktio )
 
@@ -1579,8 +1579,8 @@ ac_configure_args="$new_configure_args$SUB_CONFIGURE_EXTRAS"
 
 if test "${enable_gracket}" = "yes" ; then
   makefiles="$makefiles
-             gracket/Makefile
-               gracket/gc2/Makefile"
+             bc/gracket/Makefile
+               bc/gracket/gc2/Makefile"
 fi
 
 AC_OUTPUT($makefiles)

racket/src/bc/dynsrc/Makefile.in

@@ -21,7 +21,7 @@ CC = @CC@
 PLAIN_CC = @PLAIN_CC@
 CFLAGS = @CFLAGS@ @COMPFLAGS@
 CPPFLAGS = @PREFLAGS@
-ALL_CFLAGS = $(CFLAGS) $(CPPFLAGS) -I$(builddir)/.. -I$(srcdir)/../include -I$(srcdir)/../src -I$(srcdir)/../../start @MZOPTIONS@
+ALL_CFLAGS = $(CFLAGS) $(CPPFLAGS) -I$(builddir)/.. -I$(srcdir)/../include -I$(srcdir)/../src -I$(srcdir)/../../version -I$(srcdir)/../../start @MZOPTIONS@
 
 dynlib@NOT_MINGW@:
 	$(MAKE) ../mzdyn.o
@@ -45,14 +45,14 @@ HEADERS = $(builddir)/../mzconfig.h \
           $(srcdir)/../include/scheme.h $(srcdir)/../src/schemef.h \
           $(srcdir)/../sconfig.h $(srcdir)/../uconfig.h \
           $(srcdir)/../include/escheme.h $(srcdir)/../src/stypes.h \
-          $(srcdir)/../src/schemex.h $(srcdir)/../src/schemexm.h $(srcdir)/../src/schvers.h
+          $(srcdir)/../src/schemex.h $(srcdir)/../src/schemexm.h $(srcdir)/../../version/racket_version.h
 
 MZDYNDEP = ../mzdyn.o $(srcdir)/../include/ext.exp $(srcdir)/../include/racket.exp
 
-../mzdyn.o: $(srcdir)/mzdyn.c $(srcdir)/../src/schvers.h  $(HEADERS)
+../mzdyn.o: $(srcdir)/mzdyn.c $(srcdir)/../../version/racket_version.h  $(HEADERS)
 	$(PLAIN_CC) @DYN_CFLAGS@ $(ALL_CFLAGS) -c $(srcdir)/mzdyn.c -o ../mzdyn.o
 
-../mzdyn3m.o: $(srcdir)/mzdyn.c $(srcdir)/../src/schvers.h  $(HEADERS)
+../mzdyn3m.o: $(srcdir)/mzdyn.c $(srcdir)/../../version/racket_version.h  $(HEADERS)
 	$(PLAIN_CC) @DYN_CFLAGS@ $(ALL_CFLAGS) -DMZ_PRECISE_GC -c $(srcdir)/mzdyn.c -o ../mzdyn3m.o
 
 ../dynexmpl.so: dynexmpl.o $(MZDYNDEP)

racket/src/bc/dynsrc/mzdyn.c

@@ -3,9 +3,9 @@
 
 #include "escheme.h"
 #ifdef INCLUDE_WITHOUT_PATHS
-# include "schvers.h"
+# include "racket_version.h"
 #else
-# include "../src/schvers.h"
+# include "../../version/racket_version.h"
 #endif
 
 #ifdef MZ_PRECISE_GC

racket/src/bc/foreign/Makefile.in

@@ -9,9 +9,9 @@ LIBFFI_LOCAL_INCLUDE_OFF =
 CFLAGS = @CFLAGS@ @COMPFLAGS@ @PROFFLAGS@
 CPPFLAGS = @PREFLAGS@
 ALL_CFLAGS = $(CFLAGS) $(CPPFLAGS) @OPTIONS@ @MZOPTIONS@ \
-         -I$(builddir)/../racket \
-         -I$(srcdir)/../racket/include -I$(srcdir)/../racket/src \
-         -I$(srcdir)/../rktio -I$(builddir)/../rktio \
+         -I$(builddir)/.. \
+         -I$(srcdir)/../include -I$(srcdir)/../src \
+         -I$(srcdir)/../../rktio -I$(builddir)/../../rktio \
          $(LIBFFI_LOCAL_INCLUDE_@OWN_LIBFFI@)
 ARFLAGS = @ARFLAGS@
 NOOP = :
@@ -37,12 +37,12 @@ libffi/libffi@FOREIGN_CONVENIENCE@.la:
 	cd libffi; $(MAKE) libffi@FOREIGN_CONVENIENCE@.la
 
 foreign.@LTO@: $(srcdir)/foreign.c \
-           $(srcdir)/../racket/sconfig.h \
-           $(srcdir)/../racket/include/scheme.h \
-           $(srcdir)/../racket/include/schthread.h \
-           $(srcdir)/../racket/src/schemef.h \
-           $(srcdir)/../racket/src/stypes.h \
-           $(srcdir)/../racket/src/schpriv.h
+           $(srcdir)/../sconfig.h \
+           $(srcdir)/../include/scheme.h \
+           $(srcdir)/../include/schthread.h \
+           $(srcdir)/../src/schemef.h \
+           $(srcdir)/../src/stypes.h \
+           $(srcdir)/../src/schpriv.h
 	$(CC) $(ALL_CFLAGS) -c $(srcdir)/foreign.c -o foreign.@LTO@
 
 clean:

racket/src/bc/foreign/foreign.c

@@ -5361,8 +5361,8 @@ void scheme_init_foreign(Scheme_Startup_Env *env)
 int scheme_is_cpointer(Scheme_Object *cp)
 {
   return (SCHEME_FALSEP(cp)
-          || SCHEME_CPTRP(x)
-          || SCHEME_BYTE_STRINGP(x)
+          || SCHEME_CPTRP(cp)
+          || SCHEME_BYTE_STRINGP(cp)
           || (SCHEME_CHAPERONE_STRUCTP(cp)
               && scheme_struct_type_property_ref(scheme_cpointer_property, cp)));
 }