From 4e5662fb4a2c34ab89afaaeb4d07e54fe0e1ed0e Mon Sep 17 00:00:00 2001 From: David Kinder Date: Wed, 27 Apr 2022 20:32:34 +0100 Subject: [PATCH 1/3] Replace two occurrences of four spaces with a tab --- scripts/inform.mkscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/inform.mkscript b/scripts/inform.mkscript index 72aabac53..52f63f864 100644 --- a/scripts/inform.mkscript +++ b/scripts/inform.mkscript @@ -697,7 +697,7 @@ transferindext: forcetransferindext .PHONY: forcetransferindext forcetransferindext: - mkdir -p "$(INTERNAL)/Miscellany" + mkdir -p "$(INTERNAL)/Miscellany" cp -f "$(INFORM7WEB)/Internal/Miscellany/Standard.indext" "$(INTERNAL)/Miscellany/Standard.indext" cp -f "$(INFORM7WEB)/Internal/Miscellany/Basic.indext" "$(INTERNAL)/Miscellany/Basic.indext" {repeat with: LANGUAGE in: {LOCALISEDINDEXES}} @@ -796,7 +796,7 @@ forcetransferotherinternals: {set name: IMAGESETLIST value: bg_images, doc_images, map_icons, outcome_images, scene_icons} {define: transfer-images} - mkdir -p $(BUILTINHTML) + mkdir -p $(BUILTINHTML) cp -f resources/Imagery/app_images/Welcome*Background.png $(BUILTINHTML) {repeat with: SET in: {IMAGESETLIST}} mkdir -p $(BUILTINHTML)/{SET} From 6d966d4cf050739ebbeadb89d590f39b3de2a0b4 Mon Sep 17 00:00:00 2001 From: David Kinder Date: Wed, 27 Apr 2022 20:32:50 +0100 Subject: [PATCH 2/3] Updated paths for Windows --- resources/Documentation/indoc-instructions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/Documentation/indoc-instructions.txt b/resources/Documentation/indoc-instructions.txt index 6ee682543..161a96a0b 100644 --- a/resources/Documentation/indoc-instructions.txt +++ b/resources/Documentation/indoc-instructions.txt @@ -503,7 +503,7 @@ windows_app { suppress_fonts = yes declare: Windows javascript_paste_method = David - destination = ../Build/Documentation/ + destination = ../../Build/Documentation/ } linux_app { From 0f8ca86249e1e8279e96b0b4724ee0d2fd576050 Mon Sep 17 00:00:00 2001 From: David Kinder Date: Thu, 28 Apr 2022 06:42:18 +0100 Subject: [PATCH 3/3] Don't create Internal/Documentation as not used, and copy to Internal/Templates when making integration --- scripts/inform.mkscript | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/inform.mkscript b/scripts/inform.mkscript index 52f63f864..80a8ad079 100644 --- a/scripts/inform.mkscript +++ b/scripts/inform.mkscript @@ -623,7 +623,8 @@ integration: \ transferkits \ transferinternals \ transferdocumentation \ - transferoutcomepages + transferoutcomepages \ + transfertemplates .PHONY: forceintegration forceintegration: \ @@ -636,7 +637,8 @@ forceintegration: \ forcetransferimages \ forcetransferotherinternals \ forcetransferdocumentation \ - forcetransferoutcomepages + forcetransferoutcomepages \ + forcetransfertemplates # ----------------------------------------------------------------------------- # Copying part of the Inform toolchain into the app @@ -861,7 +863,6 @@ $(INTERNALEXEMPLUM): \ # agree with that. {define: compile-inapp-documentation} - mkdir -p "$(INTERNAL)/Documentation" mkdir -p $(BUILTINHTMLINNER) $(INDOCX) -from resources/Documentation -xrefs '$(INFORM7WEB)/Internal/HTML/xrefs.txt' $(INDOCOPTS) {end-define}