Fold dylan-compiler-with-tools into dylan-compiler

build/packages/win32-nsis/build-installer.bat

@@ -50,12 +50,12 @@ echo "cannot find release root"
 goto end
 
 :VERSION
-if exist "%OPEN_DYLAN_RELEASE_ROOT%\bin\dylan-compiler-with-tools.exe" goto set_version
-echo "cannot find dylan-compiler-with-tools"
+if exist "%OPEN_DYLAN_RELEASE_ROOT%\bin\dylan-compiler.exe" goto set_version
+echo "cannot find dylan-compiler"
 goto end
 
 :SET_VERSION
-for /f %%X in ('%OPEN_DYLAN_RELEASE_ROOT%\bin\dylan-compiler-with-tools.exe /shortversion') DO SET OPEN_DYLAN_VERSION=%%X
+for /f %%X in ('%OPEN_DYLAN_RELEASE_ROOT%\bin\dylan-compiler.exe /shortversion') DO SET OPEN_DYLAN_VERSION=%%X
 if "%OPEN_DYLAN_VERSION%"=="" goto end
 
 :MAKENSIS

build/windows/Makefile

@@ -373,7 +373,6 @@ HTMLHELP = $(INSTALL_LIB_DIRECTORY)\htmlhelp.lib
 DYLAN_COMPILER = $(INSTALL_BIN_DIRECTORY)\dylan-compiler.exe
 DYLAN_ENVIRONMENT = $(INSTALL_BIN_DIRECTORY)\dylan-environment.exe
 BATCH_DEBUG = $(INSTALL_BIN_DIRECTORY)\batch-debug.exe
-DYLAN_COMPILER_WITH_TOOLS = $(INSTALL_BIN_DIRECTORY)\dylan-compiler-with-tools.exe
 CREATE_ID = $(INSTALL_BIN_DIRECTORY)\create-id.exe
 DEVEL_DBG_UI = $(INSTALL_BIN_DIRECTORY)\devel-dbg-ui.exe
 DLL_WRAP = $(INSTALL_BIN_DIRECTORY)\dll-wrap.exe
@@ -1064,8 +1063,6 @@ network-examples: daytime-client daytime-server echo-client echo-client echo-ser
 
 release-info: $(RELEASE_INFO)
 compiler: pentium-dw-libraries release-info motley t-lists c-lexer console-scepter-libraries
-dylan-compiler-with-tools-exe: $(DYLAN_COMPILER_WITH_TOOLS)
-dylan-compiler-with-tools: console-compiler-libraries release-info environment-internal-commands motley t-lists c-lexer console-scepter-libraries dylan-compiler-with-tools-exe
 dylan-environment: $(DYLAN_ENVIRONMENT)
 win32-environment: $(WIN32_ENVIRONMENT)
 with-splash-screen: $(WITH_SPLASH_SCREEN)
@@ -1074,15 +1071,15 @@ libraries: user-libraries win32-libraries duim ole-libraries duim-ole database-l
 example-projects: console-example-projects duim-example-projects win32-example-projects ole-example-projects duim-ole-example-projects network-example-projects corba-example-projects
 install-examples: install-examples-css install-console-examples install-duim-examples install-win32-examples install-basic-doc-examples install-templates install-database-examples install-ole-examples install-duim-ole-examples install-network-examples install-corba-examples install-enhanced-doc-examples install-midi-examples
 tools: install-wdbgdylan dll-wrap dylan-playground gui-dylan-playground create-id console-scepter naming-service remote-debugger testworks-libraries debugger parser-compiler dylan-tool-app
-release: release-info dylan-compiler-with-tools compiler environment rel-environment libraries tools install-runtime-dlls install-examples
+release: release-info dylan-compiler compiler environment rel-environment libraries tools install-runtime-dlls install-examples
 
 reinstall-examples:
   $(REMOVE_DIRECTORY) $(EXAMPLES_INSTALL_DIRECTORY)
   $(MAKE) install-examples
 
 minimal-compiler: pentium-dw-libraries release-info
 dylan-compiler-exe: $(DYLAN_COMPILER)
-dylan-compiler: console-compiler-libraries release-info environment-internal-commands dylan-compiler-exe
+dylan-compiler: console-compiler-libraries release-info environment-internal-commands motley t-lists c-lexer console-scepter-libraries dylan-compiler-exe
 dylan-environment: $(DYLAN_ENVIRONMENT)
 minimal-libraries: user-libraries win32-libraries duim
 minimal-environment: dylan-environment with-splash-screen
@@ -1954,6 +1951,8 @@ $(PARSER_COMPILER):
 $(DYLAN_COMPILER):
   $(ENSURE_LIBRARY) environment-commands
   $(ENSURE_LIBRARY) environment-internal-commands
+  $(ENSURE_LIBRARY) motley
+  $(ENSURE_LIBRARY) tool-scepter
   $(ENSURE_LIBRARY) release-info
   $(BUILD_APPLICATION) dylan-compiler
 
@@ -1966,14 +1965,6 @@ $(DYLAN_ENVIRONMENT):
   $(ENSURE_LIBRARY) release-info
   $(BUILD_APPLICATION) dylan-environment
 
-$(DYLAN_COMPILER_WITH_TOOLS):
-  $(ENSURE_LIBRARY) environment-commands
-  $(ENSURE_LIBRARY) environment-internal-commands
-  $(ENSURE_LIBRARY) motley
-  $(ENSURE_LIBRARY) tool-scepter
-  $(ENSURE_LIBRARY) release-info
-  $(BUILD_APPLICATION) dylan-compiler-with-tools
-
 $(WIN32_ENVIRONMENT):
   $(ENSURE_RUNTIME_LIBRARY) $(WIN32_SHELL_DLL) win32-shell
   $(ENSURE_LIBRARY) environment-profiler

build/windows/build-release.bat

@@ -333,9 +333,9 @@ REM // Setup the default build options for the environment/console compiler buil
 REM //
 :SETUP_ENVIRONMENT_DEFAULT_BUILD_OPTIONS
 if "%COMPILER_TARGET%"=="" set COMPILER_TARGET=dylan-compiler
-if "%FINAL_COMPILER_TARGET%"=="" set FINAL_COMPILER_TARGET=dylan-compiler-with-tools console-scepter
+if "%FINAL_COMPILER_TARGET%"=="" set FINAL_COMPILER_TARGET=dylan-compiler console-scepter
 if "%COMPILER_FILENAME%"=="" set COMPILER_FILENAME=dylan-compiler.exe
-if "%FINAL_COMPILER_FILENAME%"=="" set FINAL_COMPILER_FILENAME=dylan-compiler-with-tools.exe
+if "%FINAL_COMPILER_FILENAME%"=="" set FINAL_COMPILER_FILENAME=dylan-compiler.exe
 if "%RELEASE_TARGET%"=="" set RELEASE_TARGET=release
 goto setup_default_release_options
 

build/windows/import-project.bat

@@ -51,8 +51,6 @@ goto PARAM_LOOP
 
 REM // Try what we just built
 REM //
-set DYLAN_RELEASE_COMPILER=%OPEN_DYLAN_RELEASE_ROOT%\bin\dylan-compiler-with-tools.exe
-if exist "%DYLAN_RELEASE_COMPILER%" goto compiler_found
 set DYLAN_RELEASE_COMPILER=%OPEN_DYLAN_RELEASE_ROOT%\bin\dylan-compiler.exe
 if exist "%DYLAN_RELEASE_COMPILER%" goto compiler_found
 REM //... finally hope that we can find it on the path.

documentation/getting-started-cli/source/windows.rst

@@ -8,13 +8,13 @@ dylan-compiler
 --------------
 
 On Windows, the ``dylan-compiler`` executable is called
-``dylan-compiler-with-tools.exe``.
+``dylan-compiler.exe``.
 
 The IDE is ``win32-environment.exe``.
 
 Both are located in ``C:\Program Files\Open Dylan\bin\`` on
 a 32 bit Windows version. On 64 bit Windows, they can be found
-within ``C:\Program Files (x86)\Open Dylan\bin\``.
+in ``C:\Program Files (x86)\Open Dylan\bin\``.
 
 Build Products Location
 -----------------------

documentation/release-notes/source/2023.2.rst

@@ -0,0 +1,52 @@
+*****************
+Open Dylan 2023.2
+*****************
+
+This document describes the 2023.2 release of Open Dylan, released 25
+December, 2023.  The highlights of the release are listed below.  For complete
+details see the `commit logs
+<https://github.com/dylan-lang/opendylan/compare/v2023.1.0...v2023.2.0>`_ for
+this release.
+
+.. note:: Some commit logs, for example for testworks and other libraries that
+          are included in Open Dylan as git submodules, may be in other
+          repositories.
+
+* Download the release: http://opendylan.org/download
+* Read documentation: http://opendylan.org/documentation
+* Report problems: https://github.com/dylan-lang/opendylan/issues
+
+
+Compiler
+========
+
+* The ``dylan-compiler-with-tools`` executable has been removed and its
+  functionality has been merged into ``dylan-compiler``.
+
+
+Tooling
+=======
+
+
+Library Updates
+===============
+
+Submodules
+----------
+
+
+system Library
+--------------
+
+
+
+Contributors
+============
+
+We'd like to thank all the people who made contributions to this release and to
+surrounding libraries in the Dylan ecosystem. This list is probably
+incomplete...
+
+* Fernando Raya
+* Peter S. Housel
+* Carl Gay

sources/environment/commands/basic-commands.dylan

@@ -118,8 +118,8 @@ define method display-help
          "For a complete list of commands, use:   SHOW COMMANDS\n"
          "For a complete list of properties, use: SHOW PROPERTIES\n"
          "\n"
-         "For full documentation, see %sdocumentation/\n"
-         "For a guide to the command line tools, see %sdocumentation/getting-started-cli/\n",
+         "For full documentation, see %s.\n"
+         "For a guide to the command line tools, see %s/getting-started-cli/\n",
          $option-prefix,
          release-web-address(),
          release-web-address())

sources/environment/commands/build.dylan

@@ -234,44 +234,44 @@ define method do-execute-command
               serious-warnings? := #t;
             end;
           end;
-    if (build-project
-          (project,
-           process-subprojects?: command.%subprojects?,
-           clean?:               command.%clean?,
-           link?:                #f,
-           save-databases?:      command.%save?,
-           messages:             messages,
-           output:               command.%output,
-           dispatch-coloring:    command.%dispatch-coloring,
-           progress-callback:    progress-callback,
-           warning-callback:     warning-callback,
-           error-handler:        curry(compiler-condition-handler, context)))
+    let success?
+      = build-project(project,
+                      process-subprojects?: command.%subprojects?,
+                      clean?:               command.%clean?,
+                      link?:                #f,
+                      save-databases?:      command.%save?,
+                      messages:             messages,
+                      output:               command.%output,
+                      dispatch-coloring:    command.%dispatch-coloring,
+                      progress-callback:    progress-callback,
+                      warning-callback:     warning-callback,
+                      error-handler:        curry(compiler-condition-handler, context));
+    if (~success?)
+      message(context, "Build of '%s' aborted",   project.project-name);
+      $unexpected-error-exit-code
+    else
       if (command.%link?)
         let project-context = context.context-project-context;
         let build-script
           = command.%build-script | project-context.context-build-script;
-        link-project
-          (project,
-           build-script:         build-script,
-           target:               command.%target,
-           release?:             command.%release?,
-           force?:               command.%force?,
-           jobs:                 command.%jobs,
-           process-subprojects?: command.%subprojects?,
-           unify?:               command.%unify?,
-           messages:             messages,
-           progress-callback:    progress-callback,
-           error-handler:        curry(compiler-condition-handler, context))
+        link-project(project,
+                     build-script:         build-script,
+                     target:               command.%target,
+                     release?:             command.%release?,
+                     force?:               command.%force?,
+                     jobs:                 command.%jobs,
+                     process-subprojects?: command.%subprojects?,
+                     unify?:               command.%unify?,
+                     messages:             messages,
+                     progress-callback:    progress-callback,
+                     error-handler:        curry(compiler-condition-handler, context));
       end;
       message(context, "Build of '%s' completed", project.project-name);
       if (serious-warnings? & ~command.%allow-serious-warnings?)
         $serious-warnings-exit-code
       else
         $success-exit-code
       end
-    else
-      message(context, "Build of '%s' aborted",   project.project-name);
-      $unexpected-error-exit-code
     end
   exception (error :: <file-system-error>)
     command-error("%s", error)

sources/environment/console/README.txt

@@ -1,5 +1,5 @@
-The three libraries in this directory are the various command-line entry points
-into the Open Dylan application.
+The libraries in this directory are the command-line entry points into the Open
+Dylan application.
 
 The modules used by each library determine the commands and features built in to
 the application, but the libraries themselves simply process the command-line
@@ -10,9 +10,8 @@ The libraries and their features are:
 
 ____Library_______________________Compile__Execute__Remote__Plugins___________
 
-DC  dylan-compiler                compile
+DC  dylan-compiler                compile                   plugins
 DE  dylan-environment             compile  execute  remote  plugins
-DCT dylan-compiler-with-tools     compile                   plugins
 
 Compile         Can open and build projects.
 Execute         Can execute and debug applications.
@@ -22,31 +21,30 @@ ______________________________________________________________________________
 
 The Dylan files in this directory used by each library are:
 
-File___________________________DC DE___DCT ___________________________________
+File_______________________________DC DE______________________________________
 
-compiler-library               x
-tools-compiler-library                  x
-compiler-command-line          x        x
-compiler-module                x        x
+compiler-library                   x
+compiler-command-line              x
+compiler-module                    x
 
-environment-library               x
-environment-command-line          x
-environment-module                x
+environment-library                   x
+environment-command-line              x
+environment-module                    x
 
-command-line                   x  x     x
-start                          x  x     x
+command-line                       x  x
+start                              x  x
 ______________________________________________________________________________
 
-All three libraries export a single module called console-environment. This
-module is defined in compiler-module.dylan for the DC and DCT libraries and in
+Both libraries export a single module called console-environment. This module
+is defined in compiler-module.dylan for the DC library and in
 environment-module.dylan for the DE library. It does not export any bindings.
 
 The command-line options are DEFINED in compiler-command-line.dylan or
 environment-command-line.dylan:
 
 Libraries_________Options_______________________In file_______________________
 
-DC, DCT           <main-command>                compiler-command-line.dylan
+DC                <main-command>                compiler-command-line.dylan
 DE                <main-command>                environment-command-line.dylan
 ______________________________________________________________________________
 
@@ -55,7 +53,7 @@ The command-line options are STORED in <basic-main-command> or its subclass
 
 Libraries_________Storage_______________________In file_______________________
 
-DC, DCT           <basic-main-command>          command-line.dylan
+DC                <basic-main-command>          command-line.dylan
 DE                <environment-main-command>    environment-command-line.dylan
 ______________________________________________________________________________
 

sources/environment/console/compiler-library.dylan

@@ -24,7 +24,9 @@ define library dylan-compiler
   use dfmc-back-end-implementations;
 
   // Project manager plug-ins
+  use motley;
+  use tool-scepter;
   use tool-parser-generator;
 
   export console-environment;
-end library dylan-compiler;
+end library;

sources/environment/console/start.dylan

@@ -15,10 +15,9 @@ define function main
     = make-environment-command-line-server
         (input-stream:   input-stream,
          output-stream:  output-stream);
-  let class = <main-command>;
   let command
     = block ()
-        parse-command-line(server, arguments, class: class)
+        parse-command-line(server, arguments, class: <main-command>)
       exception (error :: <parse-error>)
         format(output-stream, "%s\n", error);
         exit-application($usage-error-exit-code)
@@ -29,17 +28,17 @@ end function main;
 
 define function dylan-banner
     () => (banner :: <string>)
-  format-to-string(
-    "Welcome to %s, %s.\n"
-    "\n"
-    "For documentation on %s, see %sdocumentation/.\n"
-    "See %sdocumentation/getting-started-cli/ for an introduction to the command line tools.\n"
-    "\n"
-    "Type \"help\" for more information.",
-    release-product-name(),
-    release-version(),
-    release-product-name(), release-web-address(),
-    release-web-address());
+  format-to-string
+    ("Welcome to %s, %s.\n"
+       "\n"
+       "For documentation on %s, see %s.\n"
+       "See %s/getting-started-cli/ for an introduction to the command line tools.\n"
+       "\n"
+       "Type \"help\" for more information.",
+     release-product-name(),
+     release-version(),
+     release-product-name(), release-web-address(),
+     release-web-address());
 end function dylan-banner;
 
 define function application-arguments-as-string