From 5a1f5fc0f451a3cae35cbd34b5b337f79d0a74ce Mon Sep 17 00:00:00 2001 From: Graham Nelson Date: Sat, 30 Sep 2023 15:28:16 +0100 Subject: [PATCH] Updated main Delia test recipe to avoid rm calls on Windows --- README.md | 2 +- build.txt | 4 ++-- .../Chapter 7/Extensions Index Page.w | 2 +- inform7/Internal/Delia/Main.delia | 23 +++++++++++-------- .../Inter/Architecture16Kit/kit_metadata.json | 2 +- .../Inter/Architecture32Kit/kit_metadata.json | 2 +- .../Inter/BasicInformKit/kit_metadata.json | 2 +- .../Inter/CommandParserKit/kit_metadata.json | 2 +- .../EnglishLanguageKit/kit_metadata.json | 2 +- .../Inter/WorldModelKit/kit_metadata.json | 2 +- 10 files changed, 23 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 6531ebf14..ee5a14a91 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Inform 7 -[Version](notes/versioning.md): 10.2.0-beta+6X24 'Krypton' (29 September 2023) +[Version](notes/versioning.md): 10.2.0-beta+6X25 'Krypton' (30 September 2023) ## About Inform diff --git a/build.txt b/build.txt index ab0b23d9b..420711d1e 100644 --- a/build.txt +++ b/build.txt @@ -1,3 +1,3 @@ Prerelease: beta -Build Date: 29 September 2023 -Build Number: 6X24 +Build Date: 30 September 2023 +Build Number: 6X25 diff --git a/inbuild/supervisor-module/Chapter 7/Extensions Index Page.w b/inbuild/supervisor-module/Chapter 7/Extensions Index Page.w index a198fca64..07b621fcc 100644 --- a/inbuild/supervisor-module/Chapter 7/Extensions Index Page.w +++ b/inbuild/supervisor-module/Chapter 7/Extensions Index Page.w @@ -390,7 +390,7 @@ the usual ones seen in Mac OS X applications such as iTunes. if (sl.file_of_origin) { WRITE(" "); HTML_OPEN("em"); - WRITE("— included "); + WRITE("— included here: "); HTML_CLOSE("em"); WRITE(" "); SourceLinks::link(OUT, sl, TRUE); diff --git a/inform7/Internal/Delia/Main.delia b/inform7/Internal/Delia/Main.delia index b1479bd0c..2756b2bf3 100644 --- a/inform7/Internal/Delia/Main.delia +++ b/inform7/Internal/Delia/Main.delia @@ -137,17 +137,20 @@ endif set: $I7CONSOLE = $WORK/Example.inform/Build/i7_output.txt set: $I7LOG = '$WORK/Example.inform/Build/Debug log.txt' -! (6) Clearing any external files used by the test. +! (6) Clearing any external files used by the test. Delia has no loops... ifdef: $EXTERNALFILES - if: $EXTERNALFILES ' *%C+.glkdata *' - step: rm -f `$EXTERNALFILES + if: $EXTERNALFILES ' *(%C+.glkdata) *' + remove: `$SUBEXPRESSION1 endif - if: $EXTERNALFILES ' *%C+.glkdata *%C+.glkdata *' - step: rm -f `$EXTERNALFILES + if: $EXTERNALFILES ' *(%C+.glkdata) (%C+.glkdata) *' + remove: `$SUBEXPRESSION1 + remove: `$SUBEXPRESSION2 endif - if: $EXTERNALFILES ' *%C+.glkdata *%C+.glkdata *%C+.glkdata *' - step: rm -f `$EXTERNALFILES + if: $EXTERNALFILES ' *(%C+.glkdata) (%C+.glkdata) (%C+.glkdata) *' + remove: `$SUBEXPRESSION1 + remove: `$SUBEXPRESSION2 + remove: `$SUBEXPRESSION3 endif endif @@ -349,13 +352,13 @@ endif ifdef: $EXTERNALFILES if: $EXTERNALFILES ' *%C+.glkdata *' - step: rm -f `$EXTERNALFILES + remove: `$EXTERNALFILES endif if: $EXTERNALFILES ' *%C+.glkdata *%C+.glkdata *' - step: rm -f `$EXTERNALFILES + remove: `$EXTERNALFILES endif if: $EXTERNALFILES ' *%C+.glkdata *%C+.glkdata *%C+.glkdata *' - step: rm -f `$EXTERNALFILES + remove: `$EXTERNALFILES endif endif diff --git a/inform7/Internal/Inter/Architecture16Kit/kit_metadata.json b/inform7/Internal/Inter/Architecture16Kit/kit_metadata.json index e766a6b7e..43da1e144 100644 --- a/inform7/Internal/Inter/Architecture16Kit/kit_metadata.json +++ b/inform7/Internal/Inter/Architecture16Kit/kit_metadata.json @@ -2,7 +2,7 @@ "is": { "type": "kit", "title": "Architecture16Kit", - "version": "10.2.0-beta+6X24" + "version": "10.2.0-beta+6X25" }, "compatibility": "16-bit", "kit-details": { diff --git a/inform7/Internal/Inter/Architecture32Kit/kit_metadata.json b/inform7/Internal/Inter/Architecture32Kit/kit_metadata.json index 14fc38b80..751bbbe9a 100644 --- a/inform7/Internal/Inter/Architecture32Kit/kit_metadata.json +++ b/inform7/Internal/Inter/Architecture32Kit/kit_metadata.json @@ -2,7 +2,7 @@ "is": { "type": "kit", "title": "Architecture32Kit", - "version": "10.2.0-beta+6X24" + "version": "10.2.0-beta+6X25" }, "compatibility": "32-bit", "kit-details": { diff --git a/inform7/Internal/Inter/BasicInformKit/kit_metadata.json b/inform7/Internal/Inter/BasicInformKit/kit_metadata.json index 911ce5128..823d0cdbe 100644 --- a/inform7/Internal/Inter/BasicInformKit/kit_metadata.json +++ b/inform7/Internal/Inter/BasicInformKit/kit_metadata.json @@ -2,7 +2,7 @@ "is": { "type": "kit", "title": "BasicInformKit", - "version": "10.2.0-beta+6X24" + "version": "10.2.0-beta+6X25" }, "needs": [ { "need": { diff --git a/inform7/Internal/Inter/CommandParserKit/kit_metadata.json b/inform7/Internal/Inter/CommandParserKit/kit_metadata.json index d37556aa7..96599e039 100644 --- a/inform7/Internal/Inter/CommandParserKit/kit_metadata.json +++ b/inform7/Internal/Inter/CommandParserKit/kit_metadata.json @@ -2,7 +2,7 @@ "is": { "type": "kit", "title": "CommandParserKit", - "version": "10.2.0-beta+6X24" + "version": "10.2.0-beta+6X25" }, "needs": [ { "need": { diff --git a/inform7/Internal/Inter/EnglishLanguageKit/kit_metadata.json b/inform7/Internal/Inter/EnglishLanguageKit/kit_metadata.json index 7aef6a311..e62f37e04 100644 --- a/inform7/Internal/Inter/EnglishLanguageKit/kit_metadata.json +++ b/inform7/Internal/Inter/EnglishLanguageKit/kit_metadata.json @@ -2,7 +2,7 @@ "is": { "type": "kit", "title": "EnglishLanguageKit", - "version": "10.2.0-beta+6X24" + "version": "10.2.0-beta+6X25" }, "needs": [ { "need": { diff --git a/inform7/Internal/Inter/WorldModelKit/kit_metadata.json b/inform7/Internal/Inter/WorldModelKit/kit_metadata.json index 542ac2c77..f41611ffd 100644 --- a/inform7/Internal/Inter/WorldModelKit/kit_metadata.json +++ b/inform7/Internal/Inter/WorldModelKit/kit_metadata.json @@ -2,7 +2,7 @@ "is": { "type": "kit", "title": "WorldModelKit", - "version": "10.2.0-beta+6X24" + "version": "10.2.0-beta+6X25" }, "needs": [ { "need": {