Skip to content

Commit

Permalink
Makes travis less shit.
Browse files Browse the repository at this point in the history
  • Loading branch information
MrStonedOne committed Jan 20, 2017
1 parent 3f7ec5b commit bdceba9
Show file tree
Hide file tree
Showing 8 changed files with 62 additions and 12 deletions.
7 changes: 1 addition & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,8 @@ env:
- DM_MAPFILE=""
matrix:
- BUILD_TOOLS=true
- DM_MAPFILE="tgstation2"
- DM_MAPFILE="metastation"
- DM_MAPFILE="birdstation"
- DM_MAPFILE="pubbystation"
- DM_MAPFILE="templates"
- DM_MAPFILE="omegastation"
- DM_MAPFILE="deltastation"
- DM_MAPFILE="loadallmaps"

cache:
directories:
Expand Down
3 changes: 2 additions & 1 deletion _maps/birdstation.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ A small map intended for lowpop(40 players and less).
#define MINETYPE "lavaland"

#include "map_files\BirdStation\BirdStation.dmm"
#ifndef TRAVIS_MASS_MAP_BUILD
#include "map_files\generic\z2.dmm"
#include "map_files\generic\z3.dmm"
#include "map_files\generic\z4.dmm"
Expand All @@ -29,7 +30,7 @@ A small map intended for lowpop(40 players and less).
#define MAP_NAME "BirdboatStation"

#define MAP_TRANSITION_CONFIG DEFAULT_MAP_TRANSITION_CONFIG

#endif
#if !defined(MAP_OVERRIDE_FILES)
#define MAP_OVERRIDE_FILES
#include "map_files\BirdStation\job\job_changes.dm"
Expand Down
3 changes: 2 additions & 1 deletion _maps/deltastation.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#define MINETYPE "lavaland"

#include "map_files\DeltaStation\DeltaStation2.dmm"
#ifndef TRAVIS_MASS_MAP_BUILD
#include "map_files\generic\z2.dmm"
#include "map_files\generic\z3.dmm"
#include "map_files\generic\z4.dmm"
Expand All @@ -21,7 +22,7 @@
#define MAP_NAME "Delta Station"

#define MAP_TRANSITION_CONFIG DEFAULT_MAP_TRANSITION_CONFIG

#endif
#elif !defined(MAP_OVERRIDE)

#warn a map has already been included, deltastation.
Expand Down
49 changes: 49 additions & 0 deletions _maps/loadallmaps.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
#define TRAVIS_MASS_MAP_BUILD
#define MAP_TRANSITION_CONFIG DEFAULT_MAP_TRANSITION_CONFIG

#include "birdstation.dm"
#ifdef MAP_OVERRIDE_FILES
#undef MAP_OVERRIDE_FILES
#endif

#include "deltastation.dm"
#ifdef MAP_OVERRIDE_FILES
#undef MAP_OVERRIDE_FILES
#endif

#include "metastation.dm"
#ifdef MAP_OVERRIDE_FILES
#undef MAP_OVERRIDE_FILES
#endif

#include "omegastation.dm"
#ifdef MAP_OVERRIDE_FILES
#undef MAP_OVERRIDE_FILES
#endif

#include "pubbystation.dm"
#ifdef MAP_OVERRIDE_FILES
#undef MAP_OVERRIDE_FILES
#endif

#include "tgstation2.dm"
#ifdef MAP_OVERRIDE_FILES
#undef MAP_OVERRIDE_FILES
#endif

#include "map_files\generic\z2.dmm"
#include "map_files\generic\z3.dmm"
#include "map_files\generic\z4.dmm"
#include "map_files\generic\lavaland.dmm"
#include "map_files\generic\z6.dmm"
#include "map_files\generic\z7.dmm"
#include "map_files\generic\z8.dmm"
#include "map_files\generic\z9.dmm"
#include "map_files\generic\z10.dmm"
#include "map_files\generic\z11.dmm"

#undef TRAVIS_MASS_MAP_BUILD

#include "runtimestation.dm"

#define BYOND_WHY_YOU_NO_ALLOW_INCLUDE_LAST_LINE //because byond fails to compile if the last thing in a file is an include.
3 changes: 2 additions & 1 deletion _maps/metastation.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#define MINETYPE "lavaland"

#include "map_files\MetaStation\MetaStation.dmm"
#ifndef TRAVIS_MASS_MAP_BUILD
#include "map_files\generic\z2.dmm"
#include "map_files\generic\z3.dmm"
#include "map_files\generic\z4.dmm"
Expand All @@ -21,7 +22,7 @@
#define MAP_NAME "MetaStation"

#define MAP_TRANSITION_CONFIG DEFAULT_MAP_TRANSITION_CONFIG

#endif
#elif !defined(MAP_OVERRIDE)

#warn a map has already been included, ignoring MetaStation.
Expand Down
3 changes: 2 additions & 1 deletion _maps/omegastation.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#define MINETYPE "lavaland"

#include "map_files\OmegaStation\OmegaStation.dmm"
#ifndef TRAVIS_MASS_MAP_BUILD
#include "map_files\generic\z2.dmm"
#include "map_files\generic\z3.dmm"
#include "map_files\generic\z4.dmm"
Expand All @@ -21,7 +22,7 @@
#define MAP_NAME "OmegaStation"

#define MAP_TRANSITION_CONFIG DEFAULT_MAP_TRANSITION_CONFIG

#endif
#if !defined(MAP_OVERRIDE_FILES)
#define MAP_OVERRIDE_FILES
#include "map_files\OmegaStation\job\job_changes.dm"
Expand Down
3 changes: 2 additions & 1 deletion _maps/pubbystation.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#define MINETYPE "lavaland"

#include "map_files\PubbyStation\PubbyStation.dmm"
#ifndef TRAVIS_MASS_MAP_BUILD
#include "map_files\generic\z2.dmm"
#include "map_files\generic\z3.dmm"
#include "map_files\generic\z4.dmm"
Expand All @@ -21,7 +22,7 @@
#define MAP_NAME "PubbyStation"

#define MAP_TRANSITION_CONFIG DEFAULT_MAP_TRANSITION_CONFIG

#endif
#if !defined(MAP_OVERRIDE_FILES)
#define MAP_OVERRIDE_FILES
#include "map_files\PubbyStation\job\job_changes.dm"
Expand Down
3 changes: 2 additions & 1 deletion _maps/tgstation2.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#define MINETYPE "lavaland"

#include "map_files\TgStation\tgstation.2.1.3.dmm"
#ifndef TRAVIS_MASS_MAP_BUILD
#include "map_files\generic\z2.dmm"
#include "map_files\generic\z3.dmm"
#include "map_files\generic\z4.dmm"
Expand All @@ -21,7 +22,7 @@
#define MAP_NAME "Box Station"

#define MAP_TRANSITION_CONFIG DEFAULT_MAP_TRANSITION_CONFIG

#endif
#elif !defined(MAP_OVERRIDE)

#warn a map has already been included, ignoring /tg/station 2.
Expand Down

0 comments on commit bdceba9

Please sign in to comment.