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,21 +222,21 @@ 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
 	IF EXIST racket\lib\iconv.dll cmd /c del racket\lib\iconv.dll
 	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,17 +269,17 @@ install-no-both:
 	$(NOOP)
 
 install-gracket-both:
-	cd gracket; $(MAKE) install-both
+	cd bc/gracket && $(MAKE) install-both
 
 # CS install ----------------------------------------
 
 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"