From e6245bcddcc732ea11db4ee37c74b0d840a81b29 Mon Sep 17 00:00:00 2001 From: Carl Gay Date: Mon, 22 Apr 2024 11:38:08 -0400 Subject: [PATCH] dylan-tool -> deft --- .gitmodules | 6 ++--- Makefile.in | 5 ++-- build/windows/Makefile | 16 ++++++------ .../source/dylan-mode-for-emacs.rst | 12 ++++----- .../source/hello-world.rst | 26 +++++++------------ dylan-package.json | 2 +- sources/app/deft | 1 + sources/app/dylan-tool | 1 - sources/registry/generic/deft | 1 + sources/registry/generic/deft-app | 1 + sources/registry/generic/deft-test-suite | 1 + sources/registry/generic/dylan-tool | 1 - sources/registry/generic/dylan-tool-app | 1 - .../registry/generic/dylan-tool-test-suite | 1 - sources/registry/generic/uncommon-dylan | 2 +- 15 files changed, 35 insertions(+), 42 deletions(-) create mode 160000 sources/app/deft delete mode 160000 sources/app/dylan-tool create mode 100644 sources/registry/generic/deft create mode 100644 sources/registry/generic/deft-app create mode 100644 sources/registry/generic/deft-test-suite delete mode 100644 sources/registry/generic/dylan-tool delete mode 100644 sources/registry/generic/dylan-tool-app delete mode 100644 sources/registry/generic/dylan-tool-test-suite diff --git a/.gitmodules b/.gitmodules index dfc7c0768..e8f85fc37 100644 --- a/.gitmodules +++ b/.gitmodules @@ -31,9 +31,9 @@ [submodule "sources/lib/meta"] path = sources/lib/meta url = https://github.com/dylan-lang/meta.git -[submodule "sources/app/dylan-tool"] - path = sources/app/dylan-tool - url = https://github.com/dylan-lang/dylan-tool [submodule "documentation/website"] path = documentation/website url = https://github.com/dylan-lang/website +[submodule "sources/app/deft"] + path = sources/app/deft + url = https://github.com/dylan-lang/deft diff --git a/Makefile.in b/Makefile.in index 00cdba31c..d83e7b3d1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -191,7 +191,7 @@ BOOTSTRAP_3_ROOT = $(abs_builddir)/Bootstrap.3 BOOTSTRAP_3_LIBRARIES = \ dylan-compiler dylan-environment parser-compiler dswank BOOTSTRAP_3_STATICS = \ - dylan-tool-app + deft-app BOOTSTRAP_3_COMPILER = \ $(BOOTSTRAP_2_ROOT)/bin/dylan-compiler \ @@ -348,7 +348,8 @@ dist: 3-stage-bootstrap rm -rf release/opendylan-$(version)/sources/bootstrap1-registry cp -R Bootstrap.3/bin release/opendylan-$(version)/ cp -R Bootstrap.3/sbin/* release/opendylan-$(version)/bin - ln -s dylan-tool-app release/opendylan-$(version)/bin/dylan + ln -s deft-app release/opendylan-$(version)/bin/deft + ln -s deft-app release/opendylan-$(version)/bin/dylan # ease transition to "deft" cp -R Bootstrap.3/databases release/opendylan-$(version)/ -cp -R Bootstrap.3/include/opendylan release/opendylan-$(version)/include cp -R Bootstrap.3/lib release/opendylan-$(version)/ diff --git a/build/windows/Makefile b/build/windows/Makefile index 30968e727..824dadc92 100644 --- a/build/windows/Makefile +++ b/build/windows/Makefile @@ -302,7 +302,7 @@ SIMPLE_DAYTIME_CLIENT_SOURCE = $(NETWORK_EXAMPLES_SOURCE)\simple-daytime-client SIMPLE_DAYTIME_CLIENT_INSTALL_DIRECTORY = $(NETWORK_EXAMPLES_INSTALL_DIRECTORY)\simple-daytime-client SIMPLE_DAYTIME_SERVER_SOURCE = $(NETWORK_EXAMPLES_SOURCE)\simple-daytime-server SIMPLE_DAYTIME_SERVER_INSTALL_DIRECTORY = $(NETWORK_EXAMPLES_INSTALL_DIRECTORY)\simple-daytime-server -DYLAN_TOOL_SOURCE = $(APP_DIRECTORY)\dylan-tool +DEFT_SOURCE = $(APP_DIRECTORY)\deft # # CORBA projects @@ -380,7 +380,7 @@ PARSER_COMPILER = $(INSTALL_BIN_DIRECTORY)\parser-compiler.exe TESTWORKS_REPORT = $(INSTALL_BIN_DIRECTORY)\testworks-report.exe WIN32_ENVIRONMENT = $(INSTALL_BIN_DIRECTORY)\win32-environment.exe WITH_SPLASH_SCREEN = $(INSTALL_BIN_DIRECTORY)\with-splash-screen.exe -DYLAN_TOOL_APP = $(INSTALL_BIN_DIRECTORY)\dylan-tool-app.exe +DEFT_APP = $(INSTALL_BIN_DIRECTORY)\deft-app.exe BIG_INTEGERS_DLL = $(RUNTIME_PREFIX)bigint CHANNELS_DLL = $(RUNTIME_PREFIX)chnnls @@ -753,7 +753,7 @@ devel-dbg-ui: $(DEVEL_DBG_UI) dll-wrap: $(DLL_WRAP) parser-compiler: $(PARSER_COMPILER) testworks-report: $(TESTWORKS_REPORT) -dylan-tool-app: $(DYLAN_TOOL_APP) +deft-app: $(DEFT_APP) project-manager-libraries: tools-interface user-projects core-compiler-libraries: file-source-records release-info dood binary-manager coff-manager binary-builder coff-builder build-system parser-run-time dfmc-management dfmc-browser-support project-manager-libraries dfmc-debug-back-end @@ -1070,7 +1070,7 @@ rel-environment: dylan-environment win32-environment with-splash-screen libraries: user-libraries win32-libraries duim ole-libraries duim-ole database-libraries network dylan-orb naming-client midi 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 +tools: install-wdbgdylan dll-wrap dylan-playground gui-dylan-playground create-id console-scepter naming-service remote-debugger testworks-libraries debugger parser-compiler deft-app release: release-info dylan-compiler compiler environment rel-environment libraries tools install-runtime-dlls install-examples reinstall-examples: @@ -1991,14 +1991,14 @@ $(TESTWORKS_REPORT): $(ENSURE_SOURCES) testworks-report $(TESTWORKS_REPORT_SOURCE) $(BUILD_APPLICATION) testworks-report -$(DYLAN_TOOL_APP): +$(DEFT_APP): $(ENSURE_RUNTIME_LIBRARY) $(COMMON_DYLAN_DLL) common-dylan $(ENSURE_RUNTIME_LIBRARY) $(IO_DLL) io $(ENSURE_RUNTIME_LIBRARY) $(SYSTEM_DLL) system $(ENSURE_RUNTIME_LIBRARY) $(STRINGS_DLL) strings - $(ENSURE_SOURCES) dylan-tool $(DYLAN_TOOL_SOURCE) - $(BUILD_APPLICATION) dylan-tool-app - $(COPY) $(DYLAN_TOOL_APP) $(INSTALL_BIN_DIRECTORY)\dylan.exe + $(ENSURE_SOURCES) deft $(DEFT_SOURCE) + $(BUILD_APPLICATION) deft-app + $(COPY) $(DEFT_APP) $(INSTALL_BIN_DIRECTORY)\deft.exe # Test Suites diff --git a/documentation/getting-started-cli/source/dylan-mode-for-emacs.rst b/documentation/getting-started-cli/source/dylan-mode-for-emacs.rst index 2d5994ba6..ec2866593 100644 --- a/documentation/getting-started-cli/source/dylan-mode-for-emacs.rst +++ b/documentation/getting-started-cli/source/dylan-mode-for-emacs.rst @@ -29,21 +29,21 @@ Setting `OPEN_DYLAN_USER_REGISTRIES that's how DIME finds your projects. Above we set it to the dime-test registry that is created in the example below. -For this tutorial let's use a "dime-test" project created with the -:program:`dylan` tool. Create the project with :: +For this tutorial let's use a "dime-test" project created with :program:`deft`. +Create the project with :: - $ dylan new application dime-test + $ deft new application dime-test which creates a library named "dime-test" and a corresponding executable library and test suite, as well as downloading dependencies and creating -registry files. See the `dylan new application -`_ +registry files. See the `deft new application +`_ command for more. **Start dime:** :: $ export PATH=/opt/opendylan/bin:$PATH - $ cd dime-test # Created by dylan new application, above. + $ cd dime-test # Created by deft new application, above. $ emacs dime-test-app.dylan M-x dime diff --git a/documentation/getting-started-cli/source/hello-world.rst b/documentation/getting-started-cli/source/hello-world.rst index 361bf7962..ce116bba1 100644 --- a/documentation/getting-started-cli/source/hello-world.rst +++ b/documentation/getting-started-cli/source/hello-world.rst @@ -6,16 +6,16 @@ how do you write the canonical Hello World app? This example assumes the ``bash`` shell is used. You may need to adjust for your local shell. :: $ export PATH=/opt/opendylan/bin:$PATH - $ dylan new application --simple hello-world + $ deft new application --simple hello-world $ cd hello-world - $ dylan build --all + $ deft build --all ...lots of output... $ _build/bin/hello-world Hello, world! Ta da! Now a quick review of the steps with a little bit of explanation. -First you must set ``PATH`` so that the :program:`dylan` and +First you must set ``PATH`` so that the :program:`deft` and :program:`dylan-compiler` executables will be found. ``./_build/bin`` is where :program:`dylan-compiler` puts the executables it builds. @@ -23,7 +23,7 @@ First you must set ``PATH`` so that the :program:`dylan` and to read :doc:`windows` if you are on Windows. :class: alert alert-block alert-warning -``dylan new application --simple hello-world`` creates a directory named +``deft new application --simple hello-world`` creates a directory named "hello-world", and several files. The ``--simple`` flag says to skip generating a test suite library and instead of a separate ``hello-world`` library and ``hello-world-app`` executable library to just make one ``hello-world`` @@ -42,27 +42,19 @@ executable library. library. 4. The :file:`registry` directory is how :program:`dylan-compiler` locates each - used library. When using the :program:`dylan` tool, this directory is - generated for you. See :doc:`source-registries` for details on the registry - format. + used library. :program:`deft` generates this directory for you. See + :doc:`source-registries` for details on the registry format. 5. :file:`dylan-package.json` describes the new "hello-world" package. This is - where you can specify dependencies, the package location, etc. See the - `dylan tool documentation - `_ for more on + where you can specify dependencies, the package location, etc. See the `deft + documentation `_ for more on this. Note that the existence of this file turns the "hello-world" directory - into a :program:`dylan` workspace. + into a :program:`deft` workspace. The first time you build your project all used libraries are built, all the way down to the ``dylan`` library itself. Subsequent builds only need to recompile ``hello-world`` itself and are therefore much faster. -.. note:: Don't confuse the ``dylan`` library with the :program:`dylan` - executable program. The ``dylan`` library contains the core Dylan - language features that are not implemented inside the compiler. The - ``dylan`` program is a tool to help manage Dylan projects and is - created from a library called ``dylan-tool``. - The compiler places its output in the ``_build`` directory in the current working directory. This includes the libraries and executables that it builds. You can run the executable from this location, as noted above. diff --git a/dylan-package.json b/dylan-package.json index 5fce634d8..1cfffb0b2 100644 --- a/dylan-package.json +++ b/dylan-package.json @@ -5,7 +5,7 @@ "dependencies": [ "collection-extensions@0.1", "command-line-parser@3.2", - "dylan-tool@0.11", + "deft@0.12", "json@1.1", "meta@0.1", "regular-expressions@0.2", diff --git a/sources/app/deft b/sources/app/deft new file mode 160000 index 000000000..86583a27d --- /dev/null +++ b/sources/app/deft @@ -0,0 +1 @@ +Subproject commit 86583a27d1b63d1480a8c57e46d0dd249d131515 diff --git a/sources/app/dylan-tool b/sources/app/dylan-tool deleted file mode 160000 index e2fcc4a09..000000000 --- a/sources/app/dylan-tool +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e2fcc4a0966147edb3a397e82c562b36f932f934 diff --git a/sources/registry/generic/deft b/sources/registry/generic/deft new file mode 100644 index 000000000..56386cf01 --- /dev/null +++ b/sources/registry/generic/deft @@ -0,0 +1 @@ +abstract://dylan/app/deft/sources/deft.lid diff --git a/sources/registry/generic/deft-app b/sources/registry/generic/deft-app new file mode 100644 index 000000000..ef5ce7c4d --- /dev/null +++ b/sources/registry/generic/deft-app @@ -0,0 +1 @@ +abstract://dylan/app/deft/sources/deft-app.lid \ No newline at end of file diff --git a/sources/registry/generic/deft-test-suite b/sources/registry/generic/deft-test-suite new file mode 100644 index 000000000..f06e55116 --- /dev/null +++ b/sources/registry/generic/deft-test-suite @@ -0,0 +1 @@ +abstract://dylan/app/deft/sources/test-suite.lid diff --git a/sources/registry/generic/dylan-tool b/sources/registry/generic/dylan-tool deleted file mode 100644 index 614a3fbe2..000000000 --- a/sources/registry/generic/dylan-tool +++ /dev/null @@ -1 +0,0 @@ -abstract://dylan/app/dylan-tool/sources/dylan-tool.lid diff --git a/sources/registry/generic/dylan-tool-app b/sources/registry/generic/dylan-tool-app deleted file mode 100644 index ff441b277..000000000 --- a/sources/registry/generic/dylan-tool-app +++ /dev/null @@ -1 +0,0 @@ -abstract://dylan/app/dylan-tool/sources/dylan-tool-app.lid \ No newline at end of file diff --git a/sources/registry/generic/dylan-tool-test-suite b/sources/registry/generic/dylan-tool-test-suite deleted file mode 100644 index 7e70fe093..000000000 --- a/sources/registry/generic/dylan-tool-test-suite +++ /dev/null @@ -1 +0,0 @@ -abstract://dylan/app/dylan-tool/sources/test-suite.lid diff --git a/sources/registry/generic/uncommon-dylan b/sources/registry/generic/uncommon-dylan index ed6a39742..b0864da5f 100644 --- a/sources/registry/generic/uncommon-dylan +++ b/sources/registry/generic/uncommon-dylan @@ -1 +1 @@ -abstract://dylan/app/dylan-tool/ext/uncommon-dylan/uncommon-dylan.lid +abstract://dylan/app/deft/ext/uncommon-dylan/uncommon-dylan.lid