From 20f9472eb59935b449db589cf196e8a5a7581265 Mon Sep 17 00:00:00 2001
From: Arkerthan <arkerthan@mailbox.org>
Date: Tue, 21 Dec 2021 10:17:34 +0100
Subject: [PATCH] Improve SC2 building framework
---
Makefile | 4 +++-
devNotes/sugarcube stuff/building SugarCube.md | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index d5c21c16226..9c0c42af3a8 100644
--- a/Makefile
+++ b/Makefile
@@ -53,6 +53,8 @@ sanity:
sugarcube:
(cd submodules/sugarcube-2/ && node build.js -6 -b 2)
- cp submodules/sugarcube-2/build/twine2/sugarcube-2/format.js devTools/tweeGo/storyFormats/sugarcube-2/format.js
+ mv submodules/sugarcube-2/build/twine2/sugarcube-2/format.js devTools/tweeGo/storyFormats/sugarcube-2/format.js
+ (cd submodules/sugarcube-2/ && git diff master fc > sugarcube-fc-changes.patch)
+ mv submodules/sugarcube-2/sugarcube-fc-changes.patch devNotes/"sugarcube stuff"/sugarcube-fc-changes.patch
.PHONY: all sanity git injectGitCommitHash sugarcube
diff --git a/devNotes/sugarcube stuff/building SugarCube.md b/devNotes/sugarcube stuff/building SugarCube.md
index a6c6b92edc7..bcaf35ec754 100644
--- a/devNotes/sugarcube stuff/building SugarCube.md
+++ b/devNotes/sugarcube stuff/building SugarCube.md
@@ -19,7 +19,7 @@ the PATH environment variable.
The SC2 sources are a git submodule.
-1. Get the sources: `git submodule update`
+1. Get the sources: If it's the first time: `git submodule update --init --recursive`, afterwards `git submodule update` is enough.
2. Download required JavaScript libraries that are used during the build.
Run the node package manager (npm) in the repository: `npm install` or `npm update`.
--
GitLab