From 02571bae25fa959ad0129ae34b04cf3ba1e0345c Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 9 Feb 2021 00:37:44 +0100 Subject: [PATCH] [MIRROR] Revert "Use a dummy include to indicate TGUI isn't built" (#3181) * Revert "Use a dummy include to indicate TGUI isn't built (#56470)" (#56711) * Revert "Use a dummy include to indicate TGUI isn't built" Co-authored-by: Aleksej Komarov --- .gitignore | 1 - code/modules/tgui/USE_BUILD_BAT_INSTEAD_OF_DREAM_MAKER.dm | 0 code/modules/tgui/tgui.dm | 5 ----- tgui/bin/tgui | 3 --- tgui/bin/tgui_.ps1 | 1 - tools/build/build.js | 1 - 6 files changed, 11 deletions(-) create mode 100644 code/modules/tgui/USE_BUILD_BAT_INSTEAD_OF_DREAM_MAKER.dm diff --git a/.gitignore b/.gitignore index e0653e57596..dd20fecd22c 100644 --- a/.gitignore +++ b/.gitignore @@ -234,4 +234,3 @@ 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/USE_BUILD_BAT_INSTEAD_OF_DREAM_MAKER.dm b/code/modules/tgui/USE_BUILD_BAT_INSTEAD_OF_DREAM_MAKER.dm new file mode 100644 index 00000000000..e69de29bb2d diff --git a/code/modules/tgui/tgui.dm b/code/modules/tgui/tgui.dm index cecb8e1ae2c..b99783f67ad 100644 --- a/code/modules/tgui/tgui.dm +++ b/code/modules/tgui/tgui.dm @@ -3,11 +3,6 @@ * 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 5584abe4d5d..d2f91e3f783 100755 --- a/tgui/bin/tgui +++ b/tgui/bin/tgui @@ -54,7 +54,6 @@ 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 @@ -89,8 +88,6 @@ 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 ba6b4d8ce60..2c337bfe95c 100644 --- a/tgui/bin/tgui_.ps1 +++ b/tgui/bin/tgui_.ps1 @@ -43,7 +43,6 @@ 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 590fa1b0a6c..f5b4bf384d3 100755 --- a/tools/build/build.js +++ b/tools/build/build.js @@ -26,7 +26,6 @@ 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.