sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Using more appropriate NS prefixes for our macro and cmake vars

Browse Source
This commit is contained in:
Yehonal
2016-08-11 20:10:08 +02:00
parent 4330b759b7
commit 991eed3b5a
21 changed files with 106 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/bash_shared/defines.sh
+4 -4
View File
@@ -1,7 +1,7 @@
AZTH_PATH_ROOT=$(readlink -f "$AZTH_PATH_BIN/../")
AC_PATH_ROOT=$(readlink -f "$AC_PATH_BIN/../")
AZTH_PATH_CONF="$AZTH_PATH_ROOT/conf"
AC_PATH_CONF="$AC_PATH_ROOT/conf"
AZTH_PATH_MODULES="$AZTH_PATH_ROOT/modules"
AC_PATH_MODULES="$AC_PATH_ROOT/modules"
AZTH_PATH_CUSTOM=$(readlink -f "$AZTH_PATH_ROOT/../azth_custom")
AC_PATH_CUSTOM=$(readlink -f "$AC_PATH_ROOT/../azth_custom")
bin/bash_shared/includes.sh
+8 -8
View File
@@ -1,22 +1,22 @@
AZTH_PATH_BIN="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../" && pwd )"
AC_PATH_BIN="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../" && pwd )"
AZTH_PATH_SHARED="$AZTH_PATH_BIN/bash_shared"
AC_PATH_SHARED="$AC_PATH_BIN/bash_shared"
source "$AZTH_PATH_SHARED/defines.sh"
source "$AC_PATH_SHARED/defines.sh"
source "$AZTH_PATH_SHARED/functions.sh"
source "$AC_PATH_SHARED/functions.sh"
source "$AZTH_PATH_CONF/config.sh.dist" # "hack" to avoid missing conf variables
source "$AC_PATH_CONF/config.sh.dist" # "hack" to avoid missing conf variables
if [ -f "$AZTH_PATH_CONF/config.sh" ]; then
source "$AZTH_PATH_CONF/config.sh" # should overwrite previous
if [ -f "$AC_PATH_CONF/config.sh" ]; then
source "$AC_PATH_CONF/config.sh" # should overwrite previous
fi
#
# Load modules
#
for entry in "$AZTH_PATH_MODULES/"*/include.sh
for entry in "$AC_PATH_MODULES/"*/include.sh
do
if [ -e $entry ]; then
source $entry
bin/compiler/includes/functions.sh
+1 -1
View File
@@ -26,7 +26,7 @@ function configure() {
#-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 \
#-DAZTH_WITH_UNIT_TEST=$CAZTH_UNIT_TEST -DAZTH_WITH_PLUGINS=$CAZTH_PLG \
#-DAC_WITH_UNIT_TEST=$CAC_UNIT_TEST -DAC_WITH_PLUGINS=$CAC_PLG \
cmake $SRCPATH -DCMAKE_INSTALL_PREFIX=$BINPATH -DCONF_DIR=$CONFDIR -DSERVERS=$CSERVERS \
-DSCRIPTS=$CSCRIPTS \
bin/compiler/includes/includes.sh
+6 -6
View File
@@ -2,22 +2,22 @@ CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source "$CURRENT_PATH/../../bash_shared/includes.sh"
AZTH_PATH_COMPILER="$AZTH_PATH_BIN/compiler"
AC_PATH_COMPILER="$AC_PATH_BIN/compiler"
if [ -f "$AZTH_PATH_COMPILER/config.sh" ]; then
source "$AZTH_PATH_COMPILER/config.sh" # should overwrite previous
if [ -f "$AC_PATH_COMPILER/config.sh" ]; then
source "$AC_PATH_COMPILER/config.sh" # should overwrite previous
fi
function azth_on_after_build() {
# move the run engine
cp -rvf "$AZTH_PATH_BIN/runners/"* "$INSTALL_PATH/bin/"
cp -rvf "$AC_PATH_BIN/runners/"* "$INSTALL_PATH/bin/"
}
registerHooks "ON_AFTER_BUILD" azth_on_after_build
source "$AZTH_PATH_COMPILER/includes/defines.sh"
source "$AC_PATH_COMPILER/includes/defines.sh"
source "$AZTH_PATH_COMPILER/includes/functions.sh"
source "$AC_PATH_COMPILER/includes/functions.sh"
mkdir -p $BUILDPATH
mkdir -p $BINPATH