From 40d642fa6b51e395f3c8e328c0a33edd6c2f91cb Mon Sep 17 00:00:00 2001 From: Graham Nelson Date: Mon, 6 Jun 2022 22:06:31 +0100 Subject: [PATCH] Fix for bug causing kit integration into the apps to fail --- README.md | 2 +- build.txt | 4 +- docs/inbuild/1-mn.html | 5 ++ docs/inbuild/M-rc.html | 89 ++++++++++--------- docs/supervisor-module/2-cps.html | 2 +- docs/supervisor-module/2-edt.html | 11 ++- docs/supervisor-module/2-nst.html | 2 +- docs/supervisor-module/2-rqr.html | 2 +- docs/supervisor-module/4-km.html | 78 ++++++++++------ docs/supervisor-module/5-ks.html | 2 +- docs/supervisor-module/P-wtmd.html | 2 +- inbuild/Chapter 1/Main.w | 5 ++ inbuild/Figures/help.txt | 89 ++++++++++--------- .../supervisor-module/Chapter 2/Editions.w | 9 +- .../supervisor-module/Chapter 4/Kit Manager.w | 38 ++++++-- inform7/Figures/memory-diagnostics.txt | 64 ++++++------- inform7/Figures/timings-diagnostics.txt | 30 +++---- scripts/inform.mkscript | 4 +- 18 files changed, 255 insertions(+), 183 deletions(-) diff --git a/README.md b/README.md index d1978a4be..b93515d0b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Inform 7 -v10.1.0-beta+6V21 'Krypton' (4 June 2022) +v10.1.0-beta+6V22 'Krypton' (6 June 2022) ## About Inform 7 diff --git a/build.txt b/build.txt index 1106724d5..5ee06e471 100644 --- a/build.txt +++ b/build.txt @@ -1,3 +1,3 @@ Prerelease: beta -Build Date: 4 June 2022 -Build Number: 6V21 +Build Date: 6 June 2022 +Build Number: 6V22 diff --git a/docs/inbuild/1-mn.html b/docs/inbuild/1-mn.html index 540bd6353..2cea6bf9d 100644 --- a/docs/inbuild/1-mn.html +++ b/docs/inbuild/1-mn.html @@ -394,6 +394,7 @@ other options to the selection defined here. enum MATCHING_CLSW enum COPY_TO_CLSW enum SYNC_TO_CLSW +enum VERSIONS_IN_FILENAMES_CLSW

Read the command line2.8 =

@@ -406,6 +407,8 @@ other options to the selection defined here. L"copy target(s) to nest X"); CommandLine::declare_switch(SYNC_TO_CLSW, L"sync-to", 2, L"forcibly copy target(s) to nest X, even if prior version already there"); + CommandLine::declare_boolean_switch(VERSIONS_IN_FILENAMES_CLSW, L"versions-in-filenames", 1, + L"append _v number to destination filenames on -copy-to or -sync-to", TRUE); CommandLine::declare_switch(BUILD_CLSW, L"build", 1, L"incrementally build target(s)"); CommandLine::declare_switch(REBUILD_CLSW, L"rebuild", 1, @@ -480,6 +483,8 @@ other options to the selection defined here. case SYNC_TO_CLSW: inbuild_task = SYNC_TO_TTASK; destination_nest = Nests::new(Pathnames::from_text(arg)); break; + case VERSIONS_IN_FILENAMES_CLSW: + Editions::set_canonical_leaves_have_versions(val); break; } Supervisor::option(id, val, arg, state); } diff --git a/docs/inbuild/M-rc.html b/docs/inbuild/M-rc.html index fff9ac28f..2898a845c 100644 --- a/docs/inbuild/M-rc.html +++ b/docs/inbuild/M-rc.html @@ -61,57 +61,58 @@ and those not documented in this manual are covered in that one. usage: inbuild [-TASK] TARGET1 TARGET2 ... --archive sync copies of all extensions, kits and so on needed for -project into Materials --archive-to X sync copies of all extensions, kits and so on needed into nest X --build incrementally build target(s) --build-locate show file paths of all the extensions, kits and so on needed to build --build-missing show the extensions, kits and so on which are needed to build but missing --build-needs show all the extensions, kits and so on needed to build --build-trace show verbose reasoning during -build (default is -no-build-trace) --contents-of X apply to all targets in the directory X --copy-to X copy target(s) to nest X --dry make this a dry run (print but do not execute shell commands) (default is -no-dry) --graph show dependency graph of target(s) but take no action --inspect show target(s) but take no action --matching X apply to all works in nest(s) matching requirement X --rebuild completely rebuild target(s) --sync-to X forcibly copy target(s) to nest X, even if prior version already there --tools X make X the directory of intools executables, and exit developer mode --use-locate show file paths of all the extensions, kits and so on needed to use --use-missing show the extensions, kits and so on which are needed to use but missing --use-needs show all the extensions, kits and so on needed to use +-archive sync copies of all extensions, kits and so on needed for -project into Materials +-archive-to X sync copies of all extensions, kits and so on needed into nest X +-build incrementally build target(s) +-build-locate show file paths of all the extensions, kits and so on needed to build +-build-missing show the extensions, kits and so on which are needed to build but missing +-build-needs show all the extensions, kits and so on needed to build +-build-trace show verbose reasoning during -build (default is -no-build-trace) +-contents-of X apply to all targets in the directory X +-copy-to X copy target(s) to nest X +-dry make this a dry run (print but do not execute shell commands) (default is -no-dry) +-graph show dependency graph of target(s) but take no action +-inspect show target(s) but take no action +-matching X apply to all works in nest(s) matching requirement X +-rebuild completely rebuild target(s) +-sync-to X forcibly copy target(s) to nest X, even if prior version already there +-tools X make X the directory of intools executables, and exit developer mode +-use-locate show file paths of all the extensions, kits and so on needed to use +-use-missing show the extensions, kits and so on which are needed to use but missing +-use-needs show all the extensions, kits and so on needed to use +-no-versions-in-filenames don't append _v number to destination filenames on -copy-to or -sync-to (default is -versions-in-filenames) for translating Inform source text to Inter: - -basic use Basic Inform language (same as -kit BasicInformKit) - -case X make any source links refer to the source in extension example X - -census perform an extensions census (default is -no-census) - -debug compile with debugging features even on a Release (default is -no-debug) - -format=X compile to the format X (default is Inform6/32) - -o X use file X as the compiled output (not for use with -project) - -project X work within the Inform project X - -release compile a version suitable for a Release build (default is -no-release) - -rng fix the random number generator of the story file (for testing) (default is -no-rng) - -source X use file X as the Inform source text + -basic use Basic Inform language (same as -kit BasicInformKit) + -case X make any source links refer to the source in extension example X + -census perform an extensions census (default is -no-census) + -debug compile with debugging features even on a Release (default is -no-debug) + -format=X compile to the format X (default is Inform6/32) + -o X use file X as the compiled output (not for use with -project) + -project X work within the Inform project X + -release compile a version suitable for a Release build (default is -no-release) + -rng fix the random number generator of the story file (for testing) (default is -no-rng) + -source X use file X as the Inform source text for locating resources in the file system: - -external X use X as the user's home for installed material such as extensions - -internal X use X as the location of built-in material such as the Standard Rules - -nest X add the nest at pathname X to the search list - -transient X use X for transient data such as the extensions census + -external X use X as the user's home for installed material such as extensions + -internal X use X as the location of built-in material such as the Standard Rules + -nest X add the nest at pathname X to the search list + -transient X use X for transient data such as the extensions census for tweaking code generation from Inter: - -kit X include Inter code from the kit called X - -pipeline X specify code-generation pipeline by name (default is "compile") - -pipeline-file X specify code-generation pipeline as file X - -variable X set pipeline variable X (in form name=value) + -kit X include Inter code from the kit called X + -pipeline X specify code-generation pipeline by name (default is "compile") + -pipeline-file X specify code-generation pipeline as file X + -variable X set pipeline variable X (in form name=value) --at X specify that this tool is installed at X --crash intentionally crash on internal errors, for backtracing (default is -no-crash) --fixtime pretend the time is 11 a.m. on 28 March 2016 for testing (default is -no-fixtime) --help print this help information --locale X set locales as 'L=E', L being shell or console, E platform, utf-8 or iso-latin1 --log X write the debugging log to include diagnostics on X --version print out version number +-at X specify that this tool is installed at X +-crash intentionally crash on internal errors, for backtracing (default is -no-crash) +-fixtime pretend the time is 11 a.m. on 28 March 2016 for testing (default is -no-fixtime) +-help print this help information +-locale X set locales as 'L=E', L being shell or console, E platform, utf-8 or iso-latin1 +-log X write the debugging log to include diagnostics on X +-version print out version number