mirror of
https://github.com/azerothcore/azerothcore-wotlk.git
synced 2025-12-06 02:30:26 -08:00
<!-- First of all, THANK YOU for your contribution. --> ## Changes Proposed - This fixes an issue where the .conf files aren't properly generated for the docker build - With this issue, the dbimport service in the docker compose file would fail to start due to insufficient config. - related to PR #14707 - create a ".user" file extension for custom configs in `env/docker/etc/` - Layers the ".dockerdist" file and the ".user" file over the ".dist" file (in that order), and then copies the ".dist" file to the base ".conf" file - Docker specific config changes go in the ".dockerdist" file and should still be committed to the repo - User specific config changes go in ".user" file and should not be committed to the repo - If the ".dist" file and the base ".conf" file are different, the ".conf" will be backed up before the ".dist" file is copied into it ## Issues Addressed: <!-- If your fix has a relating issue, link it below --> - There isn't a specific issue, however this was reported and discussed in discord over the course of yesterday and today ## SOURCE: <!-- If you can, include a source that can strengthen your claim --> ## Tests Performed: <!-- Does it build without errors? Did you test in-game? What did you test? On which OS did you test? Describe any other tests performed --> - Executing commands to build and start the game server - after creating an account, I can log in and play without any issues. ## How to Test the Changes: <!-- Describe in a detailed step-by-step order how to test the changes --> 1. Execute commands ```bash $ ./acore.sh docker clean:build && ./acore.sh docker build:nocache && ./acore.sh docker start:app ``` 2. Create account and log in as normal ## Known Issues and TODO List: <!-- Is there anything else left to do after this PR? --> - The largest issue that comes to mind is this is a breaking change for docker users (though, so was the change that caused this) - Docker users (and nobody else, of course) can no longer use the ".conf" for custom changes in docker setups. - Their custom changes will have to be migrated to the ".user" file - Since the old ".conf" file is backed up, users should have minimal trouble copying the changes in the old ".conf" file to the new ".user" file <!-- If you intend to contribute repeatedly to our project, it is a good idea to join our discord channel. We set ranks for our contributors and give them access to special resources or knowledge: https://discord.com/invite/DasJqPba) Do not remove the instructions below about testing, they will help users to test your PR --> ## How to Test AzerothCore PRs When a PR is ready to be tested, it will be marked as **[WAITING TO BE TESTED]**. You can help by testing PRs and writing your feedback here on the PR's page on GitHub. Follow the instructions here: http://www.azerothcore.org/wiki/How-to-test-a-PR **REMEMBER**: when testing a PR that changes something **generic** (i.e. a part of code that handles more than one specific thing), the tester should not only check that the PR does its job (e.g. fixing spell XXX) but **especially** check that the PR does not cause any regression (i.e. introducing new bugs). **For example**: if a PR fixes spell X by changing a part of code that handles spells X, Y, and Z, we should not only test X, but **we should test Y and Z as well**. edit: link related PR
201 lines
5.8 KiB
Bash
201 lines
5.8 KiB
Bash
|
|
function comp_clean() {
|
|
DIRTOCLEAN=${BUILDPATH:-var/build/obj}
|
|
PATTERN="$DIRTOCLEAN/*"
|
|
|
|
echo "Cleaning build files in $DIRTOCLEAN"
|
|
|
|
[ -d "$DIRTOCLEAN" ] && rm -rf $PATTERN
|
|
}
|
|
|
|
function comp_ccacheEnable() {
|
|
[ "$AC_CCACHE" != true ] && return
|
|
|
|
export CCACHE_MAXSIZE=${CCACHE_MAXSIZE:-'1000MB'}
|
|
#export CCACHE_DEPEND=true
|
|
export CCACHE_SLOPPINESS=${CCACHE_SLOPPINESS:-pch_defines,time_macros,include_file_mtime}
|
|
export CCACHE_CPP2=${CCACHE_CPP2:-true} # optimization for clang
|
|
export CCACHE_COMPRESS=${CCACHE_COMPRESS:-1}
|
|
export CCACHE_COMPRESSLEVEL=${CCACHE_COMPRESSLEVEL:-9}
|
|
export CCACHE_COMPILERCHECK=${CCACHE_COMPILERCHECK:-content}
|
|
export CCACHE_LOGFILE=${CCACHE_LOGFILE:-"$CCACHE_DIR/cache.debug"}
|
|
#export CCACHE_NODIRECT=true
|
|
|
|
export CCUSTOMOPTIONS="$CCUSTOMOPTIONS -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
|
|
}
|
|
|
|
function comp_ccacheClean() {
|
|
[ "$AC_CCACHE" != true ] && echo "ccache is disabled" && return
|
|
|
|
echo "Cleaning ccache"
|
|
ccache -C
|
|
ccache -s
|
|
}
|
|
|
|
function comp_ccacheResetStats() {
|
|
[ "$AC_CCACHE" != true ] && return
|
|
|
|
ccache -zc
|
|
}
|
|
|
|
function comp_ccacheShowStats() {
|
|
[ "$AC_CCACHE" != true ] && return
|
|
|
|
ccache -s
|
|
}
|
|
|
|
function comp_configure() {
|
|
CWD=$(pwd)
|
|
|
|
cd $BUILDPATH
|
|
|
|
echo "Build path: $BUILDPATH"
|
|
echo "DEBUG info: $CDEBUG"
|
|
echo "Compilation type: $CTYPE"
|
|
echo "CCache: $AC_CCACHE"
|
|
# -DCMAKE_BUILD_TYPE=$CCTYPE disable optimization "slow and huge amount of ram"
|
|
# -DWITH_COREDEBUG=$CDEBUG compiled with debug information
|
|
|
|
#-DSCRIPTS_COMMANDS=$CSCRIPTS -DSCRIPTS_CUSTOM=$CSCRIPTS -DSCRIPTS_EASTERNKINGDOMS=$CSCRIPTS -DSCRIPTS_EVENTS=$CSCRIPTS -DSCRIPTS_KALIMDOR=$CSCRIPTS \
|
|
#-DSCRIPTS_NORTHREND=$CSCRIPTS -DSCRIPTS_OUTDOORPVP=$CSCRIPTS -DSCRIPTS_OUTLAND=$CSCRIPTS -DSCRIPTS_PET=$CSCRIPTS -DSCRIPTS_SPELLS=$CSCRIPTS -DSCRIPTS_WORLD=$CSCRIPTS \
|
|
#-DAC_WITH_UNIT_TEST=$CAC_UNIT_TEST -DAC_WITH_PLUGINS=$CAC_PLG \
|
|
|
|
local DCONF=""
|
|
if [ ! -z "$CONFDIR" ]; then
|
|
DCONF="-DCONF_DIR=$CONFDIR"
|
|
fi
|
|
|
|
comp_ccacheEnable
|
|
|
|
OSOPTIONS=""
|
|
|
|
|
|
echo "Platform: $OSTYPE"
|
|
case "$OSTYPE" in
|
|
darwin*)
|
|
OSOPTIONS=" -DMYSQL_ADD_INCLUDE_PATH=/usr/local/include -DMYSQL_LIBRARY=/usr/local/lib/libmysqlclient.dylib -DREADLINE_INCLUDE_DIR=/usr/local/opt/readline/include -DREADLINE_LIBRARY=/usr/local/opt/readline/lib/libreadline.dylib -DOPENSSL_INCLUDE_DIR=/usr/local/opt/openssl@1.1/include -DOPENSSL_SSL_LIBRARIES=/usr/local/opt/openssl@1.1/lib/libssl.dylib -DOPENSSL_CRYPTO_LIBRARIES=/usr/local/opt/openssl@1.1/lib/libcrypto.dylib "
|
|
;;
|
|
msys*)
|
|
OSOPTIONS=" -DMYSQL_INCLUDE_DIR=C:\tools\mysql\current\include -DMYSQL_LIBRARY=C:\tools\mysql\current\lib\mysqlclient.lib "
|
|
;;
|
|
esac
|
|
|
|
cmake $SRCPATH -DCMAKE_INSTALL_PREFIX=$BINPATH $DCONF \
|
|
-DAPPS_BUILD=$CAPPS_BUILD \
|
|
-DTOOLS_BUILD=$CTOOLS_BUILD \
|
|
-DSCRIPTS=$CSCRIPTS \
|
|
-DMODULES=$CMODULES \
|
|
-DBUILD_TESTING=$CBUILD_TESTING \
|
|
-DUSE_SCRIPTPCH=$CSCRIPTPCH \
|
|
-DUSE_COREPCH=$CCOREPCH \
|
|
-DCMAKE_BUILD_TYPE=$CTYPE \
|
|
-DWITH_WARNINGS=$CWARNINGS \
|
|
-DCMAKE_C_COMPILER=$CCOMPILERC \
|
|
-DCMAKE_CXX_COMPILER=$CCOMPILERCXX \
|
|
$CBUILD_APPS_LIST $CBUILD_TOOLS_LIST $OSOPTIONS $CCUSTOMOPTIONS
|
|
|
|
cd $CWD
|
|
|
|
runHooks "ON_AFTER_CONFIG"
|
|
}
|
|
|
|
function comp_compile() {
|
|
[ $MTHREADS == 0 ] && MTHREADS=$(grep -c ^processor /proc/cpuinfo) && MTHREADS=$(($MTHREADS + 2))
|
|
|
|
echo "Using $MTHREADS threads"
|
|
|
|
pushd "$BUILDPATH" >> /dev/null || exit 1
|
|
|
|
comp_ccacheEnable
|
|
|
|
comp_ccacheResetStats
|
|
|
|
time cmake --build . --config $CTYPE -j $MTHREADS
|
|
|
|
comp_ccacheShowStats
|
|
|
|
echo "Platform: $OSTYPE"
|
|
case "$OSTYPE" in
|
|
msys*)
|
|
cmake --install . --config $CTYPE
|
|
|
|
popd >> /dev/null || exit 1
|
|
|
|
echo "Done"
|
|
;;
|
|
linux*|darwin*)
|
|
local confDir=${CONFDIR:-"$AC_BINPATH_FULL/../etc"}
|
|
|
|
# create the folders before installing to
|
|
# set the current user and permissions
|
|
echo "Creating $AC_BINPATH_FULL..."
|
|
mkdir -p "$AC_BINPATH_FULL"
|
|
echo "Creating $confDir..."
|
|
mkdir -p "$confDir"
|
|
|
|
echo "Cmake install..."
|
|
sudo cmake --install . --config $CTYPE
|
|
|
|
popd >> /dev/null || exit 1
|
|
|
|
# set all aplications SUID bit
|
|
echo "Setting permissions on binary files"
|
|
find "$AC_BINPATH_FULL" -mindepth 1 -maxdepth 1 -type f -exec sudo chown root:root -- {} +
|
|
find "$AC_BINPATH_FULL" -mindepth 1 -maxdepth 1 -type f -exec sudo chmod u+s -- {} +
|
|
|
|
DOCKER_ETC_FOLDER=${DOCKER_ETC_FOLDER:-"env/dist/etc"}
|
|
|
|
if [[ $DOCKER = 1 && $DISABLE_DOCKER_CONF != 1 ]]; then
|
|
echo "Generating confs..."
|
|
for dockerdist in "$DOCKER_ETC_FOLDER"/*.dockerdist; do
|
|
base_conf="$(echo "$dockerdist" | rev | cut -f1 -d. --complement | rev)"
|
|
cp -nv "$base_conf.dist" "$base_conf"
|
|
# Move configs from .conf.dockerdist to .conf
|
|
conf_layer "$dockerdist" "$base_conf" " # Copied from dockerdist"
|
|
done
|
|
fi
|
|
|
|
echo "Done"
|
|
;;
|
|
esac
|
|
|
|
runHooks "ON_AFTER_BUILD"
|
|
}
|
|
|
|
function comp_build() {
|
|
comp_configure
|
|
comp_compile
|
|
}
|
|
|
|
function comp_all() {
|
|
comp_clean
|
|
comp_build
|
|
}
|
|
|
|
# conf_layer FILENAME FILENAME
|
|
# Layer the configuration parameters from the first argument onto the second argument
|
|
function conf_layer() {
|
|
LAYER="$1"
|
|
BASE="$2"
|
|
COMMENT="$3"
|
|
|
|
grep -E "^[a-zA-Z\.0-9]+\s*=.*$" "$LAYER" \
|
|
| while read -r param
|
|
do
|
|
NOSPACE="$(tr -d '[:space:]' <<< "$param")"
|
|
KEY="$(cut -f1 -d= <<< "$NOSPACE")"
|
|
VAL="$(cut -f2 -d= <<< "$NOSPACE")"
|
|
# if key not in base or val not in line
|
|
if grep -qE "^$KEY" "$BASE" && ! grep -qE "^$KEY.*=.*$VAL" "$BASE"; then
|
|
# Replace line
|
|
# Prevent issues with shell quoting
|
|
sed -i \
|
|
's,^'"$KEY"'.*,'"$KEY = $VAL$COMMENT"',g' \
|
|
"$BASE"
|
|
else
|
|
# insert line
|
|
echo "$KEY = $VAL$COMMENT" >> "$BASE"
|
|
fi
|
|
done
|
|
echo "Layered $LAYER onto $BASE"
|
|
}
|