Skip to content

Commit

Permalink
[chore] Update the DME to leave Alpha (cmss13-devs#2863)
Browse files Browse the repository at this point in the history
we do not use have a software release cycle, cm is in perpetual beta
state, as it is always been updated and "improved"
  • Loading branch information
hry-gh authored Mar 19, 2023
1 parent 06e75d2 commit 40e1c33
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci_suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ jobs:
tools/bootstrap/python -c ''
- name: Run Linters
run: |
bash tools/ci/check_filedirs.sh ColonialMarinesALPHA.dme
bash tools/ci/check_filedirs.sh colonialmarines.dme
bash tools/ci/check_changelogs.sh
bash tools/ci/check_grep.sh
bash tools/ci/check_misc.sh
tools/bootstrap/python tools/ci/validate_dme.py < ColonialMarinesALPHA.dme
tools/bootstrap/python tools/ci/validate_dme.py < colonialmarines.dme
tools/bootstrap/python -m tools.maplint.source --github
tools/build/build --ci lint tgui-test
tools/bootstrap/python -m dmi.test
Expand Down
4 changes: 2 additions & 2 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
},
{
"type": "dreammaker",
"dme": "ColonialMarinesALPHA.dme",
"dme": "colonialmarines.dme",
"problemMatcher": [
"$dreammaker"
],
"group": "build",
"label": "dm: build - ColonialMarinesALPHA.dme"
"label": "dm: build - colonialmarines.dme"
},
{
"command": "${command:dreammaker.reparse}",
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# TODO: Use an .envfile and make everyone use it instead
ARG BYOND_BASE_IMAGE=ubuntu:focal
ARG UTILITY_BASE_IMAGE=alpine:3
ARG PROJECT_NAME=ColonialMarinesALPHA
ARG PROJECT_NAME=colonialmarines
ARG BYOND_MAJOR=514
ARG BYOND_MINOR=1575
ARG NODE_VERSION=16
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ On **2022-04-06** we have changed the way to compile the codebase.

**The quick way**. Find `bin/server.cmd` in this folder and double click it to automatically build and host the server on port 1337.

**The long way**. Find `bin/build.cmd` in this folder, and double click it to initiate the build. It consists of multiple steps and might take around 1-5 minutes to compile. If it closes, it means it has finished its job. You can then set up the server normally by opening `ColonialMarinesALPHA.dmb` in DreamDaemon.
**The long way**. Find `bin/build.cmd` in this folder, and double click it to initiate the build. It consists of multiple steps and might take around 1-5 minutes to compile. If it closes, it means it has finished its job. You can then set up the server normally by opening `colonialmarines.dmb` in DreamDaemon.

**Building ColonialMarinesALPHA in DreamMaker directly is now deprecated and might produce errors**, such as `'tgui.bundle.js': cannot find file`.
**Building colonialmarines in DreamMaker directly is now deprecated and might produce errors**, such as `'tgui.bundle.js': cannot find file`.

**[How to compile in VSCode and other build options](tools/build/README.md).**

Expand Down
2 changes: 1 addition & 1 deletion ColonialMarinesALPHA.dme → colonialmarines.dme
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// DM Environment file for baystation12.dme.
// DM Environment file for colonialmarines.dme.
// All manual changes should be made outside the BEGIN_ and END_ blocks.
// New source code should be placed in .dm files: choose File/New --> Code File.
// BEGIN_INTERNALS
Expand Down
6 changes: 3 additions & 3 deletions compile_and_test.bat
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
@echo off
call dm ColonialMarinesALPHA.dme
call dm colonialmarines.dme
if %ERRORLEVEL% == 0 goto :run_server
goto :end

:run_server
call DreamDaemon ColonialMarinesALPHA.dmb 58140 -trusted -params "local_test=1"
call DreamDaemon colonialmarines.dmb 58140 -trusted -params "local_test=1"

:end
exit
exit
2 changes: 1 addition & 1 deletion tools/build/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Juke.setup({ file: import.meta.url }).then((code) => {
process.exit(code);
});

const DME_NAME = "ColonialMarinesALPHA";
const DME_NAME = "colonialmarines";

export const DefineParameter = new Juke.Parameter({
type: "string[]",
Expand Down
2 changes: 1 addition & 1 deletion tools/ci/run_server.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ cp maps/$MAP.json ci_test/data/next_map.json
cp maps/templates/space.json ci_test/data/next_ship.json

cd ci_test
DreamDaemon ColonialMarinesALPHA.dmb -close -trusted -verbose -params "log-directory=ci"
DreamDaemon colonialmarines.dmb -close -trusted -verbose -params "log-directory=ci"
cd ..
cat ci_test/data/logs/ci/clean_run.lk
2 changes: 1 addition & 1 deletion tools/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ if [ -d ".git" ]; then
cp -r .git/logs/* $1/.git/logs/
fi

cp ColonialMarinesALPHA.dmb ColonialMarinesALPHA.rsc $1/
cp colonialmarines.dmb colonialmarines.rsc $1/
cp -r maps/* $1/maps/
cp -r icons/* $1/icons/
cp -r sound/* $1/sound/
Expand Down
2 changes: 1 addition & 1 deletion tools/expand_filedir_paths.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,6 @@ def replace_func(name):
os.remove(path)
os.rename(path + ".tmp", path)

dirs = read_filedirs("ColonialMarinesALPHA.dme");
dirs = read_filedirs("colonialmarines.dme");
resources = index_files(dirs)
rewrite_sources(resources)

0 comments on commit 40e1c33

Please sign in to comment.