diff --git a/README.md b/README.md index f2b7be3fd..ae3c5aa22 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Inform 7 -[Version](notes/versioning.md): 10.2.0-beta+6W96 'Krypton' (4 August 2023) +[Version](notes/versioning.md): 10.2.0-beta+6W97 'Krypton' (5 August 2023) ## About Inform diff --git a/build.txt b/build.txt index 335b4f273..bbfd8ce60 100644 --- a/build.txt +++ b/build.txt @@ -1,3 +1,3 @@ Prerelease: beta -Build Date: 4 August 2023 -Build Number: 6W96 +Build Date: 5 August 2023 +Build Number: 6W97 diff --git a/inblorb/Tests/inblorb.intest b/inblorb/Tests/inblorb.intest index 79c45b1bc..d8cf2f79b 100644 --- a/inblorb/Tests/inblorb.intest +++ b/inblorb/Tests/inblorb.intest @@ -46,6 +46,7 @@ debugger: lldb -f $I7 -- `$I7OPTIONS -project $WORK/Example.inform -crash-all step: $I7 `$I7OPTIONS -project $WORK/Example.inform >$I7CONSOLE 2>&1 or: 'failed with Problem message(s)' $I7CONSOLE + show: i7 $I7CONSOLE set: $BLURB = $WORK/Example.inform/Release.blurb match platform text: $BLURB $PATH/_Blurb_Ideal/$CASE.blurb @@ -58,7 +59,7 @@ set: $STORYFILE = $WORK/Example.inform/Build/output.$FORMAT step: $I6 `$I6OPTIONS $I6SOURCE $STORYFILE >$I6CONSOLE 2>&1 or: 'failed to pass through Inform 6' $I6CONSOLE - show i6: $I6CONSOLE + show: i6 $I6CONSOLE set: $BLORBFILE = $WORK/Example.inform/Build/output.$BLORBEXT diff --git a/inform7/Internal/Delia/Main.delia b/inform7/Internal/Delia/Main.delia index bbd8e4c51..f83f1e68d 100644 --- a/inform7/Internal/Delia/Main.delia +++ b/inform7/Internal/Delia/Main.delia @@ -6,6 +6,9 @@ default: $GENERATEINDEX = No default: $GENERATEDIAGNOSTICS = No default: $INTERNAL = inform7/Internal default: $TESTRELEASEMETADATA = No +default: $SCRIPT = +default: $LANGUAGE = Inform +default: $FOR = Glulx ! (1) Set $FORMAT to the full description of the language we will transpile ! to, and extract the source text for the case, writing it to the given file: @@ -29,6 +32,7 @@ endif set: $A = $$workspace/Actuals/$CASE.txt set: $I = $PATH/$CASE--I.txt +show: ideal $I ! (3) Make sure the "transient area" exists and is completely empty. @@ -92,6 +96,7 @@ if: $TYPE problem fail step: $I7 `$I7OPTIONS -require-problem $CASE -project $WORK/Example.inform >$A 2>&1 or: 'failed to produce its namesake Problem message' $A show: $A + show: i7 $A exists: $I or: 'produced Problem(s), but no ideal transcript existed' match problem: $A $I @@ -126,11 +131,11 @@ if: $TESTRELEASEMETADATA Yes match text: $ABLURB $IBLURB or: 'produced the wrong release blurb' - show: $ABLURB + show: blurb $ABLURB match text: $AIFICTION $IIFICTION or: 'produced the wrong iFiction metadata' - show: $AIFICTION + show: ifiction $AIFICTION else ! (7c) Testing that inform7 in -test-output mode outputs the correct internal data. @@ -140,6 +145,8 @@ if: $TESTCOMPILERINTERNALS Yes step: $I7 `$I7OPTIONS -project $WORK/Example.inform -test-output $A >$I7CONSOLE 2>&1 or: 'failed with Problem message(s)' $I7CONSOLE show: $A + show: transcript $A + show: i7 $I7CONSOLE exists: $I or: 'ran without crashing but no ideal results existed' match text: $A $I @@ -151,11 +158,12 @@ else if: $FOR C set: $I7CLIB = inform7/Internal/Miscellany - set: $TOUT = $$workspace/Actuals/$CASE.intert set: $COUT = $$workspace/Actuals/$CASE.c set: $OFILE = $WORK/Example.inform/Build/$CASE.o - step: $I7 `$I7OPTIONS $WORK/Example.inform/Source/story.ni -variable *tout=$TOUT -o $COUT >$I7CONSOLE 2>&1 + step: $I7 `$I7OPTIONS $WORK/Example.inform/Source/story.ni -o $COUT >$I7CONSOLE 2>&1 or: 'failed with Problem message(s)' $I7CONSOLE + show: i7 $I7CONSOLE + show: c $COUT set: $CCCONSOLE = $WORK/Example.inform/Build/cc_output.txt set: $LINKCONSOLE = $WORK/Example.inform/Build/link_output.txt @@ -163,15 +171,18 @@ if: $FOR C step: `$$CCOMPILER -o $OFILE $COUT -I $I7CLIB >$CCCONSOLE 2>&1 or: 'failed to compile C' $CCCONSOLE + show: cc $CCCONSOLE step: `$$CLINKER -o $STORYFILE $OFILE `$$LINKFLAGS >$LINKCONSOLE 2>&1 or: 'failed to link C' $LINKCONSOLE + show: link $LINKCONSOLE if: $COMPILEONLY No step: $STORYFILE <$SCRIPT >$A 2>&1 or: 'failed to run C program' $A show: $A + show: transcript $A match text: $A $I or: 'C program misbehaved' @@ -197,7 +208,7 @@ else step: $I7 `$I7OPTIONS -project $WORK/Example.inform >$I7CONSOLE 2>&1 or: 'failed with Problem message(s)' $I7CONSOLE - show: $I7CONSOLE + show: i7 $I7CONSOLE if: $COMPILEONLY No set: $I6 = inform6/Tangled/inform6 @@ -211,12 +222,13 @@ else step: $I6 `$I6OPTIONS $I6SOURCE $STORYFILE >$I6CONSOLE 2>&1 or: 'failed to pass through Inform 6' $I6CONSOLE - show i6: $I6CONSOLE + show: i6 $I6CONSOLE step: $INTERPRETER `$INTOPTIONS $STORYFILE <$SCRIPT >$A 2>&1 or: 'unable to run interpreter (do you need to make interpreters?)' - show transcript: $A + show: $A + show: transcript $A exists: $I or: 'translated successfully but no ideal transcript existed' diff --git a/inform7/Internal/Inter/Architecture16Kit/kit_metadata.json b/inform7/Internal/Inter/Architecture16Kit/kit_metadata.json index cccdd16ed..ccd696988 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+6W96" + "version": "10.2.0-beta+6W97" }, "compatibility": "16-bit", "kit-details": { diff --git a/inform7/Internal/Inter/Architecture32Kit/kit_metadata.json b/inform7/Internal/Inter/Architecture32Kit/kit_metadata.json index ca45b302a..7450a018c 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+6W96" + "version": "10.2.0-beta+6W97" }, "compatibility": "32-bit", "kit-details": { diff --git a/inform7/Internal/Inter/BasicInformKit/kit_metadata.json b/inform7/Internal/Inter/BasicInformKit/kit_metadata.json index 5710e9b53..183edcb10 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+6W96" + "version": "10.2.0-beta+6W97" }, "needs": [ { "need": { diff --git a/inform7/Internal/Inter/CommandParserKit/kit_metadata.json b/inform7/Internal/Inter/CommandParserKit/kit_metadata.json index 081c48758..2d9ce7382 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+6W96" + "version": "10.2.0-beta+6W97" }, "needs": [ { "need": { diff --git a/inform7/Internal/Inter/EnglishLanguageKit/kit_metadata.json b/inform7/Internal/Inter/EnglishLanguageKit/kit_metadata.json index 8171d31d7..4c75e933b 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+6W96" + "version": "10.2.0-beta+6W97" }, "needs": [ { "need": { diff --git a/inform7/Internal/Inter/WorldModelKit/kit_metadata.json b/inform7/Internal/Inter/WorldModelKit/kit_metadata.json index 9202f590e..e4fb48ff9 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+6W96" + "version": "10.2.0-beta+6W97" }, "needs": [ { "need": { diff --git a/inform7/Tests/inform7.intest b/inform7/Tests/inform7.intest index 068c35538..52a20cc87 100644 --- a/inform7/Tests/inform7.intest +++ b/inform7/Tests/inform7.intest @@ -1,4 +1,4 @@ --set hash_cache 'inform7/Tests/hashes.intest' +-set hash_cache 'inform7/Tests/hashes.intest' ! These are needed for C examples and test cases, and for the Make recipe, ! but not for anything else: @@ -27,7 +27,7 @@ -annotated-cases [Main:EXTERNAL=inform7/Tests] 'inform7/Tests/Test Internals' -examples [Main:EXTERNAL=inform7/Tests] 'resources/Documentation/Examples' -annotated-problems [Main:EXTERNAL=inform7/Tests] 'inform7/Tests/Test Problems' --if macos -annotated-cases [Main:EXTERNAL=inform7/Tests] 'inform7/Tests/Test Releases' +-if MacOS -annotated-cases [Main:EXTERNAL=inform7/Tests] 'inform7/Tests/Test Releases' -recipe [Main] '$$internal/Delia/Main.delia' -cases [Make] 'inform7/Tests/Test Makes'