monster/RECORDANDRONCO
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove INCLUDE_DEFAULT_MODS setting.

Browse Source 
In practice this makes life more difficult than needed
for modders, who instead implement hacky workarounds.
This commit is contained in:
Paul Chote 2018-04-18 16:13:12 +00:00
parent 20c6c64c36
commit e46015c29f
8 changed files with 5 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
launch-dedicated.sh
View File

@ -10,6 +10,7 @@ command -v mono >/dev/null 2>&1 || { echo >&2 "The OpenRA mod template requires
TEMPLATE_LAUNCHER=$(python -c "import os; print(os.path.realpath('$0'))")
TEMPLATE_ROOT=$(dirname "${TEMPLATE_LAUNCHER}")
MOD_SEARCH_PATHS="${TEMPLATE_ROOT}/mods,./mods"
# shellcheck source=mod.config
. "${TEMPLATE_ROOT}/mod.config"
@ -19,11 +20,6 @@ if [ -f "${TEMPLATE_ROOT}/user.config" ]; then
. "${TEMPLATE_ROOT}/user.config"
fi
MOD_SEARCH_PATHS="${TEMPLATE_ROOT}/mods"
if [ "${INCLUDE_DEFAULT_MODS}" = "True" ]; then
MOD_SEARCH_PATHS="${MOD_SEARCH_PATHS},./mods"
fi
NAME="${Name:-"Dedicated Server"}"
LAUNCH_MOD="${Mod:-"${MOD_ID}"}"
LISTEN_PORT="${ListenPort:-"1234"}"

6
launch-game.sh
View File

@ -6,6 +6,7 @@ command -v mono >/dev/null 2>&1 || { echo >&2 "The OpenRA mod template requires
TEMPLATE_LAUNCHER=$(python -c "import os; print(os.path.realpath('$0'))")
TEMPLATE_ROOT=$(dirname "${TEMPLATE_LAUNCHER}")
MOD_SEARCH_PATHS="${TEMPLATE_ROOT}/mods,./mods"
# shellcheck source=mod.config
. "${TEMPLATE_ROOT}/mod.config"
@ -15,11 +16,6 @@ if [ -f "${TEMPLATE_ROOT}/user.config" ]; then
. "${TEMPLATE_ROOT}/user.config"
fi
MOD_SEARCH_PATHS="${TEMPLATE_ROOT}/mods"
if [ "${INCLUDE_DEFAULT_MODS}" = "True" ]; then
MOD_SEARCH_PATHS="${MOD_SEARCH_PATHS},./mods"
fi
cd "${TEMPLATE_ROOT}"
if [ ! -f "${ENGINE_DIRECTORY}/OpenRA.Game.exe" ] || [ "$(cat "${ENGINE_DIRECTORY}/VERSION")" != "${ENGINE_VERSION}" ]; then
echo "Required engine files not found."

8
make.ps1
View File

@ -217,7 +217,7 @@ function ReadConfigLine($line, $name)
function ParseConfigFile($fileName)
{
$names = @("MOD_ID", "INCLUDE_DEFAULT_MODS", "ENGINE_VERSION", "AUTOMATIC_ENGINE_MANAGEMENT", "AUTOMATIC_ENGINE_SOURCE",
$names = @("MOD_ID", "ENGINE_VERSION", "AUTOMATIC_ENGINE_MANAGEMENT", "AUTOMATIC_ENGINE_SOURCE",
"AUTOMATIC_ENGINE_EXTRACT_DIRECTORY", "AUTOMATIC_ENGINE_TEMP_ARCHIVE_NAME", "ENGINE_DIRECTORY")
$reader = [System.IO.File]::OpenText($fileName)
@ -272,11 +272,7 @@ if (Test-Path "user.config")
$modID = $env:MOD_ID
$env:MOD_SEARCH_PATHS = (Get-Item -Path ".\" -Verbose).FullName + "\mods"
if ($env:INCLUDE_DEFAULT_MODS -eq "True")
{
$env:MOD_SEARCH_PATHS = $env:MOD_SEARCH_PATHS + ",./mods"
}
$env:MOD_SEARCH_PATHS = (Get-Item -Path ".\" -Verbose).FullName + "\mods,./mods"
# Run the same command on the engine's make file
if ($command -eq "all" -or $command -eq "clean")

6
mod.config
View File

@ -11,12 +11,6 @@ MOD_ID="example"
# The OpenRA engine version to use for this project.
ENGINE_VERSION="release-20180307"
# Enable this to make the default OpenRA mods available for use in your mod.yaml
# Packages list (via $mod references). Accepts values "True" or "False".
# WARNING: This setting is provided to simplify early project development,
# and must be disabled before you can package installers for your project!
INCLUDE_DEFAULT_MODS="False"
##############################################################################
# Continuous Integration
#

6
packaging/linux/buildpackage.sh
View File

@ -23,12 +23,6 @@ if [ -f "${TEMPLATE_ROOT}/user.config" ]; then
. "${TEMPLATE_ROOT}/user.config"
fi
if [ "${INCLUDE_DEFAULT_MODS}" = "True" ]; then
echo "Cannot generate installers while INCLUDE_DEFAULT_MODS is enabled."
echo "Make sure that this setting is disabled in both your mod.config and user.config."
exit 1
fi
TAG="$1"
if [ $# -eq "1" ]; then
OUTPUTDIR=$(python -c "import os; print(os.path.realpath('.'))")

6
packaging/osx/buildpackage.sh
View File

@ -22,12 +22,6 @@ if [ -f "${TEMPLATE_ROOT}/user.config" ]; then
. "${TEMPLATE_ROOT}/user.config"
fi
if [ "${INCLUDE_DEFAULT_MODS}" = "True" ]; then
echo "Cannot generate installers while INCLUDE_DEFAULT_MODS is enabled."
echo "Make sure that this setting is disabled in both your mod.config and user.config."
exit 1
fi
TAG="$1"
if [ $# -eq "1" ]; then
OUTPUTDIR=$(python -c "import os; print(os.path.realpath('.'))")

6
packaging/windows/buildpackage.sh
View File

@ -20,12 +20,6 @@ if [ -f "${TEMPLATE_ROOT}/user.config" ]; then
. "${TEMPLATE_ROOT}/user.config"
fi
if [ "${INCLUDE_DEFAULT_MODS}" = "True" ]; then
echo "Cannot generate installers while INCLUDE_DEFAULT_MODS is enabled."
echo "Make sure that this setting is disabled in both your mod.config and user.config."
exit 1
fi
TAG="$1"
if [ $# -eq "1" ]; then
OUTPUTDIR=$(python -c "import os; print(os.path.realpath('.'))")

6
utility.sh
View File

@ -10,6 +10,7 @@ command -v mono >/dev/null 2>&1 || { echo >&2 "The OpenRA mod template requires
TEMPLATE_LAUNCHER=$(python -c "import os; print(os.path.realpath('$0'))")
TEMPLATE_ROOT=$(dirname "${TEMPLATE_LAUNCHER}")
MOD_SEARCH_PATHS="${TEMPLATE_ROOT}/mods,./mods"
# shellcheck source=mod.config
. "${TEMPLATE_ROOT}/mod.config"
@ -19,11 +20,6 @@ if [ -f "${TEMPLATE_ROOT}/user.config" ]; then
. "${TEMPLATE_ROOT}/user.config"
fi
MOD_SEARCH_PATHS="${TEMPLATE_ROOT}/mods"
if [ "${INCLUDE_DEFAULT_MODS}" = "True" ]; then
MOD_SEARCH_PATHS="${MOD_SEARCH_PATHS},./mods"
fi
LAUNCH_MOD="${Mod:-"${MOD_ID}"}"
cd "${TEMPLATE_ROOT}"