[Gd-chatter] r10708 - in trunk/fundev: . admin/builds admin/pentium admin/powerpc sources/app/dw sources/dfmc/c-linker sources/dfmc/c-run-time sources/dfmc/harp-cg-linker sources/dfmc/linker sources/dfmc/management sources/dfmc/shell sources/environment/commands/internal sources/environment/gtk sources/environment/tests/dfmc sources/environment/tools sources/environment/win32 sources/lib/build-system sources/lib/licensing sources/lib/release-info sources/lib/run-time sources/lib/run-time/pentium-freebsd sources/lib/run-time/pentium-linux sources/lib/run-time/pentium-win32 sources/lib/run-time/powerpc-linux sources/project-manager/dfmc-projects sources/project-manager/user-projects sources/runtime-manager/debugger-nub/x86-win32

[andreas at gwydiondylan.org]

Author: andreas
Date: Thu May  4 17:47:55 2006
New Revision: 10708

Modified:
   trunk/fundev/Makefile.in
   trunk/fundev/admin/builds/Makefile
   trunk/fundev/admin/builds/build-dfmc
   trunk/fundev/admin/builds/build-release.bat
   trunk/fundev/admin/builds/compile-library.bat
   trunk/fundev/admin/builds/cvs-checkout.bat
   trunk/fundev/admin/builds/ensure-application.bat
   trunk/fundev/admin/builds/ensure-library.bat
   trunk/fundev/admin/builds/ensure-registry-entry.bat
   trunk/fundev/admin/builds/ensure-release-area.bat
   trunk/fundev/admin/builds/fdmake.pl
   trunk/fundev/admin/builds/generate-idl-bindings.bat
   trunk/fundev/admin/builds/generate-parser.bat
   trunk/fundev/admin/builds/import-project.bat
   trunk/fundev/admin/builds/remove-application.bat
   trunk/fundev/admin/builds/remove-library.bat
   trunk/fundev/admin/builds/run-test.bat
   trunk/fundev/admin/builds/set-build-variables.bash
   trunk/fundev/admin/builds/set-build-variables.bat
   trunk/fundev/admin/builds/show-build-warnings.bat
   trunk/fundev/admin/builds/show-compiler-speeds.bat
   trunk/fundev/admin/builds/test-release.bat
   trunk/fundev/admin/builds/test-script.bat
   trunk/fundev/admin/pentium/.bashrc
   trunk/fundev/admin/pentium/bootstrap-compiler
   trunk/fundev/admin/pentium/build-staging
   trunk/fundev/admin/pentium/clean-build
   trunk/fundev/admin/pentium/clean-link
   trunk/fundev/admin/pentium/config
   trunk/fundev/admin/pentium/config-dylan
   trunk/fundev/admin/pentium/gcc-so
   trunk/fundev/admin/pentium/install-boot-so
   trunk/fundev/admin/pentium/install-so
   trunk/fundev/admin/pentium/link
   trunk/fundev/admin/pentium/link-build
   trunk/fundev/admin/pentium/link-dylan
   trunk/fundev/admin/pentium/link-dylan-test-suite
   trunk/fundev/admin/pentium/linkapp
   trunk/fundev/admin/pentium/linkcmu
   trunk/fundev/admin/pentium/linkexe
   trunk/fundev/admin/pentium/make-runtime
   trunk/fundev/admin/pentium/new-reg
   trunk/fundev/admin/pentium/run-app
   trunk/fundev/admin/pentium/show-libs
   trunk/fundev/admin/pentium/test-lib
   trunk/fundev/admin/pentium/test-reg
   trunk/fundev/admin/powerpc/.bashrc
   trunk/fundev/admin/powerpc/clean-build
   trunk/fundev/admin/powerpc/clean-link
   trunk/fundev/admin/powerpc/config
   trunk/fundev/admin/powerpc/config-dylan
   trunk/fundev/admin/powerpc/gcc-so
   trunk/fundev/admin/powerpc/install-so
   trunk/fundev/admin/powerpc/link-build
   trunk/fundev/admin/powerpc/link-dylan
   trunk/fundev/admin/powerpc/link-dylan-test-suite
   trunk/fundev/admin/powerpc/linkapp
   trunk/fundev/admin/powerpc/linkcmu
   trunk/fundev/admin/powerpc/linkexe
   trunk/fundev/admin/powerpc/make-runtime
   trunk/fundev/admin/powerpc/new-reg
   trunk/fundev/admin/powerpc/run-app
   trunk/fundev/admin/powerpc/show-libs
   trunk/fundev/admin/powerpc/test-lib
   trunk/fundev/admin/powerpc/test-reg
   trunk/fundev/sources/app/dw/top-level.dylan
   trunk/fundev/sources/dfmc/c-linker/c-linker.dylan
   trunk/fundev/sources/dfmc/c-linker/c-makefile.dylan
   trunk/fundev/sources/dfmc/c-run-time/Makefile
   trunk/fundev/sources/dfmc/c-run-time/Makefile.MPW
   trunk/fundev/sources/dfmc/c-run-time/Makefile.win32
   trunk/fundev/sources/dfmc/harp-cg-linker/harp-makefile.dylan
   trunk/fundev/sources/dfmc/linker/makefile.dylan
   trunk/fundev/sources/dfmc/management/compilation-driver.dylan
   trunk/fundev/sources/dfmc/shell/commands.dylan
   trunk/fundev/sources/environment/commands/internal/internal.dylan
   trunk/fundev/sources/environment/commands/internal/registries.dylan
   trunk/fundev/sources/environment/gtk/start.dylan
   trunk/fundev/sources/environment/tests/dfmc/projects.dylan
   trunk/fundev/sources/environment/tools/project-commands.dylan
   trunk/fundev/sources/environment/win32/start.dylan
   trunk/fundev/sources/lib/build-system/paths.dylan
   trunk/fundev/sources/lib/licensing/licensing.dylan
   trunk/fundev/sources/lib/release-info/common-info.dylan
   trunk/fundev/sources/lib/release-info/functional-settings.dylan
   trunk/fundev/sources/lib/run-time/collector.c
   trunk/fundev/sources/lib/run-time/pentium-freebsd/Makefile.in
   trunk/fundev/sources/lib/run-time/pentium-freebsd/elf-linker.script
   trunk/fundev/sources/lib/run-time/pentium-linux/Makefile.in
   trunk/fundev/sources/lib/run-time/pentium-linux/elf-linker.script
   trunk/fundev/sources/lib/run-time/pentium-win32/gnu-linker.script
   trunk/fundev/sources/lib/run-time/pentium-win32/makefile
   trunk/fundev/sources/lib/run-time/pentium-win32/microsoft-linker.script
   trunk/fundev/sources/lib/run-time/powerpc-linux/GNUmakefile
   trunk/fundev/sources/project-manager/dfmc-projects/workspace.dylan
   trunk/fundev/sources/project-manager/user-projects/user-projects.dylan
   trunk/fundev/sources/runtime-manager/debugger-nub/x86-win32/makefile
Log:
job: fd

Global renaming of environment variables:

  FUNCTIONAL_DEVELOPER_* => OPEN_DYLAN_*

Watch out, this will break bootstrapping with existing scripts.



Modified: trunk/fundev/Makefile.in
==============================================================================
--- trunk/fundev/Makefile.in	(original)
+++ trunk/fundev/Makefile.in	Thu May  4 17:47:55 2006
@@ -20,15 +20,15 @@
 1-stage-bootstrap: final-bootstrap
 
 2-stage-bootstrap: stage-1-bootstrap
-	FUNCTIONAL_DEVELOPER_RELEASE_ROOT=$(abs_builddir)/Bootstrap.1 \
+	OPEN_DYLAN_RELEASE_ROOT=$(abs_builddir)/Bootstrap.1 \
 	  $(MAKE) FDCOMPILE="$(abs_builddir)/Bootstrap.1/bin/minimal-console-compiler -build -save" final-bootstrap
 
 3-stage-bootstrap: stage-1-bootstrap stage-2-bootstrap
-	FUNCTIONAL_DEVELOPER_RELEASE_ROOT=$(abs_builddir)/Bootstrap.2 \
+	OPEN_DYLAN_RELEASE_ROOT=$(abs_builddir)/Bootstrap.2 \
 	  $(MAKE) FDCOMPILE="$(abs_builddir)/Bootstrap.2/bin/minimal-console-compiler -build -save" final-bootstrap
 
 4-stage-bootstrap: stage-1-bootstrap stage-2-bootstrap stage-3-bootstrap
-	FUNCTIONAL_DEVELOPER_RELEASE_ROOT=$(abs_builddir)/Bootstrap.3 \
+	OPEN_DYLAN_RELEASE_ROOT=$(abs_builddir)/Bootstrap.3 \
 	  $(MAKE) FDCOMPILE="$(abs_builddir)/Bootstrap.3/bin/minimal-console-compiler -build -save" final-bootstrap
 
 stage-1-bootstrap: \
@@ -80,13 +80,13 @@
 
 Bootstrap.1/bin/minimal-console-compiler:
 	@echo Building stage 1 bootstrap...
-	@FUNCTIONAL_DEVELOPER_PLATFORM_NAME=$(fd_build) \
-	  FUNCTIONAL_DEVELOPER_BUILD_LOGS=$(abs_builddir)/Bootstrap.1/logs \
-	  FUNCTIONAL_DEVELOPER_USER_ROOT=$(abs_builddir)/Bootstrap.1 \
-	  FUNCTIONAL_DEVELOPER_USER_INSTALL=$(abs_builddir)/Bootstrap.1 \
-	  FUNCTIONAL_DEVELOPER_USER_REGISTRIES=$(BOOTSTRAP1_REGISTRY) \
-	  FUNCTIONAL_DEVELOPER_USER_SOURCES=$(abs_srcdir)/sources \
-	  FUNCTIONAL_DEVELOPER_USER_BUILD=$(abs_builddir)/Bootstrap.1/build \
+	@OPEN_DYLAN_PLATFORM_NAME=$(fd_build) \
+	  OPEN_DYLAN_BUILD_LOGS=$(abs_builddir)/Bootstrap.1/logs \
+	  OPEN_DYLAN_USER_ROOT=$(abs_builddir)/Bootstrap.1 \
+	  OPEN_DYLAN_USER_INSTALL=$(abs_builddir)/Bootstrap.1 \
+	  OPEN_DYLAN_USER_REGISTRIES=$(BOOTSTRAP1_REGISTRY) \
+	  OPEN_DYLAN_USER_SOURCES=$(abs_srcdir)/sources \
+	  OPEN_DYLAN_USER_BUILD=$(abs_builddir)/Bootstrap.1/build \
 	  $(fdmake) --compiler="$(FDCOMPILE)" minimal-console-compiler
 
 stage-2-bootstrap: Bootstrap.2 Bootstrap.2/bin/minimal-console-compiler
@@ -101,17 +101,17 @@
 
 Bootstrap.2/bin/minimal-console-compiler: stage-1-bootstrap
 	@echo Building stage 2 bootstrap...
-	FUNCTIONAL_DEVELOPER_USER_INSTALL=$(abs_builddir)/Bootstrap.2 \
+	OPEN_DYLAN_USER_INSTALL=$(abs_builddir)/Bootstrap.2 \
 	  $(MAKE) -C sources/lib/run-time/pentium-linux install
-	@FUNCTIONAL_DEVELOPER_PLATFORM_NAME=$(fd_build) \
-	  FUNCTIONAL_DEVELOPER_RELEASE_ROOT=$(abs_builddir)/Bootstrap.2 \
-	  FUNCTIONAL_DEVELOPER_RELEASE_INSTALL=$(abs_builddir)/Bootstrap.2 \
-	  FUNCTIONAL_DEVELOPER_BUILD_LOGS=$(abs_builddir)/Bootstrap.2/logs \
-	  FUNCTIONAL_DEVELOPER_USER_ROOT=$(abs_builddir)/Bootstrap.2 \
-	  FUNCTIONAL_DEVELOPER_USER_INSTALL=$(abs_builddir)/Bootstrap.2 \
-	  FUNCTIONAL_DEVELOPER_USER_REGISTRIES=$(abs_srcdir)/sources/registry \
-	  FUNCTIONAL_DEVELOPER_USER_SOURCES=$(abs_srcdir)/sources \
-	  FUNCTIONAL_DEVELOPER_USER_BUILD=$(abs_builddir)/Bootstrap.2/build \
+	@OPEN_DYLAN_PLATFORM_NAME=$(fd_build) \
+	  OPEN_DYLAN_RELEASE_ROOT=$(abs_builddir)/Bootstrap.2 \
+	  OPEN_DYLAN_RELEASE_INSTALL=$(abs_builddir)/Bootstrap.2 \
+	  OPEN_DYLAN_BUILD_LOGS=$(abs_builddir)/Bootstrap.2/logs \
+	  OPEN_DYLAN_USER_ROOT=$(abs_builddir)/Bootstrap.2 \
+	  OPEN_DYLAN_USER_INSTALL=$(abs_builddir)/Bootstrap.2 \
+	  OPEN_DYLAN_USER_REGISTRIES=$(abs_srcdir)/sources/registry \
+	  OPEN_DYLAN_USER_SOURCES=$(abs_srcdir)/sources \
+	  OPEN_DYLAN_USER_BUILD=$(abs_builddir)/Bootstrap.2/build \
 	  $(fdmake) --compiler="Bootstrap.1/bin/minimal-console-compiler -build -save" \
 		    minimal-console-compiler
 
@@ -127,16 +127,16 @@
 
 Bootstrap.3/bin/minimal-console-compiler: stage-2-bootstrap
 	@echo Building stage 3 bootstrap...
-	FUNCTIONAL_DEVELOPER_USER_INSTALL=$(abs_builddir)/Bootstrap.3 \
+	OPEN_DYLAN_USER_INSTALL=$(abs_builddir)/Bootstrap.3 \
 	  $(MAKE) -C sources/lib/run-time/pentium-linux install
-	@FUNCTIONAL_DEVELOPER_PLATFORM_NAME=$(fd_build) \
-	  FUNCTIONAL_DEVELOPER_RELEASE_ROOT=$(abs_builddir)/Bootstrap.2 \
-	  FUNCTIONAL_DEVELOPER_BUILD_LOGS=$(abs_builddir)/Bootstrap.3/logs \
-	  FUNCTIONAL_DEVELOPER_USER_ROOT=$(abs_builddir)/Bootstrap.3 \
-	  FUNCTIONAL_DEVELOPER_USER_INSTALL=$(abs_builddir)/Bootstrap.3 \
-	  FUNCTIONAL_DEVELOPER_USER_REGISTRIES=$(abs_srcdir)/sources/registry \
-	  FUNCTIONAL_DEVELOPER_USER_SOURCES=$(abs_srcdir)/sources \
-	  FUNCTIONAL_DEVELOPER_USER_BUILD=$(abs_builddir)/Bootstrap.3/build \
+	@OPEN_DYLAN_PLATFORM_NAME=$(fd_build) \
+	  OPEN_DYLAN_RELEASE_ROOT=$(abs_builddir)/Bootstrap.2 \
+	  OPEN_DYLAN_BUILD_LOGS=$(abs_builddir)/Bootstrap.3/logs \
+	  OPEN_DYLAN_USER_ROOT=$(abs_builddir)/Bootstrap.3 \
+	  OPEN_DYLAN_USER_INSTALL=$(abs_builddir)/Bootstrap.3 \
+	  OPEN_DYLAN_USER_REGISTRIES=$(abs_srcdir)/sources/registry \
+	  OPEN_DYLAN_USER_SOURCES=$(abs_srcdir)/sources \
+	  OPEN_DYLAN_USER_BUILD=$(abs_builddir)/Bootstrap.3/build \
 	  $(fdmake) --compiler="Bootstrap.2/bin/minimal-console-compiler -build -save" \
 		    minimal-console-compiler
 
@@ -150,20 +150,20 @@
 	-mkdir $(prefix)/lib/runtime
 
 FINAL_ENV = \
-	FUNCTIONAL_DEVELOPER_PLATFORM_NAME=$(fd_build) \
-	FUNCTIONAL_DEVELOPER_BUILD_LOGS=$(abs_builddir)/Bootstrap.final/logs \
-	FUNCTIONAL_DEVELOPER_USER_ROOT=$(abs_builddir)/Bootstrap.final \
-	FUNCTIONAL_DEVELOPER_USER_INSTALL=$(prefix) \
-	FUNCTIONAL_DEVELOPER_USER_REGISTRIES=$(abs_srcdir)/sources/registry \
-	FUNCTIONAL_DEVELOPER_USER_SOURCES=$(abs_srcdir)/sources \
-	FUNCTIONAL_DEVELOPER_USER_BUILD=$(abs_builddir)/Bootstrap.final/build
+	OPEN_DYLAN_PLATFORM_NAME=$(fd_build) \
+	OPEN_DYLAN_BUILD_LOGS=$(abs_builddir)/Bootstrap.final/logs \
+	OPEN_DYLAN_USER_ROOT=$(abs_builddir)/Bootstrap.final \
+	OPEN_DYLAN_USER_INSTALL=$(prefix) \
+	OPEN_DYLAN_USER_REGISTRIES=$(abs_srcdir)/sources/registry \
+	OPEN_DYLAN_USER_SOURCES=$(abs_srcdir)/sources \
+	OPEN_DYLAN_USER_BUILD=$(abs_builddir)/Bootstrap.final/build
 
 FINAL_LIBRARIES = \
 	minimal-console-compiler
 
 final-bootstrap: Bootstrap.final
 	@echo Building final stage bootstrap...
-	FUNCTIONAL_DEVELOPER_USER_INSTALL=$(prefix) \
+	OPEN_DYLAN_USER_INSTALL=$(prefix) \
 	  $(MAKE) -C sources/lib/run-time/pentium-linux install
 	@$(FINAL_ENV) $(FDCOMPILE) \
 		$(FINAL_LIBRARIES)

Modified: trunk/fundev/admin/builds/Makefile
==============================================================================
--- trunk/fundev/admin/builds/Makefile	(original)
+++ trunk/fundev/admin/builds/Makefile	Thu May  4 17:47:55 2006
@@ -78,16 +78,16 @@
 # Source targets
 #
 
-ADMIN_DIRECTORY = $(FUNCTIONAL_DEVELOPER_USER_ROOT)\Admin
-BUILD_DIRECTORY = $(FUNCTIONAL_DEVELOPER_USER_BUILD)
-DATABASES_DIRECTORY = $(FUNCTIONAL_DEVELOPER_USER_INSTALL)\Databases
-EXAMPLES_INSTALL_DIRECTORY = $(FUNCTIONAL_DEVELOPER_USER_INSTALL)\Examples
-INSTALL_BIN_DIRECTORY = $(FUNCTIONAL_DEVELOPER_USER_INSTALL)\Bin
-INSTALL_LIB_DIRECTORY = $(FUNCTIONAL_DEVELOPER_USER_INSTALL)\Lib
-LOGS_DIRECTORY = $(FUNCTIONAL_DEVELOPER_USER_INSTALL)\logs
-REDISTRIBUTABLE_DIRECTORY = $(FUNCTIONAL_DEVELOPER_USER_ROOT)\Redistributable
-SOURCES_DIRECTORY = $(FUNCTIONAL_DEVELOPER_USER_SOURCES)
-TEMPLATES_INSTALL_DIRECTORY = $(FUNCTIONAL_DEVELOPER_USER_INSTALL)\Templates
+ADMIN_DIRECTORY = $(OPEN_DYLAN_USER_ROOT)\Admin
+BUILD_DIRECTORY = $(OPEN_DYLAN_USER_BUILD)
+DATABASES_DIRECTORY = $(OPEN_DYLAN_USER_INSTALL)\Databases
+EXAMPLES_INSTALL_DIRECTORY = $(OPEN_DYLAN_USER_INSTALL)\Examples
+INSTALL_BIN_DIRECTORY = $(OPEN_DYLAN_USER_INSTALL)\Bin
+INSTALL_LIB_DIRECTORY = $(OPEN_DYLAN_USER_INSTALL)\Lib
+LOGS_DIRECTORY = $(OPEN_DYLAN_USER_INSTALL)\logs
+REDISTRIBUTABLE_DIRECTORY = $(OPEN_DYLAN_USER_ROOT)\Redistributable
+SOURCES_DIRECTORY = $(OPEN_DYLAN_USER_SOURCES)
+TEMPLATES_INSTALL_DIRECTORY = $(OPEN_DYLAN_USER_INSTALL)\Templates
 SOURCE_TEMPLATES_INSTALL_DIRECTORY = $(TEMPLATES_INSTALL_DIRECTORY)\Source
 
 RUNTIME_PREFIX = Dx
@@ -135,8 +135,8 @@
 DOCUMENTATION_EXAMPLES_INSTALL_DIRECTORY = $(EXAMPLES_INSTALL_DIRECTORY)\documentation
 NETWORK_EXAMPLES_INSTALL_DIRECTORY = $(EXAMPLES_INSTALL_DIRECTORY)\network
 
-BUILD_LOGS = $(FUNCTIONAL_DEVELOPER_BUILD_LOGS)
-CVS_LOGS = $(FUNCTIONAL_DEVELOPER_CVS_LOGS)
+BUILD_LOGS = $(OPEN_DYLAN_BUILD_LOGS)
+CVS_LOGS = $(OPEN_DYLAN_CVS_LOGS)
 
 ASP_VIEW_SOURCE = $(OLE_EXAMPLES_DIRECTORY)\asp-view
 ASP_VIEW_INSTALL_DIRECTORY = $(OLE_EXAMPLES_INSTALL_DIRECTORY)\asp-view
@@ -578,7 +578,7 @@
 USER_PROJECTS = $(INSTALL_BIN_DIRECTORY)\user-projects.dll
 
 DEBUGGER_NUB = $(INSTALL_LIB_DIRECTORY)\devnub.lib
-DEVEL_DBG_UI_BUILD = $(FUNCTIONAL_DEVELOPER_USER_BUILD)\devel-dbg-ui
+DEVEL_DBG_UI_BUILD = $(OPEN_DYLAN_USER_BUILD)\devel-dbg-ui
 DEBUGGER_MANAGER = $(INSTALL_BIN_DIRECTORY)\debugger-manager.dll
 DISASM = $(INSTALL_BIN_DIRECTORY)\disasm.dll
 DISPATCH_PROFILER = $(INSTALL_BIN_DIRECTORY)\dispatch-profiler.dll
@@ -1242,8 +1242,8 @@
 #
 
 clean-generation:
-  $(ENSURE_DIRECTORY) $(FUNCTIONAL_DEVELOPER_USER_BUILD)
-  $(REMOVE_DIRECTORY) $(FUNCTIONAL_DEVELOPER_USER_BUILD)
+  $(ENSURE_DIRECTORY) $(OPEN_DYLAN_USER_BUILD)
+  $(REMOVE_DIRECTORY) $(OPEN_DYLAN_USER_BUILD)
   $(ENSURE_DIRECTORY) $(INSTALL_BIN_DIRECTORY)
   $(REMOVE_DIRECTORY) $(INSTALL_BIN_DIRECTORY)
   $(ENSURE_DIRECTORY) $(REDISTRIBUTABLE_DIRECTORY)
@@ -1263,32 +1263,32 @@
 clean-all:
   $(ENSURE_DIRECTORY) $(SOURCES_DIRECTORY)\bootstrap1-registry
   $(REMOVE_DIRECTORY) $(SOURCES_DIRECTORY)\bootstrap1-registry
-  $(ENSURE_DIRECTORY) $(FUNCTIONAL_DEVELOPER_USER_ROOT)\Bootstrap.1
-  $(REMOVE_DIRECTORY) $(FUNCTIONAL_DEVELOPER_USER_ROOT)\Bootstrap.1
-  $(ENSURE_DIRECTORY) $(FUNCTIONAL_DEVELOPER_USER_ROOT)\Bootstrap.2
-  $(REMOVE_DIRECTORY) $(FUNCTIONAL_DEVELOPER_USER_ROOT)\Bootstrap.2
-  $(ENSURE_DIRECTORY) $(FUNCTIONAL_DEVELOPER_USER_ROOT)\Build
-  $(REMOVE_DIRECTORY) $(FUNCTIONAL_DEVELOPER_USER_ROOT)\Build
-  $(ENSURE_DIRECTORY) $(FUNCTIONAL_DEVELOPER_USER_ROOT)\Bin
-  $(REMOVE_DIRECTORY) $(FUNCTIONAL_DEVELOPER_USER_ROOT)\Bin
-  $(ENSURE_DIRECTORY) $(FUNCTIONAL_DEVELOPER_USER_ROOT)\Redistributable
-  $(REMOVE_DIRECTORY) $(FUNCTIONAL_DEVELOPER_USER_ROOT)\Redistributable
-  $(ENSURE_DIRECTORY) $(FUNCTIONAL_DEVELOPER_USER_ROOT)\Lib
-  $(REMOVE_DIRECTORY) $(FUNCTIONAL_DEVELOPER_USER_ROOT)\Lib
-  $(ENSURE_DIRECTORY) $(FUNCTIONAL_DEVELOPER_USER_ROOT)\Databases
-  $(REMOVE_DIRECTORY) $(FUNCTIONAL_DEVELOPER_USER_ROOT)\Databases
-  $(ENSURE_DIRECTORY) $(FUNCTIONAL_DEVELOPER_USER_ROOT)\Examples
-  $(REMOVE_DIRECTORY) $(FUNCTIONAL_DEVELOPER_USER_ROOT)\Examples
-  $(REMOVE) $(FUNCTIONAL_DEVELOPER_USER_ROOT)\logs\compile-*.log
-  $(REMOVE) $(FUNCTIONAL_DEVELOPER_USER_ROOT)\logs\generate-*.log
-  $(REMOVE) $(FUNCTIONAL_DEVELOPER_USER_ROOT)\logs\import-*.log
-  $(REMOVE) $(FUNCTIONAL_DEVELOPER_USER_ROOT)\logs\make-*.log
+  $(ENSURE_DIRECTORY) $(OPEN_DYLAN_USER_ROOT)\Bootstrap.1
+  $(REMOVE_DIRECTORY) $(OPEN_DYLAN_USER_ROOT)\Bootstrap.1
+  $(ENSURE_DIRECTORY) $(OPEN_DYLAN_USER_ROOT)\Bootstrap.2
+  $(REMOVE_DIRECTORY) $(OPEN_DYLAN_USER_ROOT)\Bootstrap.2
+  $(ENSURE_DIRECTORY) $(OPEN_DYLAN_USER_ROOT)\Build
+  $(REMOVE_DIRECTORY) $(OPEN_DYLAN_USER_ROOT)\Build
+  $(ENSURE_DIRECTORY) $(OPEN_DYLAN_USER_ROOT)\Bin
+  $(REMOVE_DIRECTORY) $(OPEN_DYLAN_USER_ROOT)\Bin
+  $(ENSURE_DIRECTORY) $(OPEN_DYLAN_USER_ROOT)\Redistributable
+  $(REMOVE_DIRECTORY) $(OPEN_DYLAN_USER_ROOT)\Redistributable
+  $(ENSURE_DIRECTORY) $(OPEN_DYLAN_USER_ROOT)\Lib
+  $(REMOVE_DIRECTORY) $(OPEN_DYLAN_USER_ROOT)\Lib
+  $(ENSURE_DIRECTORY) $(OPEN_DYLAN_USER_ROOT)\Databases
+  $(REMOVE_DIRECTORY) $(OPEN_DYLAN_USER_ROOT)\Databases
+  $(ENSURE_DIRECTORY) $(OPEN_DYLAN_USER_ROOT)\Examples
+  $(REMOVE_DIRECTORY) $(OPEN_DYLAN_USER_ROOT)\Examples
+  $(REMOVE) $(OPEN_DYLAN_USER_ROOT)\logs\compile-*.log
+  $(REMOVE) $(OPEN_DYLAN_USER_ROOT)\logs\generate-*.log
+  $(REMOVE) $(OPEN_DYLAN_USER_ROOT)\logs\import-*.log
+  $(REMOVE) $(OPEN_DYLAN_USER_ROOT)\logs\make-*.log
   $(ENSURE_RELEASE_AREA)
 
 #--- andrewa: too dangerous for those working from home!
 # force-all:
-#   $(ENSURE_DIRECTORY) $(FUNCTIONAL_DEVELOPER_USER_ROOT)
-#   $(REMOVE_DIRECTORY) $(FUNCTIONAL_DEVELOPER_USER_ROOT)
+#   $(ENSURE_DIRECTORY) $(OPEN_DYLAN_USER_ROOT)
+#   $(REMOVE_DIRECTORY) $(OPEN_DYLAN_USER_ROOT)
 
 #
 # Check out sources (in alphabetical order)
@@ -1909,7 +1909,7 @@
 $(C_RUN_TIME):
   $(ENSURE_SOURCES) c-run-time $(C_RUN_TIME_SOURCE)
   echo Building C run time
-  pushd $(FUNCTIONAL_DEVELOPER_USER_BUILD)\c-run-time \
+  pushd $(OPEN_DYLAN_USER_BUILD)\c-run-time \
     & $(MAKE) install /f Makefile.win32 > $(BUILD_LOGS)\make-c-run-time.log \
     & popd
 

Modified: trunk/fundev/admin/builds/build-dfmc
==============================================================================
--- trunk/fundev/admin/builds/build-dfmc	(original)
+++ trunk/fundev/admin/builds/build-dfmc	Thu May  4 17:47:55 2006
@@ -94,13 +94,13 @@
 source $env_script -r $personal_dylan_root -pr $personal_dylan_root
 
 ## Useful locations
-sources_directory=$FUNCTIONAL_DEVELOPER_USER_ROOT/sources
+sources_directory=$OPEN_DYLAN_USER_ROOT/sources
 emulator_registry=${emulator_registry:-$sources_directory/registry/emulator}
 generic_registry=${generic_registry:-$sources_directory/registry/generic}
-build_directory=$FUNCTIONAL_DEVELOPER_USER_BUILD
-bin_directory=$FUNCTIONAL_DEVELOPER_USER_INSTALL/bin
-include_directory=$FUNCTIONAL_DEVELOPER_USER_INSTALL/include
-lib_directory=$FUNCTIONAL_DEVELOPER_USER_INSTALL/lib
+build_directory=$OPEN_DYLAN_USER_BUILD
+bin_directory=$OPEN_DYLAN_USER_INSTALL/bin
+include_directory=$OPEN_DYLAN_USER_INSTALL/include
+lib_directory=$OPEN_DYLAN_USER_INSTALL/lib
 
 ## Words for printing out in the preamble.
 case $tags in
@@ -284,10 +284,10 @@
   echo ""
   echo "Ripping out *.o & lib files for C run-time from $sources_directory/dfmc/c-run-time/..."
   rm -f $sources_directory/dfmc/c-run-time/*.o
-  rm -f $sources_directory/dfmc/c-run-time/lib_run-time.$FUNCTIONAL_DEVELOPER_LIB_SUFFIX
+  rm -f $sources_directory/dfmc/c-run-time/lib_run-time.$OPEN_DYLAN_LIB_SUFFIX
   
   echo "Ripping out old lib for C run-time from $lib_directory..."
-  rm -f $lib_directory/lib_run-time.$FUNCTIONAL_DEVELOPER_LIB_SUFFIX
+  rm -f $lib_directory/lib_run-time.$OPEN_DYLAN_LIB_SUFFIX
 
   echo "Ripping out old include for C run-time from $include_directory..."
   rm -f $include_directory/run-time.h
@@ -300,8 +300,8 @@
   echo "Ripping out old builds in $build_directory/$1/*..."
   rm -fr $build_directory/$1
 
-  echo "Ripping out old lib $lib_directory/lib_$1.$FUNCTIONAL_DEVELOPER_LIB_SUFFIX..."
-  rm -f $lib_directory/lib_$1.$FUNCTIONAL_DEVELOPER_LIB_SUFFIX
+  echo "Ripping out old lib $lib_directory/lib_$1.$OPEN_DYLAN_LIB_SUFFIX..."
+  rm -f $lib_directory/lib_$1.$OPEN_DYLAN_LIB_SUFFIX
 
   echo "Ripping out old application $bin_directory/$1..."
   rm -f $bin_directory/$1
@@ -391,12 +391,12 @@
     echo "* Boehm GC library checkout *"
     echo "*****************************"
     pushd $lib_directory
-    hope co -comp D-install-$machine-lib -unit lib_gc.$FUNCTIONAL_DEVELOPER_LIB_SUFFIX -branch $branch -writ skip -extra delete -miss create
+    hope co -comp D-install-$machine-lib -unit lib_gc.$OPEN_DYLAN_LIB_SUFFIX -branch $branch -writ skip -extra delete -miss create
     if test $machine=sparc-sunos4; then
       ## Magic RThor & Jonathan say we gotta do on SunOS.  NB: gets a warning about no symbol table.
-      chmod u+w $lib_directory/lib_gc.$FUNCTIONAL_DEVELOPER_LIB_SUFFIX # make it writeable
-      ranlib $lib_directory/lib_gc.$FUNCTIONAL_DEVELOPER_LIB_SUFFIX    # update table of contents
-      chmod u-w $lib_directory/lib_gc.$FUNCTIONAL_DEVELOPER_LIB_SUFFIX # make it unwriteable
+      chmod u+w $lib_directory/lib_gc.$OPEN_DYLAN_LIB_SUFFIX # make it writeable
+      ranlib $lib_directory/lib_gc.$OPEN_DYLAN_LIB_SUFFIX    # update table of contents
+      chmod u-w $lib_directory/lib_gc.$OPEN_DYLAN_LIB_SUFFIX # make it unwriteable
     fi
     popd
   fi

Modified: trunk/fundev/admin/builds/build-release.bat
==============================================================================
--- trunk/fundev/admin/builds/build-release.bat	(original)
+++ trunk/fundev/admin/builds/build-release.bat	Thu May  4 17:47:55 2006
@@ -60,7 +60,7 @@
 echo -   - You should remove <hacker-edition>\bin\projects.txt
 echo -   - If you didn't install the Hacker Edition in the standard location
 echo -     you should use the /dylan argument to specify its location.
-echo -   - It's a good idea to also set FUNCTIONAL_DEVELOPER_DEFAULT_ROOT to
+echo -   - It's a good idea to also set OPEN_DYLAN_DEFAULT_ROOT to
 echo -     the same value passed as the /dylan argument.
 echo -   - You must set the CVSROOT environment variable appropriately.
 echo -   - Some options cause perl scripts to be invoked.  Have perl on your PATH.
@@ -103,10 +103,10 @@
 if "%1"=="/?" GOTO PRINT_USAGE
 
 set ERROR_MESSAGE=
-if "%FUNCTIONAL_DEVELOPER_DEFAULT_ROOT%"=="" set FUNCTIONAL_DEVELOPER_DEFAULT_ROOT=C:\Program Files\Functional Objects\Functional Developer
-set OLD_RELEASE_ROOT=%FUNCTIONAL_DEVELOPER_DEFAULT_ROOT%
-set FUNCTIONAL_DEVELOPER_USER_SOURCES=
-set SAVED_FUNCTIONAL_DEVELOPER_LIBRARY_PACKS=%FUNCTIONAL_DEVELOPER_LIBRARY_PACKS%
+if "%OPEN_DYLAN_DEFAULT_ROOT%"=="" set OPEN_DYLAN_DEFAULT_ROOT=C:\Program Files\Functional Objects\Functional Developer
+set OLD_RELEASE_ROOT=%OPEN_DYLAN_DEFAULT_ROOT%
+set OPEN_DYLAN_USER_SOURCES=
+set SAVED_OPEN_DYLAN_LIBRARY_PACKS=%OPEN_DYLAN_LIBRARY_PACKS%
 set GENERATIONS=3
 set CVS_BRANCH=trunk
 set BOOTSTRAP_TARGET=
@@ -135,7 +135,7 @@
 set RUNTIME_EXPIRATION=none
 set VERBOSE=no
 
-set FUNCTIONAL_DEVELOPER_USER_SOURCES=
+set OPEN_DYLAN_USER_SOURCES=
 
 REM //
 REM // The first argument is the release directory
@@ -258,7 +258,7 @@
 
 :SET_SOURCES
 if "%2"=="" GOTO NO_ARG
-set FUNCTIONAL_DEVELOPER_USER_SOURCES=%2
+set OPEN_DYLAN_USER_SOURCES=%2
 shift
 shift
 goto PARAM_LOOP
@@ -395,8 +395,8 @@
 
 :PARAM_DONE
 call :fixup_PATHS "%OLD_RELEASE_ROOT%"
-if "%FUNCTIONAL_DEVELOPER_USER_SOURCES%"=="" set FUNCTIONAL_DEVELOPER_USER_SOURCES=%NEW_RELEASE_ROOT%\Sources
-set FUNCTIONAL_DEVELOPER_USER_REGISTRIES=%FUNCTIONAL_DEVELOPER_USER_SOURCES%\registry
+if "%OPEN_DYLAN_USER_SOURCES%"=="" set OPEN_DYLAN_USER_SOURCES=%NEW_RELEASE_ROOT%\Sources
+set OPEN_DYLAN_USER_REGISTRIES=%OPEN_DYLAN_USER_SOURCES%\registry
 if "%USE_ENVIRONMENT%"=="no" goto setup_dw_default_build_options
 goto setup_environment_default_build_options
 
@@ -428,9 +428,9 @@
 :SETUP_DEFAULT_RELEASE_OPTIONS
 if "%VERBOSE%"=="yes" set MAKE=nmake /d /nologo
 if "%VERBOSE%"=="no"  set MAKE=nmake /s /nologo
-set FUNCTIONAL_DEVELOPER_RELEASE_SOURCES=%OLD_RELEASE_ROOT%\Sources
-set FUNCTIONAL_DEVELOPER_RELEASE_REGISTRIES=%FUNCTIONAL_DEVELOPER_RELEASE_SOURCES%\registry
-set FUNCTIONAL_DEVELOPER_PLATFORM_NAME=x86-win32
+set OPEN_DYLAN_RELEASE_SOURCES=%OLD_RELEASE_ROOT%\Sources
+set OPEN_DYLAN_RELEASE_REGISTRIES=%OPEN_DYLAN_RELEASE_SOURCES%\registry
+set OPEN_DYLAN_PLATFORM_NAME=x86-win32
 
 REM // Pentium runtime build options
 set PENTIUM_RUNTIME_OPTIONS=
@@ -470,7 +470,7 @@
 :SKIP_SHOW_FAILURE_LOG_OPTION
 set COMMON_BUILD_OPTIONS= -branch %CVS_BRANCH% -nopath
 set BUILD_OPTIONS=-p %NEW_RELEASE_ROOT% -s %OLD_RELEASE_ROOT% %COMMON_BUILD_OPTIONS%
-if not "%FUNCTIONAL_DEVELOPER_USER_SOURCES%"=="" set BUILD_OPTIONS=%BUILD_OPTIONS% -sources %FUNCTIONAL_DEVELOPER_USER_SOURCES%
+if not "%OPEN_DYLAN_USER_SOURCES%"=="" set BUILD_OPTIONS=%BUILD_OPTIONS% -sources %OPEN_DYLAN_USER_SOURCES%
 if "%USE_ENVIRONMENT%"=="yes" set BUILD_OPTIONS=%BUILD_OPTIONS% -environment
 
 REM // Source sanitizing options
@@ -498,124 +498,124 @@
 if "%GENERATIONS%"=="1" goto build_release
 
 :MAYBE_CREATE_BOOTSTRAP_REGISTRY
-set USER_REGISTRY=%FUNCTIONAL_DEVELOPER_USER_SOURCES%\registry
-set FUNCTIONAL_DEVELOPER_USER_REGISTRIES=%FUNCTIONAL_DEVELOPER_USER_SOURCES%\bootstrap1-registry
-if exist "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%" goto build_bootstrap
+set USER_REGISTRY=%OPEN_DYLAN_USER_SOURCES%\registry
+set OPEN_DYLAN_USER_REGISTRIES=%OPEN_DYLAN_USER_SOURCES%\bootstrap1-registry
+if exist "%OPEN_DYLAN_USER_REGISTRIES%" goto build_bootstrap
 if not exist "%USER_REGISTRY%" goto build_bootstrap
 
 :CREATE_BOOTSTRAP_REGISTRY
 echo Creating bootstrap registry
-call ensure-directory %FUNCTIONAL_DEVELOPER_USER_REGISTRIES%
-xcopy /E /I %USER_REGISTRY%\generic %FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic >nul
-xcopy /E /I %USER_REGISTRY%\x86-win32 %FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32 >nul
+call ensure-directory %OPEN_DYLAN_USER_REGISTRIES%
+xcopy /E /I %USER_REGISTRY%\generic %OPEN_DYLAN_USER_REGISTRIES%\generic >nul
+xcopy /E /I %USER_REGISTRY%\x86-win32 %OPEN_DYLAN_USER_REGISTRIES%\x86-win32 >nul
 
 echo Removing runtime registry entries
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\dylan" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\dylan" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\functional-extensions" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\functional-extensions" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\machine-word" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\machine-word" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\byte-vector" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\byte-vector" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\threads" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\threads" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\transcendentals" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\transcendentals" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\functional-dylan" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\functional-dylan" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\common-extensions" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\common-extensions" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\common-dylan" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\common-dylan" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\c-ffi" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\c-ffi" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\bit-vector" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\bit-vector" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\bit-set" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\bit-set" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\collectors" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\collectors" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\plists" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\plists" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\set" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\set" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\table-extensions" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\table-extensions" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\collections" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\collections" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\streams" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\streams" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\standard-io" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\standard-io" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\print" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\print" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\format" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\format" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\format-out" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\format-out" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\io" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\io" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\date" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\date" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\file-system" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\file-system" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\operating-system" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\operating-system" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\locators" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\locators" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\settings" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\settings" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\system" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\system" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\generic-arithmetic" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\generic-arithmetic" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\big-integers" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\big-integers" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\duim-utilities" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\duim-utilities" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\duim-geometry" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\duim-geometry" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\duim-dcs" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\duim-dcs" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\duim-sheets" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\duim-sheets" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\duim-graphics" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\duim-graphics" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\duim-layouts" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\duim-layouts" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\duim-gadgets" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\duim-gadgets" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\duim-frames" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\duim-frames" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\duim-core" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\duim-core" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\duim-extended-geometry" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\duim-extended-geometry" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\duim-gadget-panes" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\duim-gadget-panes" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\win32-duim" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\win32-duim" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\duim" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\duim" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\channels" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\channels" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\commands" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\commands" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\winsock2" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\winsock2" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\sockets" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\sockets" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\network" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\network" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\win32-common" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\win32-common" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\win32-controls" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\win32-controls" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\win32-dde" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\win32-dde" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\win32-dialog" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\win32-dialog" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\win32-gdi" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\win32-gdi" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\win32-html-help" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\win32-html-help" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\win32-kernel" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\win32-kernel" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\win32-registry" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\win32-registry" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\win32-resources" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\win32-resources" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\win32-rich-edit" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\win32-rich-edit" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\win32-shell" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\win32-shell" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\win32-user" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\win32-user" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\win32-version" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\win32-version" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\win32-gl" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\win32-gl" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\win32-glu" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\win32-glu" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\win32-multimedia" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\win32-multimedia" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\midi" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\midi" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\deuce" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\deuce" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\duim-deuce" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\duim-deuce" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\com" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\com" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\ole" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\ole" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\ole-server" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\ole-server" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\win32-automation" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\win32-automation" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\ole-automation" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\ole-automation" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\ole-container" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\ole-container" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\ole-controls" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\ole-controls" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\ole-control-framework" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\ole-control-framework" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\ole-dialogs" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\ole-dialogs" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\duim-ole-container" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\duim-ole-container" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\duim-ole-control" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\duim-ole-control" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\duim-ole-server" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\duim-ole-server" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\sql" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\sql" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\odbc-ffi" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\odbc-ffi" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\sql-odbc" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\sql-odbc" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\corba-dylan" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\corba-dylan" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\corba-protocol" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\corba-protocol" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\dylan-orb" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\dylan-orb" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\iop-protocol" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\iop-protocol" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\ir-protocol" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\ir-protocol" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\ir-stubs" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\ir-stubs" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\orb-connections" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\orb-connections" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\orb-core" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\orb-core" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\orb-iiop" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\orb-iiop" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\orb-ir" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\orb-ir" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\orb-poa" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\orb-poa" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\orb-streams" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\orb-streams" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\orb-utilities" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\orb-utilities" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\portableserver-protocol" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\portableserver-protocol" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\naming-protocol" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\naming-protocol" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\naming-stubs" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\naming-stubs" 2>nul
-del "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\naming-client" "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\naming-client" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\dylan" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\dylan" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\functional-extensions" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\functional-extensions" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\machine-word" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\machine-word" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\byte-vector" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\byte-vector" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\threads" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\threads" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\transcendentals" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\transcendentals" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\functional-dylan" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\functional-dylan" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\common-extensions" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\common-extensions" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\common-dylan" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\common-dylan" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\c-ffi" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\c-ffi" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\bit-vector" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\bit-vector" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\bit-set" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\bit-set" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\collectors" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\collectors" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\plists" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\plists" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\set" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\set" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\table-extensions" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\table-extensions" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\collections" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\collections" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\streams" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\streams" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\standard-io" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\standard-io" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\print" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\print" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\format" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\format" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\format-out" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\format-out" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\io" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\io" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\date" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\date" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\file-system" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\file-system" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\operating-system" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\operating-system" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\locators" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\locators" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\settings" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\settings" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\system" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\system" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\generic-arithmetic" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\generic-arithmetic" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\big-integers" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\big-integers" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\duim-utilities" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\duim-utilities" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\duim-geometry" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\duim-geometry" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\duim-dcs" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\duim-dcs" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\duim-sheets" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\duim-sheets" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\duim-graphics" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\duim-graphics" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\duim-layouts" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\duim-layouts" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\duim-gadgets" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\duim-gadgets" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\duim-frames" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\duim-frames" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\duim-core" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\duim-core" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\duim-extended-geometry" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\duim-extended-geometry" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\duim-gadget-panes" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\duim-gadget-panes" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\win32-duim" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\win32-duim" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\duim" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\duim" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\channels" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\channels" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\commands" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\commands" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\winsock2" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\winsock2" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\sockets" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\sockets" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\network" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\network" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\win32-common" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\win32-common" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\win32-controls" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\win32-controls" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\win32-dde" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\win32-dde" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\win32-dialog" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\win32-dialog" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\win32-gdi" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\win32-gdi" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\win32-html-help" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\win32-html-help" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\win32-kernel" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\win32-kernel" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\win32-registry" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\win32-registry" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\win32-resources" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\win32-resources" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\win32-rich-edit" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\win32-rich-edit" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\win32-shell" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\win32-shell" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\win32-user" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\win32-user" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\win32-version" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\win32-version" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\win32-gl" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\win32-gl" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\win32-glu" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\win32-glu" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\win32-multimedia" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\win32-multimedia" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\midi" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\midi" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\deuce" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\deuce" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\duim-deuce" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\duim-deuce" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\com" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\com" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\ole" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\ole" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\ole-server" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\ole-server" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\win32-automation" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\win32-automation" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\ole-automation" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\ole-automation" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\ole-container" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\ole-container" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\ole-controls" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\ole-controls" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\ole-control-framework" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\ole-control-framework" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\ole-dialogs" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\ole-dialogs" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\duim-ole-container" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\duim-ole-container" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\duim-ole-control" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\duim-ole-control" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\duim-ole-server" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\duim-ole-server" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\sql" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\sql" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\odbc-ffi" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\odbc-ffi" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\sql-odbc" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\sql-odbc" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\corba-dylan" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\corba-dylan" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\corba-protocol" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\corba-protocol" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\dylan-orb" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\dylan-orb" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\iop-protocol" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\iop-protocol" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\ir-protocol" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\ir-protocol" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\ir-stubs" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\ir-stubs" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\orb-connections" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\orb-connections" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\orb-core" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\orb-core" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\orb-iiop" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\orb-iiop" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\orb-ir" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\orb-ir" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\orb-poa" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\orb-poa" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\orb-streams" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\orb-streams" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\orb-utilities" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\orb-utilities" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\portableserver-protocol" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\portableserver-protocol" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\naming-protocol" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\naming-protocol" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\naming-stubs" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\naming-stubs" 2>nul
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\naming-client" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\naming-client" 2>nul
 
 :BUILD_BOOTSTRAP
 echo --------------------------------------------------
 call set-build-variables %BUILD_OPTIONS% -generation 1
-set FUNCTIONAL_DEVELOPER_RELEASE_BUILD=ignore
-set FUNCTIONAL_DEVELOPER_LIBRARY_PACKS=0xFFFF
+set OPEN_DYLAN_RELEASE_BUILD=ignore
+set OPEN_DYLAN_LIBRARY_PACKS=0xFFFF
 set BOOTSTRAP_COMPILER_FILENAME=%COMPILER_FILENAME%
 set BOOTSTRAP_COMPILER_TARGET=%COMPILER_TARGET%
 if "%TIMINGS_ROOT%"=="" set TIMINGS_ROOT=%BOOTSTRAP_ROOT%
@@ -628,7 +628,7 @@
 set BOOTSTRAP_COMPILER_TARGET=%FINAL_COMPILER_TARGET%
 
 :ENSURE_BOOTSTRAP_COMPILER
-if exist "%FUNCTIONAL_DEVELOPER_USER_INSTALL%\bin\%BOOTSTRAP_COMPILER_FILENAME%" goto cont1
+if exist "%OPEN_DYLAN_USER_INSTALL%\bin\%BOOTSTRAP_COMPILER_FILENAME%" goto cont1
 echo Generation 1 build starting at:
 call date /t
 call time /t
@@ -642,91 +642,91 @@
 %MAKE% %QUOTED_OPTIONS% %QUOTED_PENTIUM_RUNTIME_OPTIONS% %BOOTSTRAP_COMPILER_TARGET%
 if %ERRORLEVEL% NEQ 0 goto build_error
 if "%WARNINGS%"=="yes" call show-build-warnings %WARNINGS_OPTIONS%
-if "%TIMINGS%"=="yes" call generate-compiler-timings %FUNCTIONAL_DEVELOPER_BUILD_LOGS%
+if "%TIMINGS%"=="yes" call generate-compiler-timings %OPEN_DYLAN_BUILD_LOGS%
 if "%CLEANUP%"=="no" goto CONT1
-call remove-directory %FUNCTIONAL_DEVELOPER_USER_BUILD%
-call remove-directory %FUNCTIONAL_DEVELOPER_USER_INSTALL%\lib
-call remove-directory %FUNCTIONAL_DEVELOPER_USER_INSTALL%\databases
-call remove-directory %FUNCTIONAL_DEVELOPER_USER_REGISTRIES%
+call remove-directory %OPEN_DYLAN_USER_BUILD%
+call remove-directory %OPEN_DYLAN_USER_INSTALL%\lib
+call remove-directory %OPEN_DYLAN_USER_INSTALL%\databases
+call remove-directory %OPEN_DYLAN_USER_REGISTRIES%
 :CONT1
-set FUNCTIONAL_DEVELOPER_RELEASE_BUILD=
+set OPEN_DYLAN_RELEASE_BUILD=
 echo Generation 1 build completed at:
 call date /t
 call time /t
 
 :MAYBE_COPY_OLD_MANGLER
 REM This enables compiler-bootstrapping with new mangler scheme
-if exist "%DYLAN_RELEASE_ROOT%\bin\old-dfmc-mangling.dll" copy %DYLAN_RELEASE_ROOT%\bin\old-dfmc-mangling.dll %FUNCTIONAL_DEVELOPER_USER_INSTALL%\bin >nul
-if exist "%DYLAN_RELEASE_ROOT%\bin\old-dfmc-mangling.dll" copy %DYLAN_RELEASE_ROOT%\bin\variable-search.dll %FUNCTIONAL_DEVELOPER_USER_INSTALL%\bin >nul
+if exist "%DYLAN_RELEASE_ROOT%\bin\old-dfmc-mangling.dll" copy %DYLAN_RELEASE_ROOT%\bin\old-dfmc-mangling.dll %OPEN_DYLAN_USER_INSTALL%\bin >nul
+if exist "%DYLAN_RELEASE_ROOT%\bin\old-dfmc-mangling.dll" copy %DYLAN_RELEASE_ROOT%\bin\variable-search.dll %OPEN_DYLAN_USER_INSTALL%\bin >nul
 
 :MAYBE_COPY_OLD_VARIABLE_SEARCH
 REM This enables compiler-bootstrapping with new variable-searching
-if exist "%DYLAN_RELEASE_ROOT%\bin\old-variable-search.dll" copy %DYLAN_RELEASE_ROOT%\bin\old-variable-search.dll %FUNCTIONAL_DEVELOPER_USER_INSTALL%\bin\variable-search.dll >nul
+if exist "%DYLAN_RELEASE_ROOT%\bin\old-variable-search.dll" copy %DYLAN_RELEASE_ROOT%\bin\old-variable-search.dll %OPEN_DYLAN_USER_INSTALL%\bin\variable-search.dll >nul
 
-if exist "%FUNCTIONAL_DEVELOPER_USER_INSTALL%\bin\%OLD_RUNTIME_PREFIX%fundyl.dll" goto maybe_copy_bootstrap_registry
-if exist "%FUNCTIONAL_DEVELOPER_USER_INSTALL%\bin\%RUNTIME_PREFIX%fundyl.dll" goto maybe_copy_bootstrap_registry
+if exist "%OPEN_DYLAN_USER_INSTALL%\bin\%OLD_RUNTIME_PREFIX%fundyl.dll" goto maybe_copy_bootstrap_registry
+if exist "%OPEN_DYLAN_USER_INSTALL%\bin\%RUNTIME_PREFIX%fundyl.dll" goto maybe_copy_bootstrap_registry
 echo Installing DLLs from old release %DYLAN_RELEASE_ROOT%
-copy %DYLAN_RELEASE_ROOT%\bin\equal-table.dll %FUNCTIONAL_DEVELOPER_USER_INSTALL%\bin 1>nul 2>nul
+copy %DYLAN_RELEASE_ROOT%\bin\equal-table.dll %OPEN_DYLAN_USER_INSTALL%\bin 1>nul 2>nul
 
 REM // Copy redistributable libraries (including those from a previous version)
 REM // Be careful not to wipe out redistributable libraries
 set OLD_LIBRARIES=bin
 if exist "%DYLAN_RELEASE_ROOT%\Redistributable" set OLD_LIBRARIES=Redistributable
-call ensure-directory %FUNCTIONAL_DEVELOPER_USER_INSTALL%\Bin\temp
-move %FUNCTIONAL_DEVELOPER_USER_INSTALL%\Bin\%RUNTIME_PREFIX%*.dll %FUNCTIONAL_DEVELOPER_USER_INSTALL%\Bin\temp >nul
-copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\%OLD_RUNTIME_PREFIX%*.dll %FUNCTIONAL_DEVELOPER_USER_INSTALL%\Bin 1>nul 2>nul
-copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\%RUNTIME_PREFIX%*.dll %FUNCTIONAL_DEVELOPER_USER_INSTALL%\Bin 1>nul 2>nul
-copy %FUNCTIONAL_DEVELOPER_USER_INSTALL%\Bin\temp\*.dll %FUNCTIONAL_DEVELOPER_USER_INSTALL%\Bin >nul
-REM call remove-directory %FUNCTIONAL_DEVELOPER_USER_INSTALL%\Bin\temp
+call ensure-directory %OPEN_DYLAN_USER_INSTALL%\Bin\temp
+move %OPEN_DYLAN_USER_INSTALL%\Bin\%RUNTIME_PREFIX%*.dll %OPEN_DYLAN_USER_INSTALL%\Bin\temp >nul
+copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\%OLD_RUNTIME_PREFIX%*.dll %OPEN_DYLAN_USER_INSTALL%\Bin 1>nul 2>nul
+copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\%RUNTIME_PREFIX%*.dll %OPEN_DYLAN_USER_INSTALL%\Bin 1>nul 2>nul
+copy %OPEN_DYLAN_USER_INSTALL%\Bin\temp\*.dll %OPEN_DYLAN_USER_INSTALL%\Bin >nul
+REM call remove-directory %OPEN_DYLAN_USER_INSTALL%\Bin\temp
 
 REM // These DLLs might exist if DLL merging didn't take place
-copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\dylan.dll %FUNCTIONAL_DEVELOPER_USER_INSTALL%\bin >nul
-copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\functional-extensions.dll %FUNCTIONAL_DEVELOPER_USER_INSTALL%\bin >nul
-copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\machine-word.dll %FUNCTIONAL_DEVELOPER_USER_INSTALL%\bin >nul
-copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\byte-vector.dll %FUNCTIONAL_DEVELOPER_USER_INSTALL%\bin >nul
-copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\threads.dll %FUNCTIONAL_DEVELOPER_USER_INSTALL%\bin >nul
-copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\transcendentals.dll %FUNCTIONAL_DEVELOPER_USER_INSTALL%\bin >nul
-
-copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\bit-vector.dll %FUNCTIONAL_DEVELOPER_USER_INSTALL%\bin >nul
-copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\bit-set.dll %FUNCTIONAL_DEVELOPER_USER_INSTALL%\bin >nul
-copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\collectors.dll %FUNCTIONAL_DEVELOPER_USER_INSTALL%\bin >nul
-copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\plists.dll %FUNCTIONAL_DEVELOPER_USER_INSTALL%\bin >nul
-copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\set.dll %FUNCTIONAL_DEVELOPER_USER_INSTALL%\bin >nul
-copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\table-extensions.dll %FUNCTIONAL_DEVELOPER_USER_INSTALL%\bin >nul
-
-copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\streams.dll %FUNCTIONAL_DEVELOPER_USER_INSTALL%\bin >nul
-copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\print.dll %FUNCTIONAL_DEVELOPER_USER_INSTALL%\bin >nul
-copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\standard-io.dll %FUNCTIONAL_DEVELOPER_USER_INSTALL%\bin >nul
-copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\format.dll %FUNCTIONAL_DEVELOPER_USER_INSTALL%\bin >nul
-copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\format-out.dll %FUNCTIONAL_DEVELOPER_USER_INSTALL%\bin >nul
-
-copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\date.dll %FUNCTIONAL_DEVELOPER_USER_INSTALL%\bin >nul
-copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\file-system.dll %FUNCTIONAL_DEVELOPER_USER_INSTALL%\bin >nul
-copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\locators.dll %FUNCTIONAL_DEVELOPER_USER_INSTALL%\bin >nul
-copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\operating-system.dll %FUNCTIONAL_DEVELOPER_USER_INSTALL%\bin >nul
-copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\settings.dll %FUNCTIONAL_DEVELOPER_USER_INSTALL%\bin >nul
+copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\dylan.dll %OPEN_DYLAN_USER_INSTALL%\bin >nul
+copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\functional-extensions.dll %OPEN_DYLAN_USER_INSTALL%\bin >nul
+copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\machine-word.dll %OPEN_DYLAN_USER_INSTALL%\bin >nul
+copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\byte-vector.dll %OPEN_DYLAN_USER_INSTALL%\bin >nul
+copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\threads.dll %OPEN_DYLAN_USER_INSTALL%\bin >nul
+copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\transcendentals.dll %OPEN_DYLAN_USER_INSTALL%\bin >nul
+
+copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\bit-vector.dll %OPEN_DYLAN_USER_INSTALL%\bin >nul
+copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\bit-set.dll %OPEN_DYLAN_USER_INSTALL%\bin >nul
+copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\collectors.dll %OPEN_DYLAN_USER_INSTALL%\bin >nul
+copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\plists.dll %OPEN_DYLAN_USER_INSTALL%\bin >nul
+copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\set.dll %OPEN_DYLAN_USER_INSTALL%\bin >nul
+copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\table-extensions.dll %OPEN_DYLAN_USER_INSTALL%\bin >nul
+
+copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\streams.dll %OPEN_DYLAN_USER_INSTALL%\bin >nul
+copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\print.dll %OPEN_DYLAN_USER_INSTALL%\bin >nul
+copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\standard-io.dll %OPEN_DYLAN_USER_INSTALL%\bin >nul
+copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\format.dll %OPEN_DYLAN_USER_INSTALL%\bin >nul
+copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\format-out.dll %OPEN_DYLAN_USER_INSTALL%\bin >nul
+
+copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\date.dll %OPEN_DYLAN_USER_INSTALL%\bin >nul
+copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\file-system.dll %OPEN_DYLAN_USER_INSTALL%\bin >nul
+copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\locators.dll %OPEN_DYLAN_USER_INSTALL%\bin >nul
+copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\operating-system.dll %OPEN_DYLAN_USER_INSTALL%\bin >nul
+copy %DYLAN_RELEASE_ROOT%\%OLD_LIBRARIES%\settings.dll %OPEN_DYLAN_USER_INSTALL%\bin >nul
 
 :MAYBE_COPY_BOOTSTRAP_REGISTRY
 if exist "%USER_REGISTRY%" goto finish_bootstrap
-if not exist "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%" goto finish_bootstrap
+if not exist "%OPEN_DYLAN_USER_REGISTRIES%" goto finish_bootstrap
 echo Copying bootstrap registry entries to main registry
 call ensure-directory %USER_REGISTRY%
 call ensure-directory %USER_REGISTRY%\generic
 call ensure-directory %USER_REGISTRY%\x86-win32
-copy %FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\*.* %USER_REGISTRY%\generic >nul
-xcopy /E /I %FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\generic\CVS %USER_REGISTRY%\generic\CVS >nul
-copy %FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\*.* %USER_REGISTRY%\x86-win32 >nul
-xcopy /E /I %FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\x86-win32\CVS %USER_REGISTRY%\x86-win32\CVS >nul
+copy %OPEN_DYLAN_USER_REGISTRIES%\generic\*.* %USER_REGISTRY%\generic >nul
+xcopy /E /I %OPEN_DYLAN_USER_REGISTRIES%\generic\CVS %USER_REGISTRY%\generic\CVS >nul
+copy %OPEN_DYLAN_USER_REGISTRIES%\x86-win32\*.* %USER_REGISTRY%\x86-win32 >nul
+xcopy /E /I %OPEN_DYLAN_USER_REGISTRIES%\x86-win32\CVS %USER_REGISTRY%\x86-win32\CVS >nul
 
 :FINISH_BOOTSTRAP
-set FUNCTIONAL_DEVELOPER_USER_REGISTRIES=%USER_REGISTRY%
+set OPEN_DYLAN_USER_REGISTRIES=%USER_REGISTRY%
 set /a GENERATION=2
 
 :BUILD_NEXT_GENERATION
 if "%GENERATION%"=="%GENERATIONS%" goto build_release
 echo --------------------------------------------------
 call set-build-variables %BUILD_OPTIONS% -generation %GENERATION%
-set FUNCTIONAL_DEVELOPER_LIBRARY_PACKS=0xFFFF
+set OPEN_DYLAN_LIBRARY_PACKS=0xFFFF
 set /a NEXT_GENERATION=%GENERATION%
 set /a NEXT_GENERATION+=1
 set /a NEXT_BUT_ONE_GENERATION=%NEXT_GENERATION%
@@ -742,7 +742,7 @@
 set BOOTSTRAP_COMPILER_TARGET=%FINAL_COMPILER_TARGET%
 
 :ENSURE_NEXT_GENERATION
-if exist "%FUNCTIONAL_DEVELOPER_USER_INSTALL%\bin\%BOOTSTRAP_COMPILER_FILENAME%" goto cont_next
+if exist "%OPEN_DYLAN_USER_INSTALL%\bin\%BOOTSTRAP_COMPILER_FILENAME%" goto cont_next
 echo Generation %GENERATION% build starting at:
 call date /t
 call time /t
@@ -750,11 +750,11 @@
 %MAKE% %QUOTED_OPTIONS% %QUOTED_PENTIUM_RUNTIME_OPTIONS% %BOOTSTRAP_COMPILER_TARGET%
 if %ERRORLEVEL% NEQ 0 goto build_error
 if "%WARNINGS%"=="yes" call show-build-warnings %WARNINGS_OPTIONS%
-if "%TIMINGS%"=="yes" call generate-compiler-timings %FUNCTIONAL_DEVELOPER_BUILD_LOGS%
+if "%TIMINGS%"=="yes" call generate-compiler-timings %OPEN_DYLAN_BUILD_LOGS%
 if "%CLEANUP%"=="no" goto CONT_NEXT
-call remove-directory %FUNCTIONAL_DEVELOPER_USER_BUILD%
-call remove-directory %FUNCTIONAL_DEVELOPER_USER_INSTALL%\lib
-call remove-directory %FUNCTIONAL_DEVELOPER_USER_INSTALL%\databases
+call remove-directory %OPEN_DYLAN_USER_BUILD%
+call remove-directory %OPEN_DYLAN_USER_INSTALL%\lib
+call remove-directory %OPEN_DYLAN_USER_INSTALL%\databases
 
 :CONT_NEXT
 echo Generation %GENERATION% build completed at:
@@ -786,7 +786,7 @@
 :START_BUILD
 echo --------------------------------------------------
 call set-build-variables %BUILD_OPTIONS% -final-generation %GENERATIONS%
-set FUNCTIONAL_DEVELOPER_LIBRARY_PACKS=0xFFFF
+set OPEN_DYLAN_LIBRARY_PACKS=0xFFFF
 echo Final generation build starting at:
 call date /t
 call time /t
@@ -794,18 +794,18 @@
 %MAKE% %QUOTED_OPTIONS% %QUOTED_PENTIUM_RUNTIME_OPTIONS% %QUOTED_RUNTIME_OPTIONS% %QUOTED_CHECKOUT_OPTIONS% %RELEASE_TARGET%
 if %ERRORLEVEL% NEQ 0 goto build_error
 if "%WARNINGS%"=="yes" call show-build-warnings %WARNINGS_OPTIONS%
-if "%TIMINGS%"=="yes" call generate-compiler-timings %FUNCTIONAL_DEVELOPER_BUILD_LOGS%
+if "%TIMINGS%"=="yes" call generate-compiler-timings %OPEN_DYLAN_BUILD_LOGS%
 echo Build of %RELEASE_TARGET% completed at:
 call date /t
 call time /t
 if "%TIMINGS_ROOT%"=="/ORR" set TIMINGS_ROOT=%OLD_RELEASE_ROOT%
-if "%COMPARE_TIMINGS%"=="yes" call compare-timings %TIMINGS_ROOT%\logs %FUNCTIONAL_DEVELOPER_BUILD_LOGS%
-set PATH=%FUNCTIONAL_DEVELOPER_USER_INSTALL%\bin;%PATH%
-set FUNCTIONAL_DEVELOPER_LIBRARY_PACKS=%SAVED_FUNCTIONAL_DEVELOPER_LIBRARY_PACKS%
+if "%COMPARE_TIMINGS%"=="yes" call compare-timings %TIMINGS_ROOT%\logs %OPEN_DYLAN_BUILD_LOGS%
+set PATH=%OPEN_DYLAN_USER_INSTALL%\bin;%PATH%
+set OPEN_DYLAN_LIBRARY_PACKS=%SAVED_OPEN_DYLAN_LIBRARY_PACKS%
 
 :TEST_BUILD
 if "%TEST%"=="no" goto end
-call test-release %NEW_RELEASE_ROOT% -dylan %OLD_RELEASE_ROOT% -target test-%RELEASE_TARGET% -sources %FUNCTIONAL_DEVELOPER_USER_SOURCES%
+call test-release %NEW_RELEASE_ROOT% -dylan %OLD_RELEASE_ROOT% -target test-%RELEASE_TARGET% -sources %OPEN_DYLAN_USER_SOURCES%
 goto end
 
 :fixup_PATHS
@@ -838,7 +838,7 @@
 goto generate_error
 
 :GENERATE_ERROR
-set FUNCTIONAL_DEVELOPER_LIBRARY_PACKS=%SAVED_FUNCTIONAL_DEVELOPER_LIBRARY_PACKS%
+set OPEN_DYLAN_LIBRARY_PACKS=%SAVED_OPEN_DYLAN_LIBRARY_PACKS%
 bogus-command-to-cause-an-error-exit 2>nul
 
 :END

Modified: trunk/fundev/admin/builds/compile-library.bat
==============================================================================
--- trunk/fundev/admin/builds/compile-library.bat	(original)
+++ trunk/fundev/admin/builds/compile-library.bat	Thu May  4 17:47:55 2006
@@ -218,7 +218,7 @@
 
 if "%MAYBE%"=="no" goto setup_compile
 
-if exist "%FUNCTIONAL_DEVELOPER_USER_INSTALL%\bin\%LIBRARY_TARGET%.%EXT%" goto success 
+if exist "%OPEN_DYLAN_USER_INSTALL%\bin\%LIBRARY_TARGET%.%EXT%" goto success 
 
 :SETUP_COMPILE
 
@@ -227,7 +227,7 @@
 
 :COMPILER_FOUND
 
-set LOG=%FUNCTIONAL_DEVELOPER_BUILD_LOGS%\compile-%LIBRARY%.log
+set LOG=%OPEN_DYLAN_BUILD_LOGS%\compile-%LIBRARY%.log
 set BUILD=%DYLAN_RELEASE_ROOT%\bin\build
 set OPERATION=Building
 set COMPILER_OPTIONS=/messages:internal
@@ -242,7 +242,7 @@
 if "%EXPORTS%"=="yes" set COMPILER_OPTIONS=/gnu-exports %COMPILER_OPTIONS%
 if "%DEBUG%"=="min" set COMPILER_OPTIONS=/debug:min %COMPILER_OPTIONS%
 if "%DEBUG%"=="no" set COMPILER_OPTIONS=/debug:none %COMPILER_OPTIONS%
-if "%BUILD_COUNTS%"=="ignore" set FUNCTIONAL_DEVELOPER_MAJOR_MINOR_CHECKS_ONLY=yes
+if "%BUILD_COUNTS%"=="ignore" set OPEN_DYLAN_MAJOR_MINOR_CHECKS_ONLY=yes
 
 :FIND_DEBUGGER
 set DEBUGGER=%DYLAN_RELEASE_ROOT%\bin\batch-debug.exe
@@ -298,7 +298,7 @@
 goto generate_error
 
 :DEBUG_FAILURE
-set LOG=%FUNCTIONAL_DEVELOPER_BUILD_LOGS%\debug-compile-%LIBRARY%.log
+set LOG=%OPEN_DYLAN_BUILD_LOGS%\debug-compile-%LIBRARY%.log
 echo %OPERATION% %LIBRARY% again under debugger
 call %DEBUGGER% %DYLAN_RELEASE_COMPILER% %COMPILER_OPTIONS% /debugger %PROJECT% > %LOG%
 if "%SHOW_FAILURE_LOG%"=="yes" goto verbose_build_error

Modified: trunk/fundev/admin/builds/cvs-checkout.bat
==============================================================================
--- trunk/fundev/admin/builds/cvs-checkout.bat	(original)
+++ trunk/fundev/admin/builds/cvs-checkout.bat	Thu May  4 17:47:55 2006
@@ -28,7 +28,7 @@
 set CVS_BRANCH_ARG=-r %DYLAN_CVS_BRANCH%
 
 :CHECKOUT
-set LOG=%FUNCTIONAL_DEVELOPER_CVS_LOGS%\checkout-%NAME%.log
+set LOG=%OPEN_DYLAN_CVS_LOGS%\checkout-%NAME%.log
 
 if "%UNIT%"=="" goto checkout_TREE
 pushd %PARENT%

Modified: trunk/fundev/admin/builds/ensure-application.bat
==============================================================================
--- trunk/fundev/admin/builds/ensure-application.bat	(original)
+++ trunk/fundev/admin/builds/ensure-application.bat	Thu May  4 17:47:55 2006
@@ -15,9 +15,9 @@
 set LIBRARY=%1%
 
 :ENSURE_APPLICATION
-if exist "%FUNCTIONAL_DEVELOPER_RELEASE_INSTALL%\bin\%LIBRARY%.exe" goto end
-if exist "%FUNCTIONAL_DEVELOPER_USER_INSTALL%\bin\%LIBRARY%.exe" goto end
-if exist "%FUNCTIONAL_DEVELOPER_USER_BUILD%\%LIBRARY%\dylanmakefile.mkf" goto link
+if exist "%OPEN_DYLAN_RELEASE_INSTALL%\bin\%LIBRARY%.exe" goto end
+if exist "%OPEN_DYLAN_USER_INSTALL%\bin\%LIBRARY%.exe" goto end
+if exist "%OPEN_DYLAN_USER_BUILD%\%LIBRARY%\dylanmakefile.mkf" goto link
 nmake %NMAKE_OPTIONS% OPTIONS="%OPTIONS%" %LIBRARY%
 if %ERRORLEVEL% NEQ 0 goto generateerror
 goto end

Modified: trunk/fundev/admin/builds/ensure-library.bat
==============================================================================
--- trunk/fundev/admin/builds/ensure-library.bat	(original)
+++ trunk/fundev/admin/builds/ensure-library.bat	Thu May  4 17:47:55 2006
@@ -71,16 +71,16 @@
 if not "%LIBRARY_TARGET%"=="%OLD_LIBRARY_TARGET%" echo  [old dll %OLD_LIBRARY_TARGET%.dll]
 
 :CONT2
-if "%FUNCTIONAL_DEVELOPER_RELEASE_INSTALL%"=="%FUNCTIONAL_DEVELOPER_USER_INSTALL%" goto ensure_library
+if "%OPEN_DYLAN_RELEASE_INSTALL%"=="%OPEN_DYLAN_USER_INSTALL%" goto ensure_library
 if exist "%WINDIR%\%LIBRARY_TARGET%" goto end
 
 :ENSURE_LIBRARY
 
-if exist "%FUNCTIONAL_DEVELOPER_RELEASE_INSTALL%\bin\%LIBRARY_TARGET%.dll" goto end
-if exist "%FUNCTIONAL_DEVELOPER_RELEASE_INSTALL%\bin\%OLD_LIBRARY_TARGET%.dll" goto found_old_target
-if exist "%FUNCTIONAL_DEVELOPER_USER_INSTALL%\bin\%LIBRARY_TARGET%.dll" goto end
-if exist "%FUNCTIONAL_DEVELOPER_USER_BUILD%\%LIBRARY%\dylanmakefile.mkf" goto link
-if exist "%FUNCTIONAL_DEVELOPER_RELEASE_ROOT%\Build\%LIBRARY%\dylanmakefile.mkf" goto system_link
+if exist "%OPEN_DYLAN_RELEASE_INSTALL%\bin\%LIBRARY_TARGET%.dll" goto end
+if exist "%OPEN_DYLAN_RELEASE_INSTALL%\bin\%OLD_LIBRARY_TARGET%.dll" goto found_old_target
+if exist "%OPEN_DYLAN_USER_INSTALL%\bin\%LIBRARY_TARGET%.dll" goto end
+if exist "%OPEN_DYLAN_USER_BUILD%\%LIBRARY%\dylanmakefile.mkf" goto link
+if exist "%OPEN_DYLAN_RELEASE_ROOT%\Build\%LIBRARY%\dylanmakefile.mkf" goto system_link
 
 if "%QUIET%" == "yes" set NMAKE_OPTIONS=/s /nologo
 if "%QUIET%" == "no" set NMAKE_OPTIONS=/d /nologo

Modified: trunk/fundev/admin/builds/ensure-registry-entry.bat
==============================================================================
--- trunk/fundev/admin/builds/ensure-registry-entry.bat	(original)
+++ trunk/fundev/admin/builds/ensure-registry-entry.bat	Thu May  4 17:47:55 2006
@@ -3,10 +3,10 @@
 
 set LIBRARY=%1%
 set REGISTRY=%2%
-set LOG=%FUNCTIONAL_DEVELOPER_CVS_LOGS%\checkout-%LIBRARY%-registry-entry.log
+set LOG=%OPEN_DYLAN_CVS_LOGS%\checkout-%LIBRARY%-registry-entry.log
 
-if exist "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%" goto set_BRANCH
-mkdir %FUNCTIONAL_DEVELOPER_USER_REGISTRIES%
+if exist "%OPEN_DYLAN_USER_REGISTRIES%" goto set_BRANCH
+mkdir %OPEN_DYLAN_USER_REGISTRIES%
 if %ERRORLEVEL% NEQ 0 goto generate_error
 
 :set_BRANCH
@@ -16,9 +16,9 @@
 set CVS_BRANCH_ARG=-r %DYLAN_CVS_BRANCH%
 
 :CHECKOUT
-if exist "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%\%REGISTRY%\%LIBRARY%" goto DONE
+if exist "%OPEN_DYLAN_USER_REGISTRIES%\%REGISTRY%\%LIBRARY%" goto DONE
 echo Checking out registry entry for %LIBRARY%
-pushd %FUNCTIONAL_DEVELOPER_USER_REGISTRIES%
+pushd %OPEN_DYLAN_USER_REGISTRIES%
 cvs -q -r checkout -d %REGISTRY% %CVS_BRANCH_ARG% fundev/Sources/registry/%REGISTRY%/%LIBRARY% > %LOG%
 set saved_ERRORLEVEL=%ERRORLEVEL%
 popd

Modified: trunk/fundev/admin/builds/ensure-release-area.bat
==============================================================================
--- trunk/fundev/admin/builds/ensure-release-area.bat	(original)
+++ trunk/fundev/admin/builds/ensure-release-area.bat	Thu May  4 17:47:55 2006
@@ -1,24 +1,24 @@
 @echo off
 
 :ENSURE_CVS_LOGS
-if exist "%FUNCTIONAL_DEVELOPER_CVS_LOGS%" goto ensure_build_logs
-mkdir %FUNCTIONAL_DEVELOPER_CVS_LOGS%
+if exist "%OPEN_DYLAN_CVS_LOGS%" goto ensure_build_logs
+mkdir %OPEN_DYLAN_CVS_LOGS%
 
 :ENSURE_BUILD_LOGS
-if exist "%FUNCTIONAL_DEVELOPER_BUILD_LOGS%" goto ensure_build
-mkdir %FUNCTIONAL_DEVELOPER_BUILD_LOGS%
+if exist "%OPEN_DYLAN_BUILD_LOGS%" goto ensure_build
+mkdir %OPEN_DYLAN_BUILD_LOGS%
 
 :ENSURE_BUILD
-if exist "%FUNCTIONAL_DEVELOPER_USER_BUILD%" goto ensure_bin
-mkdir %FUNCTIONAL_DEVELOPER_USER_BUILD%
+if exist "%OPEN_DYLAN_USER_BUILD%" goto ensure_bin
+mkdir %OPEN_DYLAN_USER_BUILD%
 
 :ENSURE_BIN
-if exist "%FUNCTIONAL_DEVELOPER_USER_INSTALL%"\bin goto ensure_lib
-mkdir %FUNCTIONAL_DEVELOPER_USER_INSTALL%\bin
+if exist "%OPEN_DYLAN_USER_INSTALL%"\bin goto ensure_lib
+mkdir %OPEN_DYLAN_USER_INSTALL%\bin
 
 :ENSURE_LIB
-if exist "%FUNCTIONAL_DEVELOPER_USER_INSTALL%"\lib goto end
-mkdir %FUNCTIONAL_DEVELOPER_USER_INSTALL%\lib
+if exist "%OPEN_DYLAN_USER_INSTALL%"\lib goto end
+mkdir %OPEN_DYLAN_USER_INSTALL%\lib
 goto end
 
 :END

Modified: trunk/fundev/admin/builds/fdmake.pl
==============================================================================
--- trunk/fundev/admin/builds/fdmake.pl	(original)
+++ trunk/fundev/admin/builds/fdmake.pl	Thu May  4 17:47:55 2006
@@ -7,16 +7,16 @@
 
 my $lidfile_line;
 
-my $platform_name = $ENV{'FUNCTIONAL_DEVELOPER_PLATFORM_NAME'};
+my $platform_name = $ENV{'OPEN_DYLAN_PLATFORM_NAME'};
 
-my $user_root = $ENV{'FUNCTIONAL_DEVELOPER_USER_ROOT'};
-my $user_build = $ENV{'FUNCTIONAL_DEVELOPER_USER_BUILD'};
-my $user_install = $ENV{'FUNCTIONAL_DEVELOPER_USER_INSTALL'};
-my $user_projects = $ENV{'FUNCTIONAL_DEVELOPER_USER_PROJECTS'};
-my $user_registries = $ENV{'FUNCTIONAL_DEVELOPER_USER_REGISTRIES'};
-my $user_sources = $ENV{'FUNCTIONAL_DEVELOPER_USER_SOURCES'};
+my $user_root = $ENV{'OPEN_DYLAN_USER_ROOT'};
+my $user_build = $ENV{'OPEN_DYLAN_USER_BUILD'};
+my $user_install = $ENV{'OPEN_DYLAN_USER_INSTALL'};
+my $user_projects = $ENV{'OPEN_DYLAN_USER_PROJECTS'};
+my $user_registries = $ENV{'OPEN_DYLAN_USER_REGISTRIES'};
+my $user_sources = $ENV{'OPEN_DYLAN_USER_SOURCES'};
 
-my $build_logs = $ENV{'FUNCTIONAL_DEVELOPER_BUILD_LOGS'};
+my $build_logs = $ENV{'OPEN_DYLAN_BUILD_LOGS'};
 
 my $verbose;
 my $debugger;

Modified: trunk/fundev/admin/builds/generate-idl-bindings.bat
==============================================================================
--- trunk/fundev/admin/builds/generate-idl-bindings.bat	(original)
+++ trunk/fundev/admin/builds/generate-idl-bindings.bat	Thu May  4 17:47:55 2006
@@ -146,11 +146,11 @@
 if exist "%COMPILER%" goto compiler_found
 set COMPILER=%OLD_RELEASE_ROOT%\bin\console-scepter.exe
 if exist "%COMPILER%" goto compiler_found
-set COMPILER=%FUNCTIONAL_DEVELOPER_DEFAULT_ROOT%\Bin\console-scepter.exe
+set COMPILER=%OPEN_DYLAN_DEFAULT_ROOT%\Bin\console-scepter.exe
 
 :COMPILER_FOUND
 
-set LOG=%FUNCTIONAL_DEVELOPER_BUILD_LOGS%\generate-%IDL%.log
+set LOG=%OPEN_DYLAN_BUILD_LOGS%\generate-%IDL%.log
 set OPERATION=Generating IDL bindings for %IDL%.idl
 set COMPILER_OPTIONS=/language:dylan /clean
 if "%PROTOCOL%"=="yes" set COMPILER_OPTIONS=%COMPILER_OPTIONS% /protocol
@@ -212,7 +212,7 @@
 goto generate_error
 
 :DEBUG_FAILURE
-set LOG=%FUNCTIONAL_DEVELOPER_BUILD_LOGS%\debug-generate-%IDL%.log
+set LOG=%OPEN_DYLAN_BUILD_LOGS%\debug-generate-%IDL%.log
 echo %OPERATION% again under debugger
 call %DEBUGGER% %COMPILER% %COMPILER_OPTIONS% /debugger > %LOG%
 if "%SHOW_FAILURE_LOG%"=="yes" goto verbose_build_error

Modified: trunk/fundev/admin/builds/generate-parser.bat
==============================================================================
--- trunk/fundev/admin/builds/generate-parser.bat	(original)
+++ trunk/fundev/admin/builds/generate-parser.bat	Thu May  4 17:47:55 2006
@@ -73,7 +73,7 @@
 
 :COMPILER_FOUND
 
-set LOG=%FUNCTIONAL_DEVELOPER_BUILD_LOGS%\generate-%DYLAN_FILE%.log
+set LOG=%OPEN_DYLAN_BUILD_LOGS%\generate-%DYLAN_FILE%.log
 set OPERATION=Generating parser for %GRAMMAR_FILE%
 set COMPILER_OPTIONS=%GRAMMAR_FILE% %DYLAN_DIRECTORY%\%DYLAN_FILE%.dylan
 
@@ -124,7 +124,7 @@
 goto generate_error
 
 :DEBUG_FAILURE
-set LOG=%FUNCTIONAL_DEVELOPER_BUILD_LOGS%\debug-generate-%IDL%.log
+set LOG=%OPEN_DYLAN_BUILD_LOGS%\debug-generate-%IDL%.log
 echo %OPERATION% again under debugger
 call %DEBUGGER% %COMPILER% %COMPILER_OPTIONS% /debugger > %LOG%
 if "%SHOW_FAILURE_LOG%"=="yes" goto verbose_build_error

Modified: trunk/fundev/admin/builds/import-project.bat
==============================================================================
--- trunk/fundev/admin/builds/import-project.bat	(original)
+++ trunk/fundev/admin/builds/import-project.bat	Thu May  4 17:47:55 2006
@@ -10,7 +10,7 @@
 set EXT=
 set MODE=tight
 set QUIET=yes
-if "%FUNCTIONAL_DEVELOPER_DEFAULT_ROOT%"=="" set FUNCTIONAL_DEVELOPER_DEFAULT_ROOT=C:\Program Files\Functional Objects\Functional Developer
+if "%OPEN_DYLAN_DEFAULT_ROOT%"=="" set OPEN_DYLAN_DEFAULT_ROOT=C:\Program Files\Functional Objects\Functional Developer
 
 REM //
 REM // Loop through the command line arguments //
@@ -101,19 +101,19 @@
 if exist "%DYLAN_RELEASE_COMPILER%" goto compiler_found
 REM // Try what we just built
 REM //
-set DYLAN_RELEASE_COMPILER=%FUNCTIONAL_DEVELOPER_RELEASE_ROOT%\bin\pentium-dw.exe
+set DYLAN_RELEASE_COMPILER=%OPEN_DYLAN_RELEASE_ROOT%\bin\pentium-dw.exe
 if exist "%DYLAN_RELEASE_COMPILER%" goto compiler_found
-set DYLAN_RELEASE_COMPILER=%FUNCTIONAL_DEVELOPER_RELEASE_ROOT%\bin\basic-pentium-dw.exe
+set DYLAN_RELEASE_COMPILER=%OPEN_DYLAN_RELEASE_ROOT%\bin\basic-pentium-dw.exe
 if exist "%DYLAN_RELEASE_COMPILER%" goto compiler_found
-set DYLAN_RELEASE_COMPILER=%FUNCTIONAL_DEVELOPER_RELEASE_ROOT%\bin\personal-pentium-dw.exe
+set DYLAN_RELEASE_COMPILER=%OPEN_DYLAN_RELEASE_ROOT%\bin\personal-pentium-dw.exe
 if exist "%DYLAN_RELEASE_COMPILER%" goto compiler_found
-set DYLAN_RELEASE_COMPILER=%FUNCTIONAL_DEVELOPER_RELEASE_ROOT%\bin\fdbc.exe
+set DYLAN_RELEASE_COMPILER=%OPEN_DYLAN_RELEASE_ROOT%\bin\fdbc.exe
 if exist "%DYLAN_RELEASE_COMPILER%" goto compiler_found
-set DYLAN_RELEASE_COMPILER=%FUNCTIONAL_DEVELOPER_RELEASE_ROOT%\bin\dylan-compile.exe
+set DYLAN_RELEASE_COMPILER=%OPEN_DYLAN_RELEASE_ROOT%\bin\dylan-compile.exe
 if exist "%DYLAN_RELEASE_COMPILER%" goto compiler_found
 REM //... finally hope that we can find it on the path.
 REM //
-set DYLAN_RELEASE_COMPILER=%FUNCTIONAL_DEVELOPER_DEFAULT_ROOT%\bin\fdbc.exe
+set DYLAN_RELEASE_COMPILER=%OPEN_DYLAN_DEFAULT_ROOT%\bin\fdbc.exe
 if exist "%DYLAN_RELEASE_COMPILER%" goto compiler_found
 set DYLAN_RELEASE_COMPILER=fdbc.exe
 
@@ -128,13 +128,13 @@
 set DEBUGGER_OPERATION=under debugger
 set DEBUGGER=%DYLAN_RELEASE_ROOT%\bin\batch-debug.exe
 if exist "%DEBUGGER%" goto start_import
-set DEBUGGER=%FUNCTIONAL_DEVELOPER_DEFAULT_ROOT%\bin\batch-debug.exe
+set DEBUGGER=%OPEN_DYLAN_DEFAULT_ROOT%\bin\batch-debug.exe
 if exist "%DEBUGGER%" goto start_import
 set DEBUGGER=batch-debug
 
 :START_IMPORT
 call :fixup_PATHS "%DEBUGGER%"
-set LOG=%FUNCTIONAL_DEVELOPER_BUILD_LOGS%\import-%PROJECT%.log
+set LOG=%OPEN_DYLAN_BUILD_LOGS%\import-%PROJECT%.log
 set COMPILER_OPTIONS=/%MODE%
 set LID_PATHNAME=%DIRECTORY%\%LID%.lid
 set INCORRECT_HDP_PATHNAME=%DIRECTORY%\%LID%.hdp
@@ -143,13 +143,13 @@
 if "%DLL%"=="yes" set COMPILER_OPTIONS=/dll %COMPILER_OPTIONS% 
 if "%DLL%"=="no" set COMPILER_OPTIONS=/exe %COMPILER_OPTIONS%
 
-REM // Locally unbind the FUNCTIONAL_DEVELOPER_USER settings so that these
+REM // Locally unbind the OPEN_DYLAN_USER settings so that these
 REM // projects are built as if by a user.
-set FUNCTIONAL_DEVELOPER_USER_PROJECTS=
-set FUNCTIONAL_DEVELOPER_USER_REGISTRIES=
-set FUNCTIONAL_DEVELOPER_USER_BUILD=
-set FUNCTIONAL_DEVELOPER_USER_INSTALL=
-set FUNCTIONAL_DEVELOPER_USER_ROOT=
+set OPEN_DYLAN_USER_PROJECTS=
+set OPEN_DYLAN_USER_REGISTRIES=
+set OPEN_DYLAN_USER_BUILD=
+set OPEN_DYLAN_USER_INSTALL=
+set OPEN_DYLAN_USER_ROOT=
 
 echo Importing %PROJECT% %DEBUGGER_OPERATION%
 if "%QUIET%"=="yes" goto start_quiet_import

Modified: trunk/fundev/admin/builds/remove-application.bat
==============================================================================
--- trunk/fundev/admin/builds/remove-application.bat	(original)
+++ trunk/fundev/admin/builds/remove-application.bat	Thu May  4 17:47:55 2006
@@ -3,7 +3,7 @@
 set LIBRARY=%1%
 
 echo Removing %LIBRARY%
-call remove-directory %FUNCTIONAL_DEVELOPER_USER_BUILD%\%LIBRARY%
-call remove-file %FUNCTIONAL_DEVELOPER_USER_INSTALL%\databases\%LIBRARY%.ddb
-call remove-file %FUNCTIONAL_DEVELOPER_USER_INSTALL%\bin\%LIBRARY%.exe
-call remove-file %FUNCTIONAL_DEVELOPER_USER_INSTALL%\lib\%LIBRARY%.lib
+call remove-directory %OPEN_DYLAN_USER_BUILD%\%LIBRARY%
+call remove-file %OPEN_DYLAN_USER_INSTALL%\databases\%LIBRARY%.ddb
+call remove-file %OPEN_DYLAN_USER_INSTALL%\bin\%LIBRARY%.exe
+call remove-file %OPEN_DYLAN_USER_INSTALL%\lib\%LIBRARY%.lib

Modified: trunk/fundev/admin/builds/remove-library.bat
==============================================================================
--- trunk/fundev/admin/builds/remove-library.bat	(original)
+++ trunk/fundev/admin/builds/remove-library.bat	Thu May  4 17:47:55 2006
@@ -13,9 +13,9 @@
 goto remove_library
 
 :REMOVE_LIBRARY
-call remove-directory %FUNCTIONAL_DEVELOPER_USER_BUILD%\%LIBRARY%
-call remove-file %FUNCTIONAL_DEVELOPER_USER_INSTALL%\databases\%LIBRARY%.ddb
-call remove-file %FUNCTIONAL_DEVELOPER_USER_INSTALL%\lib\%LIBRARY%.mkf
-call remove-file %FUNCTIONAL_DEVELOPER_USER_INSTALL%\lib\%LIBRARY_TARGET%.lib
-call remove-file %FUNCTIONAL_DEVELOPER_USER_INSTALL%\lib\%LIBRARY_TARGET%.defs
-call remove-file %FUNCTIONAL_DEVELOPER_USER_INSTALL%\bin\%LIBRARY_TARGET%.dll
+call remove-directory %OPEN_DYLAN_USER_BUILD%\%LIBRARY%
+call remove-file %OPEN_DYLAN_USER_INSTALL%\databases\%LIBRARY%.ddb
+call remove-file %OPEN_DYLAN_USER_INSTALL%\lib\%LIBRARY%.mkf
+call remove-file %OPEN_DYLAN_USER_INSTALL%\lib\%LIBRARY_TARGET%.lib
+call remove-file %OPEN_DYLAN_USER_INSTALL%\lib\%LIBRARY_TARGET%.defs
+call remove-file %OPEN_DYLAN_USER_INSTALL%\bin\%LIBRARY_TARGET%.dll

Modified: trunk/fundev/admin/builds/run-test.bat
==============================================================================
--- trunk/fundev/admin/builds/run-test.bat	(original)
+++ trunk/fundev/admin/builds/run-test.bat	Thu May  4 17:47:55 2006
@@ -18,7 +18,7 @@
 
 :SETUP_REQUIRED_ARGUMENTS
 set TEST_APP=%1%
-set TEST_FULL_NAME=%FUNCTIONAL_DEVELOPER_USER_INSTALL%\bin\%TEST_APP%.exe
+set TEST_FULL_NAME=%OPEN_DYLAN_USER_INSTALL%\bin\%TEST_APP%.exe
 set TEST_NAME=%2%
 set FORMATTED=%3%
 shift
@@ -45,22 +45,22 @@
 
 :FIND_TEST_REPORT
 call ensure-application test-report
-set TEST_REPORT=%FUNCTIONAL_DEVELOPER_USER_INSTALL%\bin\test-report.exe
+set TEST_REPORT=%OPEN_DYLAN_USER_INSTALL%\bin\test-report.exe
 if exist "%TEST_REPORT%" goto setup_variables
 set TEST_REPORT=%DYLAN_RELEASE_ROOT%\bin\test-report.exe
 if not exist "%TEST_REPORT%" goto no_test_report
 
 :SETUP_VARIABLES
 set LOG_NAME=test-%TEST_NAME%.log
-set LOG=%FUNCTIONAL_DEVELOPER_BUILD_LOGS%\%LOG_NAME%
+set LOG=%OPEN_DYLAN_BUILD_LOGS%\%LOG_NAME%
 set OLD_LOG_DIRECTORY=%OLD_RELEASE_ROOT%\qa\logs
 set OLD_LOG=%OLD_LOG_DIRECTORY%\%LOG_NAME%
-set REPORT_LOG=%FUNCTIONAL_DEVELOPER_BUILD_LOGS%\diff-%TEST_NAME%.log
+set REPORT_LOG=%OPEN_DYLAN_BUILD_LOGS%\diff-%TEST_NAME%.log
 
 :FIND_DEBUGGER
 set DEBUGGER=
 if "%DEBUG%"=="no" goto run_test
-set DEBUGGER=%FUNCTIONAL_DEVELOPER_RELEASE_ROOT%\bin\batch-debug.exe
+set DEBUGGER=%OPEN_DYLAN_RELEASE_ROOT%\bin\batch-debug.exe
 if exist "%DEBUGGER%" goto run_test
 set DEBUGGER=C:\Program Files\Functional Objects\Functional Developer\bin\batch-debug.exe
 if exist "%DEBUGGER%" goto run_test
@@ -71,7 +71,7 @@
 if not exist "%TEST_FULL_NAME%" goto no_app
 
 echo Testing %TEST_NAME% %DEBUGGER_OPERATION%
-set PATH=%FUNCTIONAL_DEVELOPER_RELEASE_ROOT%\Redistributable;%FUNCTIONAL_DEVELOPER_RELEASE_ROOT%\Bin;%PATH%
+set PATH=%OPEN_DYLAN_RELEASE_ROOT%\Redistributable;%OPEN_DYLAN_RELEASE_ROOT%\Bin;%PATH%
 if "%QUIET%"=="no" echo Path=%PATH%
 if "%QUIET%"=="no" echo Running: %DEBUGGER% %TEST_FULL_NAME% -progress -report log %COMMAND_ARGS%
 %DEBUGGER% %TEST_FULL_NAME% -progress -report log %COMMAND_ARGS% > %LOG%

Modified: trunk/fundev/admin/builds/set-build-variables.bash
==============================================================================
--- trunk/fundev/admin/builds/set-build-variables.bash	(original)
+++ trunk/fundev/admin/builds/set-build-variables.bash	Thu May  4 17:47:55 2006
@@ -97,14 +97,14 @@
 ## Export the release variables
 ##
 
-export FUNCTIONAL_DEVELOPER_PLATFORM_NAME=$platform_name
-export FUNCTIONAL_DEVELOPER_RELEASE="$root/"
-export FUNCTIONAL_DEVELOPER_RELEASE_REGISTRIES="$FUNCTIONAL_DEVELOPER_RELEASE/sources/registry/"
+export OPEN_DYLAN_PLATFORM_NAME=$platform_name
+export OPEN_DYLAN_RELEASE="$root/"
+export OPEN_DYLAN_RELEASE_REGISTRIES="$OPEN_DYLAN_RELEASE/sources/registry/"
 case $target_platform in
     x86-win32 | sparc-solaris2 | sparc-sunos4 | alpha-osf3)
-        export FUNCTIONAL_DEVELOPER_RELEASE_INSTALL=$FUNCTIONAL_DEVELOPER_RELEASE/platforms/$platform_name ;;
+        export OPEN_DYLAN_RELEASE_INSTALL=$OPEN_DYLAN_RELEASE/platforms/$platform_name ;;
     pentium)
-        export FUNCTIONAL_DEVELOPER_RELEASE_INSTALL=$FUNCTIONAL_DEVELOPER_RELEASE ;;
+        export OPEN_DYLAN_RELEASE_INSTALL=$OPEN_DYLAN_RELEASE ;;
     *) echo "$0 - Error - unsupported target platform $target_platform"
        exit 3 ;;
 esac
@@ -122,37 +122,37 @@
     *) echo "$0 - Error - unsupported target platform $target_platform"
        exit 3 ;;
 esac
-export FUNCTIONAL_DEVELOPER_USER_ROOT="$personal_root/"
-export FUNCTIONAL_DEVELOPER_USER_REGISTRIES=$sources_directory/registry
-export FUNCTIONAL_DEVELOPER_USER_BUILD=$build_directory
-export FUNCTIONAL_DEVELOPER_USER_INSTALL=$install_directory
+export OPEN_DYLAN_USER_ROOT="$personal_root/"
+export OPEN_DYLAN_USER_REGISTRIES=$sources_directory/registry
+export OPEN_DYLAN_USER_BUILD=$build_directory
+export OPEN_DYLAN_USER_INSTALL=$install_directory
 
 ## Other build settings
 ##
-export FUNCTIONAL_DEVELOPER_C_FLAGS="-g -O"
-LD_LIBRARY_PATH=$FUNCTIONAL_DEVELOPER_USER_INSTALL/lib:$FUNCTIONAL_DEVELOPER_RELEASE_INSTALL/lib:$LD_LIBRARY_PATH
+export OPEN_DYLAN_C_FLAGS="-g -O"
+LD_LIBRARY_PATH=$OPEN_DYLAN_USER_INSTALL/lib:$OPEN_DYLAN_RELEASE_INSTALL/lib:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH
 export TMPDIR=/usr/tmp
 
 ## Setup vars for linking ##
 ##
 case $linking_type in
- dynamic) case $FUNCTIONAL_DEVELOPER_PLATFORM_NAME in
-	   alpha-osf3) export FUNCTIONAL_DEVELOPER_LIB_SUFFIX="so"
-		       export FUNCTIONAL_DEVELOPER_LD="ld -shared"
-		       export FUNCTIONAL_DEVELOPER_LINKLIB_FLAGS="-expect_unresolved '*'" ;;
-           sparc-solaris2) export FUNCTIONAL_DEVELOPER_LIB_SUFFIX="so"
-                           export FUNCTIONAL_DEVELOPER_LD="ld -G" ;;
-           *) export FUNCTIONAL_DEVELOPER_LIB_SUFFIX="a"
-              export FUNCTIONAL_DEVELOPER_LD="ld -r" ;;
+ dynamic) case $OPEN_DYLAN_PLATFORM_NAME in
+	   alpha-osf3) export OPEN_DYLAN_LIB_SUFFIX="so"
+		       export OPEN_DYLAN_LD="ld -shared"
+		       export OPEN_DYLAN_LINKLIB_FLAGS="-expect_unresolved '*'" ;;
+           sparc-solaris2) export OPEN_DYLAN_LIB_SUFFIX="so"
+                           export OPEN_DYLAN_LD="ld -G" ;;
+           *) export OPEN_DYLAN_LIB_SUFFIX="a"
+              export OPEN_DYLAN_LD="ld -r" ;;
 	  esac ;;
- static) export FUNCTIONAL_DEVELOPER_LIB_SUFFIX="a"
-         export FUNCTIONAL_DEVELOPER_LD="ld -r" ;;
+ static) export OPEN_DYLAN_LIB_SUFFIX="a"
+         export OPEN_DYLAN_LD="ld -r" ;;
 esac
 
 ## *** Remove these old names when the project manager is updated
-export FUNCTIONAL_DEVELOPER_PROJECTS_BUILD=$FUNCTIONAL_DEVELOPER_USER_BUILD
-export FUNCTIONAL_DEVELOPER_PROJECTS_INSTALL=$FUNCTIONAL_DEVELOPER_USER_INSTALL
+export OPEN_DYLAN_PROJECTS_BUILD=$OPEN_DYLAN_USER_BUILD
+export OPEN_DYLAN_PROJECTS_INSTALL=$OPEN_DYLAN_USER_INSTALL
 
 echo "-----------------------------------------------------------------------"
 echo "                         Environment Settings                          "

Modified: trunk/fundev/admin/builds/set-build-variables.bat
==============================================================================
--- trunk/fundev/admin/builds/set-build-variables.bat	(original)
+++ trunk/fundev/admin/builds/set-build-variables.bat	Thu May  4 17:47:55 2006
@@ -107,19 +107,19 @@
 If "%1%"=="help" GOTO PRINT_USAGE
 If "%1%"=="-help" GOTO PRINT_USAGE
 If "%1%"=="?" GOTO PRINT_USAGE
-set FUNCTIONAL_DEVELOPER_RELEASE_ROOT=
-set FUNCTIONAL_DEVELOPER_RELEASE_SOURCES=
-set FUNCTIONAL_DEVELOPER_RELEASE_INSTALL=
-set FUNCTIONAL_DEVELOPER_USER_ROOT=
-set FUNCTIONAL_DEVELOPER_USER_SOURCES=
-set FUNCTIONAL_DEVELOPER_USER_BUILD=
-set FUNCTIONAL_DEVELOPER_USER_INSTALL=
+set OPEN_DYLAN_RELEASE_ROOT=
+set OPEN_DYLAN_RELEASE_SOURCES=
+set OPEN_DYLAN_RELEASE_INSTALL=
+set OPEN_DYLAN_USER_ROOT=
+set OPEN_DYLAN_USER_SOURCES=
+set OPEN_DYLAN_USER_BUILD=
+set OPEN_DYLAN_USER_INSTALL=
 set DYLAN_SYSTEM_DRIVE=
 set ERROR_MESSAGE=
 set BACK_END=pentium
 set GENERATION=
 set FINAL_GENERATION=
-if "%FUNCTIONAL_DEVELOPER_DEFAULT_ROOT%"=="" set FUNCTIONAL_DEVELOPER_DEFAULT_ROOT=C:\Program Files\Functional Objects\Functional Developer
+if "%OPEN_DYLAN_DEFAULT_ROOT%"=="" set OPEN_DYLAN_DEFAULT_ROOT=C:\Program Files\Functional Objects\Functional Developer
 set DYLAN_CVS_BRANCH=
 set DYLAN_RELEASE_ROOT=
 set NOPATH=
@@ -185,57 +185,57 @@
 
 :SET_ROOT
 If "%2%"=="" GOTO NO_ARG
-set FUNCTIONAL_DEVELOPER_RELEASE_ROOT=%2%
+set OPEN_DYLAN_RELEASE_ROOT=%2%
 shift
 shift
 goto PARAM_LOOP
 
 :SET_USER_ROOT
 If "%2%"=="" GOTO NO_ARG
-set FUNCTIONAL_DEVELOPER_USER_ROOT=%2%
+set OPEN_DYLAN_USER_ROOT=%2%
 shift
 shift
 goto PARAM_LOOP
 
 :SET_USER_SOURCES
 If "%2%"=="" GOTO NO_ARG
-set FUNCTIONAL_DEVELOPER_USER_SOURCES=%2%
+set OPEN_DYLAN_USER_SOURCES=%2%
 shift
 shift
 goto PARAM_LOOP
 
 :SET_USER_INSTALL
 If "%2%"=="" GOTO NO_ARG
-set FUNCTIONAL_DEVELOPER_USER_INSTALL=%2%
+set OPEN_DYLAN_USER_INSTALL=%2%
 shift
 shift
 goto PARAM_LOOP
 
 :SET_USER_BUILD
 If "%2%"=="" GOTO NO_ARG
-set FUNCTIONAL_DEVELOPER_USER_BUILD=%2%
+set OPEN_DYLAN_USER_BUILD=%2%
 shift
 shift
 goto PARAM_LOOP
 
 :SET_RELEASE_SOURCES
 If "%2%"=="" GOTO NO_ARG
-set FUNCTIONAL_DEVELOPER_RELEASE_SOURCES=%2%
+set OPEN_DYLAN_RELEASE_SOURCES=%2%
 shift
 shift
 goto PARAM_LOOP
 
 :SET_RELEASE_INSTALL
 If "%2%"=="" GOTO NO_ARG
-set FUNCTIONAL_DEVELOPER_RELEASE_INSTALL=%2%
+set OPEN_DYLAN_RELEASE_INSTALL=%2%
 shift
 shift
 goto PARAM_LOOP
 
 :SET_BOTH_ROOTS
 If "%2%"=="" GOTO NO_ARG
-set FUNCTIONAL_DEVELOPER_USER_ROOT=%2%
-set FUNCTIONAL_DEVELOPER_RELEASE_ROOT=%2%
+set OPEN_DYLAN_USER_ROOT=%2%
+set OPEN_DYLAN_RELEASE_ROOT=%2%
 shift
 shift
 goto PARAM_LOOP
@@ -286,41 +286,41 @@
 REM //
 :PARAM_DONE
 
-If "%FUNCTIONAL_DEVELOPER_RELEASE_ROOT%"=="" set FUNCTIONAL_DEVELOPER_RELEASE_ROOT=%FUNCTIONAL_DEVELOPER_DEFAULT_ROOT%
-If "%DYLAN_RELEASE_ROOT%"=="" set DYLAN_RELEASE_ROOT=%FUNCTIONAL_DEVELOPER_RELEASE_ROOT%
-call :fixup_PATHS "%FUNCTIONAL_DEVELOPER_RELEASE_ROOT%" "%DYLAN_RELEASE_ROOT%"
+If "%OPEN_DYLAN_RELEASE_ROOT%"=="" set OPEN_DYLAN_RELEASE_ROOT=%OPEN_DYLAN_DEFAULT_ROOT%
+If "%DYLAN_RELEASE_ROOT%"=="" set DYLAN_RELEASE_ROOT=%OPEN_DYLAN_RELEASE_ROOT%
+call :fixup_PATHS "%OPEN_DYLAN_RELEASE_ROOT%" "%DYLAN_RELEASE_ROOT%"
 If "%DYLAN_CVS_BRANCH%"==""   set DYLAN_CVS_BRANCH=trunk
-If "%FUNCTIONAL_DEVELOPER_USER_ROOT%"=="" goto :NO_PR
+If "%OPEN_DYLAN_USER_ROOT%"=="" goto :NO_PR
 
 REM //
 REM // Default user variables //
 REM //
 
-if "%FUNCTIONAL_DEVELOPER_USER_SOURCES%"=="" set FUNCTIONAL_DEVELOPER_CVS_LOGS=%FUNCTIONAL_DEVELOPER_USER_ROOT%\logs
-if "%FUNCTIONAL_DEVELOPER_USER_SOURCES%"=="" set FUNCTIONAL_DEVELOPER_USER_SOURCES=%FUNCTIONAL_DEVELOPER_USER_ROOT%\Sources
-if "%FUNCTIONAL_DEVELOPER_USER_INSTALL%"=="" set FUNCTIONAL_DEVELOPER_USER_INSTALL=%FUNCTIONAL_DEVELOPER_USER_ROOT%
-if "%FUNCTIONAL_DEVELOPER_USER_BUILD%"=="" set FUNCTIONAL_DEVELOPER_BUILD_LOGS=%FUNCTIONAL_DEVELOPER_USER_ROOT%\logs
-if "%FUNCTIONAL_DEVELOPER_USER_BUILD%"=="" set FUNCTIONAL_DEVELOPER_USER_BUILD=%FUNCTIONAL_DEVELOPER_USER_ROOT%\Build
-set FUNCTIONAL_DEVELOPER_USER_REGISTRIES=%FUNCTIONAL_DEVELOPER_USER_SOURCES%\registry
-if "%FUNCTIONAL_DEVELOPER_CVS_LOGS%"=="" set FUNCTIONAL_DEVELOPER_CVS_LOGS=%FUNCTIONAL_DEVELOPER_USER_SOURCES%\..\logs
-if "%FUNCTIONAL_DEVELOPER_BUILD_LOGS%"=="" set FUNCTIONAL_DEVELOPER_BUILD_LOGS=%FUNCTIONAL_DEVELOPER_USER_BUILD%\..\logs
+if "%OPEN_DYLAN_USER_SOURCES%"=="" set OPEN_DYLAN_CVS_LOGS=%OPEN_DYLAN_USER_ROOT%\logs
+if "%OPEN_DYLAN_USER_SOURCES%"=="" set OPEN_DYLAN_USER_SOURCES=%OPEN_DYLAN_USER_ROOT%\Sources
+if "%OPEN_DYLAN_USER_INSTALL%"=="" set OPEN_DYLAN_USER_INSTALL=%OPEN_DYLAN_USER_ROOT%
+if "%OPEN_DYLAN_USER_BUILD%"=="" set OPEN_DYLAN_BUILD_LOGS=%OPEN_DYLAN_USER_ROOT%\logs
+if "%OPEN_DYLAN_USER_BUILD%"=="" set OPEN_DYLAN_USER_BUILD=%OPEN_DYLAN_USER_ROOT%\Build
+set OPEN_DYLAN_USER_REGISTRIES=%OPEN_DYLAN_USER_SOURCES%\registry
+if "%OPEN_DYLAN_CVS_LOGS%"=="" set OPEN_DYLAN_CVS_LOGS=%OPEN_DYLAN_USER_SOURCES%\..\logs
+if "%OPEN_DYLAN_BUILD_LOGS%"=="" set OPEN_DYLAN_BUILD_LOGS=%OPEN_DYLAN_USER_BUILD%\..\logs
 
 REM //
 REM // Default release variables //
 REM //
 
 set DYLAN_RELEASE_ROOT=%DYLAN_SYSTEM_DRIVE%%DYLAN_RELEASE_ROOT%
-set FUNCTIONAL_DEVELOPER_RELEASE_ROOT=%DYLAN_SYSTEM_DRIVE%%FUNCTIONAL_DEVELOPER_RELEASE_ROOT%
-if "%FUNCTIONAL_DEVELOPER_RELEASE_SOURCES%"=="" set FUNCTIONAL_DEVELOPER_RELEASE_SOURCES=%FUNCTIONAL_DEVELOPER_RELEASE_ROOT%\Sources
-if "%FUNCTIONAL_DEVELOPER_RELEASE_INSTALL%"=="" set FUNCTIONAL_DEVELOPER_RELEASE_INSTALL=%FUNCTIONAL_DEVELOPER_RELEASE_ROOT%
-set FUNCTIONAL_DEVELOPER_PLATFORM_NAME=x86-win32
+set OPEN_DYLAN_RELEASE_ROOT=%DYLAN_SYSTEM_DRIVE%%OPEN_DYLAN_RELEASE_ROOT%
+if "%OPEN_DYLAN_RELEASE_SOURCES%"=="" set OPEN_DYLAN_RELEASE_SOURCES=%OPEN_DYLAN_RELEASE_ROOT%\Sources
+if "%OPEN_DYLAN_RELEASE_INSTALL%"=="" set OPEN_DYLAN_RELEASE_INSTALL=%OPEN_DYLAN_RELEASE_ROOT%
+set OPEN_DYLAN_PLATFORM_NAME=x86-win32
 
 REM //
 REM // Set the path
 REM // (is there anyway to stop it growing everytime we get invoked?)
 REM //
 
-If "%BACK_END%"=="pentium" IF "%NOPATH%"=="" set PATH=%FUNCTIONAL_DEVELOPER_USER_INSTALL%\bin;%FUNCTIONAL_DEVELOPER_RELEASE_INSTALL%\bin;%PATH%
+If "%BACK_END%"=="pentium" IF "%NOPATH%"=="" set PATH=%OPEN_DYLAN_USER_INSTALL%\bin;%OPEN_DYLAN_RELEASE_INSTALL%\bin;%PATH%
 
 REM //
 REM // Patchup to handle different generations
@@ -331,38 +331,38 @@
 goto setup_middle_generation
 
 :SETUP_GENERATION1
-set BOOTSTRAP_ROOT=%FUNCTIONAL_DEVELOPER_USER_ROOT%\Bootstrap.1
-set FUNCTIONAL_DEVELOPER_USER_BUILD=%BOOTSTRAP_ROOT%\Build
-set FUNCTIONAL_DEVELOPER_BUILD_LOGS=%BOOTSTRAP_ROOT%\logs
-set FUNCTIONAL_DEVELOPER_USER_INSTALL=%BOOTSTRAP_ROOT%
-set FUNCTIONAL_DEVELOPER_USER_REGISTRIES=%FUNCTIONAL_DEVELOPER_USER_SOURCES%\bootstrap1-registry
+set BOOTSTRAP_ROOT=%OPEN_DYLAN_USER_ROOT%\Bootstrap.1
+set OPEN_DYLAN_USER_BUILD=%BOOTSTRAP_ROOT%\Build
+set OPEN_DYLAN_BUILD_LOGS=%BOOTSTRAP_ROOT%\logs
+set OPEN_DYLAN_USER_INSTALL=%BOOTSTRAP_ROOT%
+set OPEN_DYLAN_USER_REGISTRIES=%OPEN_DYLAN_USER_SOURCES%\bootstrap1-registry
 goto finish_setup
 
 :SETUP_MIDDLE_GENERATION
 set BOOTSTRAP_GENERATION=%GENERATION%
 set /a BOOTSTRAP_GENERATION-=1
-set DYLAN_RELEASE_ROOT=%FUNCTIONAL_DEVELOPER_USER_ROOT%\Bootstrap.%BOOTSTRAP_GENERATION%
-set BOOTSTRAP_ROOT=%FUNCTIONAL_DEVELOPER_USER_ROOT%\Bootstrap.%GENERATION%
-set FUNCTIONAL_DEVELOPER_USER_BUILD=%BOOTSTRAP_ROOT%\Build
-set FUNCTIONAL_DEVELOPER_BUILD_LOGS=%BOOTSTRAP_ROOT%\logs
-set FUNCTIONAL_DEVELOPER_USER_INSTALL=%BOOTSTRAP_ROOT%
-set FUNCTIONAL_DEVELOPER_RELEASE_ROOT=%FUNCTIONAL_DEVELOPER_USER_ROOT%
-set FUNCTIONAL_DEVELOPER_RELEASE_SOURCES=%FUNCTIONAL_DEVELOPER_USER_SOURCES%
-set FUNCTIONAL_DEVELOPER_RELEASE_INSTALL=%FUNCTIONAL_DEVELOPER_USER_INSTALL%
+set DYLAN_RELEASE_ROOT=%OPEN_DYLAN_USER_ROOT%\Bootstrap.%BOOTSTRAP_GENERATION%
+set BOOTSTRAP_ROOT=%OPEN_DYLAN_USER_ROOT%\Bootstrap.%GENERATION%
+set OPEN_DYLAN_USER_BUILD=%BOOTSTRAP_ROOT%\Build
+set OPEN_DYLAN_BUILD_LOGS=%BOOTSTRAP_ROOT%\logs
+set OPEN_DYLAN_USER_INSTALL=%BOOTSTRAP_ROOT%
+set OPEN_DYLAN_RELEASE_ROOT=%OPEN_DYLAN_USER_ROOT%
+set OPEN_DYLAN_RELEASE_SOURCES=%OPEN_DYLAN_USER_SOURCES%
+set OPEN_DYLAN_RELEASE_INSTALL=%OPEN_DYLAN_USER_INSTALL%
 goto finish_setup
 
 :SETUP_FINAL_GENERATION
 set BOOTSTRAP_GENERATION=%FINAL_GENERATION%
 set /a BOOTSTRAP_GENERATION-=1
-if not "%BOOTSTRAP_GENERATION%"=="0" set DYLAN_RELEASE_ROOT=%FUNCTIONAL_DEVELOPER_USER_ROOT%\Bootstrap.%BOOTSTRAP_GENERATION%
-set FUNCTIONAL_DEVELOPER_RELEASE_ROOT=%FUNCTIONAL_DEVELOPER_USER_ROOT%
-set FUNCTIONAL_DEVELOPER_RELEASE_SOURCES=%FUNCTIONAL_DEVELOPER_USER_SOURCES%
-set FUNCTIONAL_DEVELOPER_RELEASE_INSTALL=%FUNCTIONAL_DEVELOPER_USER_INSTALL%
-set FUNCTIONAL_DEVELOPER_BUILD_LOGS=%FUNCTIONAL_DEVELOPER_USER_ROOT%\logs
+if not "%BOOTSTRAP_GENERATION%"=="0" set DYLAN_RELEASE_ROOT=%OPEN_DYLAN_USER_ROOT%\Bootstrap.%BOOTSTRAP_GENERATION%
+set OPEN_DYLAN_RELEASE_ROOT=%OPEN_DYLAN_USER_ROOT%
+set OPEN_DYLAN_RELEASE_SOURCES=%OPEN_DYLAN_USER_SOURCES%
+set OPEN_DYLAN_RELEASE_INSTALL=%OPEN_DYLAN_USER_INSTALL%
+set OPEN_DYLAN_BUILD_LOGS=%OPEN_DYLAN_USER_ROOT%\logs
 goto finish_setup
 
 :FINISH_SETUP
-set FUNCTIONAL_DEVELOPER_RELEASE_REGISTRIES=%FUNCTIONAL_DEVELOPER_RELEASE_SOURCES%\registry
+set OPEN_DYLAN_RELEASE_REGISTRIES=%OPEN_DYLAN_RELEASE_SOURCES%\registry
 if "%USE_ENVIRONMENT%"=="yes" goto find_console_compiler
 call find-compiler
 goto describe_build
@@ -378,15 +378,15 @@
 if "%QUIET%"=="yes" goto end
 if not "%FINAL_GENERATION%"=="" goto describe_final_generation
 if not "%GENERATION%"=="" goto describe_build_generation
-echo Build in %FUNCTIONAL_DEVELOPER_USER_ROOT%
+echo Build in %OPEN_DYLAN_USER_ROOT%
 goto describe_settings
 
 :DESCRIBE_BUILD_GENERATION
-echo Generation %GENERATION% build in %FUNCTIONAL_DEVELOPER_USER_ROOT%
+echo Generation %GENERATION% build in %OPEN_DYLAN_USER_ROOT%
 goto describe_settings
 
 :DESCRIBE_FINAL_GENERATION
-echo Final build in %FUNCTIONAL_DEVELOPER_USER_ROOT%
+echo Final build in %OPEN_DYLAN_USER_ROOT%
 goto describe_settings
 
 REM //
@@ -396,44 +396,44 @@
 :DESCRIBE_SETTINGS
 echo   [Compiler:           %DYLAN_RELEASE_COMPILER%]
 
-if "%FUNCTIONAL_DEVELOPER_RELEASE_ROOT%"=="%FUNCTIONAL_DEVELOPER_USER_ROOT%" goto skip_release_settings
-echo   [Bootstrap root:     %FUNCTIONAL_DEVELOPER_RELEASE_ROOT%]
-if "%FUNCTIONAL_DEVELOPER_RELEASE_SOURCES%"=="%FUNCTIONAL_DEVELOPER_RELEASE_ROOT%\Sources" goto skip_release_sources
-echo   [Bootstrap sources:  %FUNCTIONAL_DEVELOPER_RELEASE_SOURCES%]
+if "%OPEN_DYLAN_RELEASE_ROOT%"=="%OPEN_DYLAN_USER_ROOT%" goto skip_release_settings
+echo   [Bootstrap root:     %OPEN_DYLAN_RELEASE_ROOT%]
+if "%OPEN_DYLAN_RELEASE_SOURCES%"=="%OPEN_DYLAN_RELEASE_ROOT%\Sources" goto skip_release_sources
+echo   [Bootstrap sources:  %OPEN_DYLAN_RELEASE_SOURCES%]
 
 :SKIP_RELEASE_SOURCES
-if "%FUNCTIONAL_DEVELOPER_RELEASE_REGISTRIES%"=="%FUNCTIONAL_DEVELOPER_RELEASE_SOURCES%\registry" goto skip_release_registries
-echo   [Bootstrap registry: %FUNCTIONAL_DEVELOPER_RELEASE_REGISTRIES%]
+if "%OPEN_DYLAN_RELEASE_REGISTRIES%"=="%OPEN_DYLAN_RELEASE_SOURCES%\registry" goto skip_release_registries
+echo   [Bootstrap registry: %OPEN_DYLAN_RELEASE_REGISTRIES%]
 
 :SKIP_RELEASE_REGISTRIES
-if "%FUNCTIONAL_DEVELOPER_RELEASE_INSTALL%"=="%FUNCTIONAL_DEVELOPER_RELEASE_ROOT%" goto skip_release_settings
-if "%FUNCTIONAL_DEVELOPER_RELEASE_INSTALL%"=="%FUNCTIONAL_DEVELOPER_USER_INSTALL%" goto skip_release_settings
-echo   [Bootstrap install:  %FUNCTIONAL_DEVELOPER_RELEASE_INSTALL%]
+if "%OPEN_DYLAN_RELEASE_INSTALL%"=="%OPEN_DYLAN_RELEASE_ROOT%" goto skip_release_settings
+if "%OPEN_DYLAN_RELEASE_INSTALL%"=="%OPEN_DYLAN_USER_INSTALL%" goto skip_release_settings
+echo   [Bootstrap install:  %OPEN_DYLAN_RELEASE_INSTALL%]
 
 :SKIP_RELEASE_SETTINGS
 if "%DYLAN_CVS_BRANCH%"=="trunk" goto skip_cvs_branch
 echo   [CVS branch:         %DYLAN_CVS_BRANCH%]
 
 :SKIP_CVS_BRANCH
-echo   [CVS logs:           %FUNCTIONAL_DEVELOPER_CVS_LOGS%]
+echo   [CVS logs:           %OPEN_DYLAN_CVS_LOGS%]
 
-if "%FUNCTIONAL_DEVELOPER_USER_SOURCES%"=="%FUNCTIONAL_DEVELOPER_USER_ROOT%\Sources" goto skip_sources
-echo   [Sources:            %FUNCTIONAL_DEVELOPER_USER_SOURCES%]
+if "%OPEN_DYLAN_USER_SOURCES%"=="%OPEN_DYLAN_USER_ROOT%\Sources" goto skip_sources
+echo   [Sources:            %OPEN_DYLAN_USER_SOURCES%]
 
 :SKIP_SOURCES
-if "%FUNCTIONAL_DEVELOPER_USER_REGISTRIES%"=="%FUNCTIONAL_DEVELOPER_USER_SOURCES%\registry" goto skip_registries
-echo   [Registry:           %FUNCTIONAL_DEVELOPER_USER_REGISTRIES%]
+if "%OPEN_DYLAN_USER_REGISTRIES%"=="%OPEN_DYLAN_USER_SOURCES%\registry" goto skip_registries
+echo   [Registry:           %OPEN_DYLAN_USER_REGISTRIES%]
 
 :SKIP_REGISTRIES
-if "%FUNCTIONAL_DEVELOPER_USER_INSTALL%"=="%FUNCTIONAL_DEVELOPER_USER_ROOT%" goto skip_install
-echo   [Install:            %FUNCTIONAL_DEVELOPER_USER_INSTALL%]
+if "%OPEN_DYLAN_USER_INSTALL%"=="%OPEN_DYLAN_USER_ROOT%" goto skip_install
+echo   [Install:            %OPEN_DYLAN_USER_INSTALL%]
 
 :SKIP_INSTALL
-if "%FUNCTIONAL_DEVELOPER_USER_BUILD%"=="%FUNCTIONAL_DEVELOPER_USER_ROOT%\Build" goto skip_build
-echo   [Build:              %FUNCTIONAL_DEVELOPER_USER_BUILD%]
+if "%OPEN_DYLAN_USER_BUILD%"=="%OPEN_DYLAN_USER_ROOT%\Build" goto skip_build
+echo   [Build:              %OPEN_DYLAN_USER_BUILD%]
 
 :SKIP_BUILD
-echo   [Build logs:         %FUNCTIONAL_DEVELOPER_BUILD_LOGS%]
+echo   [Build logs:         %OPEN_DYLAN_BUILD_LOGS%]
 
 goto end
 
@@ -456,7 +456,7 @@
 GOTO END
 
 :fixup_PATHS
-set FUNCTIONAL_DEVELOPER_RELEASE_ROOT=%~sf1
+set OPEN_DYLAN_RELEASE_ROOT=%~sf1
 set DYLAN_RELEASE_ROOT=%~sf2
 goto :EOF
 

Modified: trunk/fundev/admin/builds/show-build-warnings.bat
==============================================================================
--- trunk/fundev/admin/builds/show-build-warnings.bat	(original)
+++ trunk/fundev/admin/builds/show-build-warnings.bat	Thu May  4 17:47:55 2006
@@ -76,7 +76,7 @@
 goto end
 
 :SHOW_ALL_WARNINGS
-perl find-warnings.pl %OPTIONS% %FUNCTIONAL_DEVELOPER_BUILD_LOGS%\compile-*.log
+perl find-warnings.pl %OPTIONS% %OPEN_DYLAN_BUILD_LOGS%\compile-*.log
 if "%ERRORLEVEL%"=="9009" echo PERL.EXE not found
 goto end
 

Modified: trunk/fundev/admin/builds/show-compiler-speeds.bat
==============================================================================
--- trunk/fundev/admin/builds/show-compiler-speeds.bat	(original)
+++ trunk/fundev/admin/builds/show-compiler-speeds.bat	Thu May  4 17:47:55 2006
@@ -1,3 +1,3 @@
 @echo off
 
-perl find-warnings.pl -vn 1 -e "at a rate of" %FUNCTIONAL_DEVELOPER_BUILD_LOGS%\compile-*.log
+perl find-warnings.pl -vn 1 -e "at a rate of" %OPEN_DYLAN_BUILD_LOGS%\compile-*.log

Modified: trunk/fundev/admin/builds/test-release.bat
==============================================================================
--- trunk/fundev/admin/builds/test-release.bat	(original)
+++ trunk/fundev/admin/builds/test-release.bat	Thu May  4 17:47:55 2006
@@ -58,7 +58,7 @@
 If "%1%"=="/?" GOTO PRINT_USAGE
 set ERROR_MESSAGE=
 set OLD_RELEASE_ROOT=C:\Program Files\Functional Objects\Functional Developer
-set FUNCTIONAL_DEVELOPER_USER_SOURCES=
+set OPEN_DYLAN_USER_SOURCES=
 set CVS_BRANCH=trunk
 set TEST_TARGET=test-basic-internal-release
 set CLEANUP=
@@ -130,7 +130,7 @@
 
 :SET_SOURCES
 If "%2%"=="" GOTO NO_ARG
-set FUNCTIONAL_DEVELOPER_USER_SOURCES=%2%
+set OPEN_DYLAN_USER_SOURCES=%2%
 shift
 shift
 goto PARAM_LOOP
@@ -174,7 +174,7 @@
 call :fixup_PATHS "%OLD_RELEASE_ROOT%"
 
 REM // Option defaulting
-if "%FUNCTIONAL_DEVELOPER_USER_SOURCES%"=="" set FUNCTIONAL_DEVELOPER_USER_SOURCES=%RELEASE_ROOT%\Sources
+if "%OPEN_DYLAN_USER_SOURCES%"=="" set OPEN_DYLAN_USER_SOURCES=%RELEASE_ROOT%\Sources
 set QA_RELEASE_ROOT=%RELEASE_ROOT%\QA
 
 REM // Build options
@@ -185,7 +185,7 @@
 set QUOTED_OPTIONS=OPTIONS=%OPTIONS%
 
 :SKIP_DEBUGGER_OPTION
-set BUILD_OPTIONS=-p %QA_RELEASE_ROOT% -s %RELEASE_ROOT% %COMMON_BUILD_OPTIONS% -sources %FUNCTIONAL_DEVELOPER_USER_SOURCES% -branch %CVS_BRANCH% -nopath -environment
+set BUILD_OPTIONS=-p %QA_RELEASE_ROOT% -s %RELEASE_ROOT% %COMMON_BUILD_OPTIONS% -sources %OPEN_DYLAN_USER_SOURCES% -branch %CVS_BRANCH% -nopath -environment
 
 :TEST_RELEASE
 echo --------------------------------------------------

Modified: trunk/fundev/admin/builds/test-script.bat
==============================================================================
--- trunk/fundev/admin/builds/test-script.bat	(original)
+++ trunk/fundev/admin/builds/test-script.bat	Thu May  4 17:47:55 2006
@@ -3,16 +3,16 @@
 setlocal
 
 set SCRIPT=%1
-set SCRIPTS_DIRECTORY=%FUNCTIONAL_DEVELOPER_USER_SOURCES%\qa\scripts
+set SCRIPTS_DIRECTORY=%OPEN_DYLAN_USER_SOURCES%\qa\scripts
 set SCRIPT_FILE=%SCRIPTS_DIRECTORY%\%SCRIPT%
 set LOG_NAME=test-%SCRIPT%.log
-set LOG=%FUNCTIONAL_DEVELOPER_BUILD_LOGS%\%LOG_NAME%
+set LOG=%OPEN_DYLAN_BUILD_LOGS%\%LOG_NAME%
 
-set CONSOLE_DYLAN=%FUNCTIONAL_DEVELOPER_USER_ROOT%\bin\basic-console-environment.exe
+set CONSOLE_DYLAN=%OPEN_DYLAN_USER_ROOT%\bin\basic-console-environment.exe
 if exist "%CONSOLE_DYLAN%" goto console_dylan_found
-set CONSOLE_DYLAN=%FUNCTIONAL_DEVELOPER_USER_ROOT%\bin\console-environment.exe
+set CONSOLE_DYLAN=%OPEN_DYLAN_USER_ROOT%\bin\console-environment.exe
 if exist "%CONSOLE_DYLAN%" goto console_dylan_found
-set CONSOLE_DYLAN=%FUNCTIONAL_DEVELOPER_USER_ROOT%\bin\console-dylan.exe
+set CONSOLE_DYLAN=%OPEN_DYLAN_USER_ROOT%\bin\console-dylan.exe
 if exist "%CONSOLE_DYLAN%" goto console_dylan_found
 set CONSOLE_DYLAN=%DYLAN_RELEASE_ROOT%\bin\basic-console-environment.exe
 if exist "%CONSOLE_DYLAN%" goto console_dylan_found

Modified: trunk/fundev/admin/pentium/.bashrc
==============================================================================
--- trunk/fundev/admin/pentium/.bashrc	(original)
+++ trunk/fundev/admin/pentium/.bashrc	Thu May  4 17:47:55 2006
@@ -26,9 +26,9 @@
 export PATH=".:/usr/ucb:/bin:/usr/bin:/usr/local/bin:/usr/openwin/bin:/usr/dt/bin:/usr/sbin:/etc:/usr/new:/usr/bin/X11:/usr/local/frame/bin:/usr/local/TeX/bin:/usr/lib:/usr/etc:/home/nosa/scripts:/u/dylan/tools/scripts:/home/nosa/hope:/home/nosa/dylan/admin"
 
 
-unset FUNCTIONAL_DEVELOPER_RELEASE_INSTALL
-unset FUNCTIONAL_DEVELOPER_RELEASE_REGISTRIES
-unset FUNCTIONAL_DEVELOPER_PROJECTS_BUILD
-unset FUNCTIONAL_DEVELOPER_PROJECTS_INSTALL
-unset FUNCTIONAL_DEVELOPER_USER_ROOT
-unset FUNCTIONAL_DEVELOPER_PLATFORM_NAME
+unset OPEN_DYLAN_RELEASE_INSTALL
+unset OPEN_DYLAN_RELEASE_REGISTRIES
+unset OPEN_DYLAN_PROJECTS_BUILD
+unset OPEN_DYLAN_PROJECTS_INSTALL
+unset OPEN_DYLAN_USER_ROOT
+unset OPEN_DYLAN_PLATFORM_NAME

Modified: trunk/fundev/admin/pentium/bootstrap-compiler
==============================================================================
--- trunk/fundev/admin/pentium/bootstrap-compiler	(original)
+++ trunk/fundev/admin/pentium/bootstrap-compiler	Thu May  4 17:47:55 2006
@@ -8,15 +8,15 @@
 
 link-build
 
-pushd $FUNCTIONAL_DEVELOPER_USER_INSTALL
+pushd $OPEN_DYLAN_USER_INSTALL
 mkdir lib/boot
 cp -pf lib/* lib/boot/
 
-cd $FUNCTIONAL_DEVELOPER_USER_BUILD
+cd $OPEN_DYLAN_USER_BUILD
 rm */*.s.o
 for f in *; do if [ -f $f/dylanmakefile.mkf ]; then sed -e 's!\\!/!g' $f/dylanmakefile.mkf > $f/dylanmakefile.mkf.new; mv $f/dylanmakefile.mkf.new $f/dylanmakefile.mkf; fi; done
 
-BOOT=$FUNCTIONAL_DEVELOPER_USER_INSTALL/lib/boot
+BOOT=$OPEN_DYLAN_USER_INSTALL/lib/boot
 LD_LIBRARY_PATH=$BOOT $BOOT/build elf assemble-all basic-pentium-dw.exe
 
 popd

Modified: trunk/fundev/admin/pentium/build-staging
==============================================================================
--- trunk/fundev/admin/pentium/build-staging	(original)
+++ trunk/fundev/admin/pentium/build-staging	Thu May  4 17:47:55 2006
@@ -3,10 +3,10 @@
 function import ()
 {
   echo Importing $1 ...
-  LID=$FUNCTIONAL_DEVELOPER_USER_SOURCES/$1.lid
-  FUNCTIONAL_DEVELOPER_USER_INSTALL= \
-  FUNCTIONAL_DEVELOPER_USER_BUILD= \
-  FUNCTIONAL_DEVELOPER_USER_REGISTRIES= \
+  LID=$OPEN_DYLAN_USER_SOURCES/$1.lid
+  OPEN_DYLAN_USER_INSTALL= \
+  OPEN_DYLAN_USER_BUILD= \
+  OPEN_DYLAN_USER_REGISTRIES= \
     $dylan_compile -loose -nocompile -nolink $LID
   [ $? = 0 ] || { echo "Import failed" ; exit -1; }
 }
@@ -14,12 +14,12 @@
 function set_rpath ()
 {
   echo Setting RPATH of $2 "(nee, $1)" ...
-  cp -p $FUNCTIONAL_DEVELOPER_USER_INSTALL/bin/$1 $FUNCTIONAL_DEVELOPER_USER_INSTALL/bin/$1.1
-  FUNCTIONAL_DEVELOPER_RPATH=/usr/local/lib/functional-developer/bin:/usr/local/lib/functional-developer/lib \
+  cp -p $OPEN_DYLAN_USER_INSTALL/bin/$1 $OPEN_DYLAN_USER_INSTALL/bin/$1.1
+  OPEN_DYLAN_RPATH=/usr/local/lib/functional-developer/bin:/usr/local/lib/functional-developer/lib \
     $build elf link $1.exe
   [ $? = 0 ] || { echo "Setting RPATH failed" ; exit -1; }
-  mv $FUNCTIONAL_DEVELOPER_USER_INSTALL/bin/$1 $STAGING/bin/$2
-  mv $FUNCTIONAL_DEVELOPER_USER_INSTALL/bin/$1.1 $FUNCTIONAL_DEVELOPER_USER_INSTALL/bin/$1
+  mv $OPEN_DYLAN_USER_INSTALL/bin/$1 $STAGING/bin/$2
+  mv $OPEN_DYLAN_USER_INSTALL/bin/$1.1 $OPEN_DYLAN_USER_INSTALL/bin/$1
 }
 
 [ $# = 2 ] || { echo "Usage: $0 VERSION RELEASE"; exit -1; }
@@ -31,9 +31,9 @@
 import app/factorial/factorial-big
 import app/hello-world/hello-world
 
-[ -d $FUNCTIONAL_DEVELOPER_USER_INSTALL/staging ] || mkdir $FUNCTIONAL_DEVELOPER_USER_INSTALL/staging
+[ -d $OPEN_DYLAN_USER_INSTALL/staging ] || mkdir $OPEN_DYLAN_USER_INSTALL/staging
 
-STAGING=$FUNCTIONAL_DEVELOPER_USER_INSTALL/staging/functional-developer-$VERSION
+STAGING=$OPEN_DYLAN_USER_INSTALL/staging/functional-developer-$VERSION
 
 [ -d $STAGING ] && rm -rf $STAGING
 
@@ -49,13 +49,13 @@
 set_rpath basic-console-compiler xfdcompile
 set_rpath basic-pentium-dw       fdcompile
 
-cp -p $FUNCTIONAL_DEVELOPER_USER_INSTALL/lib/*.so $STAGING/bin/
-cp -p $FUNCTIONAL_DEVELOPER_USER_INSTALL/bin/elf-linker.script $STAGING/bin/
+cp -p $OPEN_DYLAN_USER_INSTALL/lib/*.so $STAGING/bin/
+cp -p $OPEN_DYLAN_USER_INSTALL/bin/elf-linker.script $STAGING/bin/
 for lib in build internal-release-info;
   do [ -f $STAGING/bin/lib$lib.so ] && rm -f $STAGING/bin/lib$lib.so; done
  
-cp -p $FUNCTIONAL_DEVELOPER_USER_INSTALL/lib/dylan-elf-dll.script $STAGING/lib/
-cp -p $FUNCTIONAL_DEVELOPER_USER_INSTALL/lib/dylan-elf-exe.script $STAGING/lib/
+cp -p $OPEN_DYLAN_USER_INSTALL/lib/dylan-elf-dll.script $STAGING/lib/
+cp -p $OPEN_DYLAN_USER_INSTALL/lib/dylan-elf-exe.script $STAGING/lib/
 
 for lib in dylan common-dylan functional-dylan collections io system \
            generic-arithmetic big-integers c-ffi network testworks testworks-specs; \
@@ -63,7 +63,7 @@
 
 for lib in dylan common-dylan functional-dylan collections io system \
            generic-arithmetic big-integers c-ffi network testworks testworks-specs; \
-  do cp -p $FUNCTIONAL_DEVELOPER_USER_INSTALL/databases/$lib.ddb $STAGING/databases/; done
+  do cp -p $OPEN_DYLAN_USER_INSTALL/databases/$lib.ddb $STAGING/databases/; done
 
 mkdir $STAGING/Sources/registry
 mkdir $STAGING/Sources/registry/generic
@@ -71,34 +71,34 @@
 
 for lib in functional-dylan collections \
            generic-arithmetic big-integers testworks testworks-specs; \
-  do cp -p $FUNCTIONAL_DEVELOPER_USER_SOURCES/registry/generic/$lib $STAGING/Sources/registry/generic/; done
+  do cp -p $OPEN_DYLAN_USER_SOURCES/registry/generic/$lib $STAGING/Sources/registry/generic/; done
 
 for lib in common-dylan io system c-ffi network; \
-  do cp -p $FUNCTIONAL_DEVELOPER_USER_SOURCES/registry/x86-linux/$lib $STAGING/Sources/registry/x86-linux/; done
+  do cp -p $OPEN_DYLAN_USER_SOURCES/registry/x86-linux/$lib $STAGING/Sources/registry/x86-linux/; done
 
 for lib in common-dylan functional-dylan collections io system network; \
-  do cp -a $FUNCTIONAL_DEVELOPER_USER_SOURCES/$lib/ $STAGING/Sources/$lib/; done
+  do cp -a $OPEN_DYLAN_USER_SOURCES/$lib/ $STAGING/Sources/$lib/; done
 
 for lib in examples http-client nntp-client pop-client smtp-client; \
   do rm -rf $STAGING/Sources/network/$lib; done
 
 mkdir $STAGING/Sources/lib
 for lib in generic-arithmetic big-integers c-ffi; \
-  do cp -a $FUNCTIONAL_DEVELOPER_USER_SOURCES/lib/$lib $STAGING/Sources/lib/$lib/; done
+  do cp -a $OPEN_DYLAN_USER_SOURCES/lib/$lib $STAGING/Sources/lib/$lib/; done
 
 rm -rf $STAGING/Sources/lib/c-ffi/test
 
 mkdir $STAGING/Sources/qa
 for lib in testworks testworks-specs; \
-  do cp -a $FUNCTIONAL_DEVELOPER_USER_SOURCES/qa/$lib/ $STAGING/Sources/qa/$lib/; done
+  do cp -a $OPEN_DYLAN_USER_SOURCES/qa/$lib/ $STAGING/Sources/qa/$lib/; done
 
 mkdir $STAGING/Sources/qa/test-apps
-cp -a $FUNCTIONAL_DEVELOPER_USER_SOURCES/qa/test-apps/libraries-test-suite/ $STAGING/Sources/qa/test-apps/libraries-test-suite/
+cp -a $OPEN_DYLAN_USER_SOURCES/qa/test-apps/libraries-test-suite/ $STAGING/Sources/qa/test-apps/libraries-test-suite/
 mkdir $STAGING/Sources/qa/test-suites
-cp -a $FUNCTIONAL_DEVELOPER_USER_SOURCES/qa/test-suites/libraries-test-suite/ $STAGING/Sources/qa/test-suites/libraries-test-suite/
+cp -a $OPEN_DYLAN_USER_SOURCES/qa/test-suites/libraries-test-suite/ $STAGING/Sources/qa/test-suites/libraries-test-suite/
 
 mkdir $STAGING/Sources/dylan
-cp -a $FUNCTIONAL_DEVELOPER_USER_SOURCES/dylan/tests $STAGING/Sources/dylan/tests/
+cp -a $OPEN_DYLAN_USER_SOURCES/dylan/tests $STAGING/Sources/dylan/tests/
 
 pushd $STAGING/Sources
 find . -name 'CVS' -depth -exec rm -rf {} \;
@@ -111,18 +111,18 @@
 popd
 
 pushd $STAGING/Examples
-cp -a $FUNCTIONAL_DEVELOPER_USER_SOURCES/examples/documentation/airport/ airport/
-cp -a $FUNCTIONAL_DEVELOPER_USER_SOURCES/examples/console/towers-of-hanoi/ towers-of-hanoi
-cp -a $FUNCTIONAL_DEVELOPER_USER_SOURCES/app/factorial/ factorial/
-cp -a $FUNCTIONAL_DEVELOPER_USER_SOURCES/app/hello-world/ hello-world/
-cp -a $FUNCTIONAL_DEVELOPER_USER_SOURCES/network/examples network/
+cp -a $OPEN_DYLAN_USER_SOURCES/examples/documentation/airport/ airport/
+cp -a $OPEN_DYLAN_USER_SOURCES/examples/console/towers-of-hanoi/ towers-of-hanoi
+cp -a $OPEN_DYLAN_USER_SOURCES/app/factorial/ factorial/
+cp -a $OPEN_DYLAN_USER_SOURCES/app/hello-world/ hello-world/
+cp -a $OPEN_DYLAN_USER_SOURCES/network/examples network/
 find . -name 'CVS' -depth -exec rm -rf {} \;
 find . -name '*-build' -depth -exec rm -rf {} \;
 find . -name '*.lid' -exec rm -f {} \;
 find . -name 'README.html' -exec rm -f {} \;
 popd
 
-pushd $FUNCTIONAL_DEVELOPER_USER_INSTALL/staging
+pushd $OPEN_DYLAN_USER_INSTALL/staging
 echo tar cfz functional-developer-$VERSION-$RELEASE.tgz functional-developer-$VERSION/
 tar cfz functional-developer-$VERSION-$RELEASE.tgz functional-developer-$VERSION/
 popd

Modified: trunk/fundev/admin/pentium/clean-build
==============================================================================
--- trunk/fundev/admin/pentium/clean-build	(original)
+++ trunk/fundev/admin/pentium/clean-build	Thu May  4 17:47:55 2006
@@ -1,9 +1,9 @@
-pushd $FUNCTIONAL_DEVELOPER_USER_INSTALL
+pushd $OPEN_DYLAN_USER_INSTALL
 
 rm -rf build
 rm -rf lib
 rm -rf databases
 
-new-build-area $FUNCTIONAL_DEVELOPER_USER_INSTALL
+new-build-area $OPEN_DYLAN_USER_INSTALL
 
 popd

Modified: trunk/fundev/admin/pentium/clean-link
==============================================================================
--- trunk/fundev/admin/pentium/clean-link	(original)
+++ trunk/fundev/admin/pentium/clean-link	Thu May  4 17:47:55 2006
@@ -1,4 +1,4 @@
-pushd $FUNCTIONAL_DEVELOPER_USER_BUILD
+pushd $OPEN_DYLAN_USER_BUILD
 
 rm */*.o
 rm cmu-test-suite/cmu-test-suite

Modified: trunk/fundev/admin/pentium/config
==============================================================================
--- trunk/fundev/admin/pentium/config	(original)
+++ trunk/fundev/admin/pentium/config	Thu May  4 17:47:55 2006
@@ -14,33 +14,33 @@
   export dylan_compile dylan_compile_options build
 }
 
-export FUNCTIONAL_DEVELOPER_SYSTEM_DEVELOPER="yes"
+export OPEN_DYLAN_SYSTEM_DEVELOPER="yes"
 
 while [ "$#" -ne 0 ]; do
   case $1 in
 
-   -r) export FUNCTIONAL_DEVELOPER_RELEASE="$2" ;;
+   -r) export OPEN_DYLAN_RELEASE="$2" ;;
 
-   -b) export FUNCTIONAL_DEVELOPER_USER_BUILD="$2/build"
-       export FUNCTIONAL_DEVELOPER_USER_INSTALL="$2"
+   -b) export OPEN_DYLAN_USER_BUILD="$2/build"
+       export OPEN_DYLAN_USER_INSTALL="$2"
        cd $2 ;;
 
-   -s) export FUNCTIONAL_DEVELOPER_USER_SOURCES="$2/sources"
-       export FUNCTIONAL_DEVELOPER_USER_REGISTRIES="$2/sources/registry" ;;
+   -s) export OPEN_DYLAN_USER_SOURCES="$2/sources"
+       export OPEN_DYLAN_USER_REGISTRIES="$2/sources/registry" ;;
 
    -c) find_compiler $2 ;;
 
    -rc) find_compiler $2
-	export FUNCTIONAL_DEVELOPER_RELEASE="$2" ;;
+	export OPEN_DYLAN_RELEASE="$2" ;;
 
-   -rs) export FUNCTIONAL_DEVELOPER_RELEASE="$2"
-        export FUNCTIONAL_DEVELOPER_USER_SOURCES="$2/sources"
-        export FUNCTIONAL_DEVELOPER_USER_REGISTRIES="$2/sources/registry" ;;
+   -rs) export OPEN_DYLAN_RELEASE="$2"
+        export OPEN_DYLAN_USER_SOURCES="$2/sources"
+        export OPEN_DYLAN_USER_REGISTRIES="$2/sources/registry" ;;
 
    -rcs) find_compiler $2
-         export FUNCTIONAL_DEVELOPER_RELEASE=$2
-         export FUNCTIONAL_DEVELOPER_USER_SOURCES="$2/sources"
-         export FUNCTIONAL_DEVELOPER_USER_REGISTRIES="$2/sources/registry" ;;
+         export OPEN_DYLAN_RELEASE=$2
+         export OPEN_DYLAN_USER_SOURCES="$2/sources"
+         export OPEN_DYLAN_USER_REGISTRIES="$2/sources/registry" ;;
 
      *) echo Invalid command line option -