From d45477f79c2809ec9a1269a435dcbb0746e6f39b Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Tue, 2 Feb 2021 05:29:47 -0500 Subject: [PATCH] Use a dummy include to indicate TGUI isn't built (#56470) --- .gitignore | 1 + code/modules/tgui/tgui.dm | 5 +++++ tgui/bin/tgui | 3 +++ tgui/bin/tgui_.ps1 | 1 + tools/build/build.js | 1 + 5 files changed, 11 insertions(+) diff --git a/.gitignore b/.gitignore index dd20fecd22c..e0653e57596 100644 --- a/.gitignore +++ b/.gitignore @@ -234,3 +234,4 @@ tools/LinuxOneShot/TGS_Logs # Common build tooling !/tools/build +code/modules/tgui/USE_BUILD_BAT_INSTEAD_OF_DREAM_MAKER.dm diff --git a/code/modules/tgui/tgui.dm b/code/modules/tgui/tgui.dm index b99783f67ad..cecb8e1ae2c 100644 --- a/code/modules/tgui/tgui.dm +++ b/code/modules/tgui/tgui.dm @@ -3,6 +3,11 @@ * SPDX-License-Identifier: MIT */ +#ifndef SPACEMAN_DMM +// Empty file generated by tgui build. Makes the problem clearer if it hasn't been built. +#include "USE_BUILD_BAT_INSTEAD_OF_DREAM_MAKER.dm" +#endif + /** * tgui datum (represents a UI). */ diff --git a/tgui/bin/tgui b/tgui/bin/tgui index d2f91e3f783..5584abe4d5d 100755 --- a/tgui/bin/tgui +++ b/tgui/bin/tgui @@ -54,6 +54,7 @@ task-install() { task-webpack() { cd "${base_dir}" yarn run webpack-cli "${@}" + touch "../code/modules/tgui/USE_BUILD_BAT_INSTEAD_OF_DREAM_MAKER.dm" } ## Runs a development server @@ -88,6 +89,8 @@ task-clean() { ## NPM artifacts rm -rf **/node_modules rm -f **/package-lock.json + ## Dummy DM + rm -f ../code/modules/tgui/USE_BUILD_BAT_INSTEAD_OF_DREAM_MAKER.dm } ## Installs merge drivers and git hooks diff --git a/tgui/bin/tgui_.ps1 b/tgui/bin/tgui_.ps1 index 2c337bfe95c..ba6b4d8ce60 100644 --- a/tgui/bin/tgui_.ps1 +++ b/tgui/bin/tgui_.ps1 @@ -43,6 +43,7 @@ function task-install { ## Runs webpack function task-webpack { yarn run webpack-cli @Args + New-Item -ItemType file "../code/modules/tgui/USE_BUILD_BAT_INSTEAD_OF_DREAM_MAKER.dm" } ## Runs a development server diff --git a/tools/build/build.js b/tools/build/build.js index e1d078bec9d..b7ef585c4c6 100755 --- a/tools/build/build.js +++ b/tools/build/build.js @@ -26,6 +26,7 @@ const taskTgui = new Task('tgui') .provides('tgui/public/tgui-common.bundle.js') .provides('tgui/public/tgui-panel.bundle.css') .provides('tgui/public/tgui-panel.bundle.js') + .provides('code/modules/tgui/USE_BUILD_BAT_INSTEAD_OF_DREAM_MAKER.dm') .build(async () => { // Instead of calling `tgui/bin/tgui`, we reproduce the whole pipeline // here for maximum compilation speed.