cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-11 10:11:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Revert "Use a dummy include to indicate TGUI isn't built" (#3181)

Browse Source 
* 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 <stylemistake@gmail.com>
This commit is contained in:
SkyratBot
2021-02-09 00:37:44 +01:00
committed by GitHub
parent 24454a93fe
commit 02571bae25
6 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -234,4 +234,3 @@ tools/LinuxOneShot/TGS_Logs
# Common build tooling # Common build tooling
!/tools/build !/tools/build
code/modules/tgui/USE_BUILD_BAT_INSTEAD_OF_DREAM_MAKER.dm

0
code/modules/tgui/USE_BUILD_BAT_INSTEAD_OF_DREAM_MAKER.dm Normal file
View File

5
code/modules/tgui/tgui.dm
View File

@@ -3,11 +3,6 @@
* SPDX-License-Identifier: MIT * 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). * tgui datum (represents a UI).
*/ */

3
tgui/bin/tgui
View File

@@ -54,7 +54,6 @@ task-install() {
task-webpack() { task-webpack() {
cd "${base_dir}" cd "${base_dir}"
yarn run webpack-cli "${@}" yarn run webpack-cli "${@}"
touch "../code/modules/tgui/USE_BUILD_BAT_INSTEAD_OF_DREAM_MAKER.dm"
} }
## Runs a development server ## Runs a development server
@@ -89,8 +88,6 @@ task-clean() {
## NPM artifacts ## NPM artifacts
rm -rf **/node_modules rm -rf **/node_modules
rm -f **/package-lock.json 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 ## Installs merge drivers and git hooks

1
tgui/bin/tgui_.ps1
View File

@@ -43,7 +43,6 @@ function task-install {
## Runs webpack ## Runs webpack
function task-webpack { function task-webpack {
yarn run webpack-cli @Args yarn run webpack-cli @Args
New-Item -ItemType file "../code/modules/tgui/USE_BUILD_BAT_INSTEAD_OF_DREAM_MAKER.dm"
} }
## Runs a development server ## Runs a development server

1
tools/build/build.js
View File

@@ -26,7 +26,6 @@ const taskTgui = new Task('tgui')
.provides('tgui/public/tgui-common.bundle.js') .provides('tgui/public/tgui-common.bundle.js')
.provides('tgui/public/tgui-panel.bundle.css') .provides('tgui/public/tgui-panel.bundle.css')
.provides('tgui/public/tgui-panel.bundle.js') .provides('tgui/public/tgui-panel.bundle.js')
.provides('code/modules/tgui/USE_BUILD_BAT_INSTEAD_OF_DREAM_MAKER.dm')
.build(async () => { .build(async () => {
// Instead of calling `tgui/bin/tgui`, we reproduce the whole pipeline // Instead of calling `tgui/bin/tgui`, we reproduce the whole pipeline
// here for maximum compilation speed. // here for maximum compilation speed.