revert last 2 commits

CMakeLists.txt

@@ -1,8 +1,8 @@
-# Copyright (C)
+# Copyright (C) 
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
+# modifications, as long as this notice is preserved. 
 #
 # This program is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
@@ -26,7 +26,7 @@ set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH 1)
 
 # set macro-directory
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/src/cmake/macros")
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/macros")
 
 # build in Release-mode by default if not explicitly set
 if( NOT CMAKE_BUILD_TYPE )
@@ -37,7 +37,7 @@ include(CheckCXXSourceRuns)
 include(CheckIncludeFiles)
 
 # set default buildoptions and print them
-include(src/cmake/options.cmake)
+include(cmake/options.cmake)
 
 # turn off PCH totally if enabled (hidden setting, mainly for devs)
 if( NOPCH )
@@ -71,13 +71,13 @@ endif()
 #endif()
 
 # Find revision ID and hash of the sourcetree
-include(src/cmake/genrev.cmake)
+include(cmake/genrev.cmake)
 
 # print out the results before continuing
-include(src/cmake/showoptions.cmake)
+include(cmake/showoptions.cmake)
 
 # add dependencies
-add_subdirectory(modules/dep)
+add_subdirectory(dep)
 
 # add core sources
 add_subdirectory(src)

bin/bash_shared/defines.sh

@@ -1,5 +0,0 @@
-AZTH_PATH_ROOT=$(readlink -f "$AZTH_PATH_BIN/../")
-
-AZTH_PATH_CONF="$AZTH_PATH_ROOT/conf"
-
-AZTH_PATH_CUSTOM=$(readlink -f "$AZTH_PATH_ROOT/../azth_custom")

bin/bash_shared/functions.sh

@@ -1,16 +0,0 @@
-# par 1: hook_name
-function runHooks() {
-  hook_name="HOOKS_MAP_$1"
-  read -r -a SRCS <<< ${!hook_name}
-  echo "Running hooks: $hook_name"
-  for i in "${SRCS[@]}"
-  do
-  	$i # run registered hook
-  done
-}
-
-function registerHooks() {
-  hook_name="HOOKS_MAP_$1"
-  hooks=${@:2}
-  declare -g "$hook_name+=$hooks "
-}

bin/bash_shared/includes.sh

@@ -1,7 +0,0 @@
-AZTH_PATH_BIN="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../" && pwd )"
-
-AZTH_PATH_SHARED="$AZTH_PATH_BIN/bash_shared"
-
-source "$AZTH_PATH_SHARED/defines.sh"
-
-source "$AZTH_PATH_SHARED/functions.sh"

bin/compiler/1-clean.sh

@@ -1,8 +1,16 @@
 #!/bin/bash
-CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-source "$CURRENT_PATH/includes/common.sh"
+. "defines.sh"
 
-source "$CURRENT_PATH/includes/includes.sh"
+echo "Cleaning build files"
+
+CWD=$(pwd)
+
+cd $BUILDPATH
+
+make -f Makefile clean
+make clean
+find -iname '*cmake*' -not -name CMakeLists.txt -exec rm -rf {} \+
+
+cd $CWD
 
-clean

bin/compiler/2-configure.sh

@@ -1,8 +1,19 @@
 #!/bin/bash
-CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-source "$CURRENT_PATH/includes/common.sh"
+. "defines.sh"
 
-source "$CURRENT_PATH/includes/includes.sh"
+CWD=$(pwd)
 
-configure
+cd $BUILDPATH
+
+echo "Build path: $BUILDPATH"
+echo "DEBUG info: $CDEBUG"
+echo "Compilation type: $CCTYPE"
+# -DCMAKE_BUILD_TYPE=$CCTYPE disable optimization "slow and huge amount of ram"
+# -DWITH_COREDEBUG=$CDEBUG compiled with debug information
+
+cmake $SRCPATH -DCMAKE_INSTALL_PREFIX=$BINPATH -DCONF_DIR=$CONFDIR -DSERVERS=$CSERVERS -DSCRIPTS=$CSCRIPTS  \
+-DCMAKE_C_COMPILER=$COMPILER_C -DCMAKE_CC_COMPILER=$COMPILER_CC -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
+-DTOOLS=$CTOOLS -DUSE_SCRIPTPCH=$CSCRIPTPCH -DUSE_COREPCH=$CCOREPCH -DWITH_COREDEBUG=$CDEBUG  -DCMAKE_BUILD_TYPE=$CCTYPE -DWITH_WARNINGS=$CWARNINGS 
+
+cd $CWD

bin/compiler/3-build.sh

@@ -1,8 +1,17 @@
 #!/bin/bash
-CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-source "$CURRENT_PATH/includes/common.sh"
+. "defines.sh"
 
-source "$CURRENT_PATH/includes/includes.sh"
 
-build
+[ $MTHREADS == 0 ] && MTHREADS=`grep -c ^processor /proc/cpuinfo` && MTHREADS=$(($MTHREADS + 2))
+
+echo "Using $MTHREADS threads"
+
+CWD=$(pwd)
+
+cd $BUILDPATH
+
+time make -j $MTHREADS
+make -j $MTHREADS install
+
+cd $CWD

bin/compiler/config.sh.dist

@@ -1,9 +1,8 @@
 #!/bin/bash
 
-
-# set preferred compilers
-CCOMPILERC="/usr/bin/clang-3.6"
-CCOMPILERCXX="/usr/bin/clang++-3.6"
+COMPILER_C="/usr/bin/gcc"
+COMPILER_CC="/usr/bin/gcc"
+COMPILER_CXX="/usr/bin/g++"
 
 # how many thread must be used for compilation ( leave zero to use all available )
 MTHREADS=0
@@ -24,12 +23,12 @@ CSCRIPTPCH=1
 CCOREPCH=1
 
 # AZTH
-# compile azth custom plugins
-CAZTH_CUSTOM_PLG=1
-# compile azth plugins 
+# compile azth plugins for custom features
 CAZTH_PLG=1
+# compile azth plugins for trinitycore features
+CAZTH_TC_PLG=1
 # enable unit test on TC load
-CAZTH_UNIT_TEST=0
+CAZTH_UNIT_TEST=1
 
 # absolute root path of your azerothshard repository
 SRCPATH=

bin/compiler/defines.sh

@@ -1,16 +1,21 @@
 #!/bin/bash
 
+source ./config.sh.dist # "hack" to avoid missing conf variables
+
+source ./config.sh # should overwrite previous
+
 # you can choose build type from cmd argument
-if [ ! -z $1 ]
-then
+if [ ! -z $1 ] 
+then 
     CCTYPE=$1
     CCTYPE=${CCTYPE^} # capitalize first letter if it's not yet
 fi
 
 BUILDPATH=$BINPATH
 
-INSTALL_PATH=$(readlink -f "$BINPATH/../")
+[ $CCTYPE == "Debug" ] && BUILDPATH="$BUILDPATH/debug/build/" ||  BUILDPATH="$BUILDPATH/release/build/" 
 
-[ $CCTYPE == "Debug" ] && BUILDPATH="$BUILDPATH/debug/build/" ||  BUILDPATH="$BUILDPATH/release/build/"
+[ $CCTYPE == "Debug" ] && BINPATH="$BINPATH/debug" || BINPATH="$BINPATH/release" 
 
-[ $CCTYPE == "Debug" ] && BINPATH="$BINPATH/debug" || BINPATH="$BINPATH/release"
+mkdir -p $BUILDPATH
+mkdir -p $BINPATH

bin/compiler/includes/common.sh

@@ -1,5 +0,0 @@
-source "./config.sh.dist" # "hack" to avoid missing conf variables
-
-if [ -f "./config.sh"  ]; then
-    source "./config.sh" # should overwrite previous
-fi

bin/compiler/includes/functions.sh

@@ -1,55 +0,0 @@
-
-function clean() {
-  echo "Cleaning build files"
-
-  CWD=$(pwd)
-
-  cd $BUILDPATH
-
-  make -f Makefile clean
-  make clean
-  find -iname '*cmake*' -not -name CMakeLists.txt -exec rm -rf {} \+
-
-  cd $CWD
-}
-
-function configure() {
-  CWD=$(pwd)
-
-  cd $BUILDPATH
-
-  echo "Build path: $BUILDPATH"
-  echo "DEBUG info: $CDEBUG"
-  echo "Compilation type: $CCTYPE"
-  # -DCMAKE_BUILD_TYPE=$CCTYPE disable optimization "slow and huge amount of ram"
-  # -DWITH_COREDEBUG=$CDEBUG compiled with debug information
-
-  cmake $SRCPATH -DCMAKE_INSTALL_PREFIX=$BINPATH -DCONF_DIR=$CONFDIR -DSERVERS=$CSERVERS \
-  -DSCRIPTS=$CSCRIPTS -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 \
-  -DTOOLS=$CTOOLS -DUSE_SCRIPTPCH=$CSCRIPTPCH -DUSE_COREPCH=$CCOREPCH -DWITH_COREDEBUG=$CDEBUG  -DCMAKE_BUILD_TYPE=$CCTYPE -DWITH_WARNINGS=$CWARNINGS \
-  -DAZTH_WITH_UNIT_TEST=$CAZTH_UNIT_TEST -DAZTH_WITH_CUSTOM_PLUGINS=$CAZTH_CUSTOM_PLG -DAZTH_WITH_PLUGINS=$CAZTH_PLG \
-  -DCMAKE_C_COMPILER=$CCOMPILERC -DCMAKE_CXX_COMPILER=$CCOMPILERCXX
-
-  cd $CWD
-
-  runHooks "ON_AFTER_CONFIG"
-}
-
-
-function build() {
-  [ $MTHREADS == 0 ] && MTHREADS=`grep -c ^processor /proc/cpuinfo` && MTHREADS=$(($MTHREADS + 2))
-
-  echo "Using $MTHREADS threads"
-
-  CWD=$(pwd)
-
-  cd $BUILDPATH
-
-  time make -j $MTHREADS
-  make -j $MTHREADS install
-
-  cd $CWD
-
-  runHooks "ON_AFTER_BUILD"
-}

bin/compiler/includes/includes.sh

@@ -1,19 +0,0 @@
-CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-source "$CURRENT_PATH/../../bash_shared/includes.sh"
-
-AZTH_PATH_COMPILER="$AZTH_PATH_BIN/compiler"
-
-function azth_on_after_build() {
-    # move the run engine
-    cp -rvf "$AZTH_PATH_BIN/runners/"* "$INSTALL_PATH/bin/"
-}
-
-registerHooks "ON_AFTER_BUILD" azth_on_after_build
-
-source "$AZTH_PATH_COMPILER/includes/defines.sh"
-
-source "$AZTH_PATH_COMPILER/includes/functions.sh"
-
-mkdir -p $BUILDPATH
-mkdir -p $BINPATH

bin/runners/config.dist

@@ -1,31 +0,0 @@
-#!/bin/bash
-
-######################
-
-# enable/disable GDB execution
-export GDB_ENABLED=0
-
-# gdb file
-export GDB=""
-
-# directory where binary are stored
-exoirt BINPATH=""
-
- ### Put here the pid you configured on your worldserver.conf file ###
-export SERVERPID=""
- 
-# path to conf file
-export CONFIG=""
-
-# path of log files
-export LOGS_PATH="";
-
-# exec name
-export SERVERBIN=""
-
-# name of screen service ( for restarter )
-export SCREEN_NAME=""
- 
-######################
-
-

bin/runners/run-engine

@@ -1,68 +0,0 @@
-#!/bin/bash
-
-function checkStatus() {
-        if [ -d "/proc/"$1 ]; then
-                eval "TEST=1"
-        else
-                eval "TEST=0"
-        fi
-}
-
-function starter() {
-    local CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-    cd $BINPATH
-
-    mkdir -p "$LOGS_PATH"
-
-    TRACE_BEGIN_STRING="SIGSEGV"
-    TRACE_FILE="$LOGS_PATH/"$SCREEN_NAME"_trace.log"
-    ERR_FILE="$LOGS_PATH/"$SCREEN_NAME"_error.log"
-    SYSLOG="$LOGS_PATH/"$SCREEN_NAME"_system.log"
-    SYSERR="$LOGS_PATH/"$SCREEN_NAME"_system.err"
-    LINKS_FILE="$LOGS_PATH/"$SCREEN_NAME"_crash_links.link"
-
-    $CURRENT_PATH/starter $SERVERBIN $GDB "$CONFIG" "$SYSLOG" "$SYSERR" $GDB_ENABLED
-}
-
-
-function restarter() {
-    local CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-    cd $BINPATH
-
-    mkdir -p "$LOGS_PATH"
-
-    TRACE_BEGIN_STRING="SIGSEGV"
-    TRACE_FILE="$LOGS_PATH/"$SCREEN_NAME"_trace.log"
-    ERR_FILE="$LOGS_PATH/"$SCREEN_NAME"_error.log"
-    SYSLOG="$LOGS_PATH/"$SCREEN_NAME"_system.log"
-    SYSERR="$LOGS_PATH/"$SCREEN_NAME"_system.err"
-    LINKS_FILE="$LOGS_PATH/"$SCREEN_NAME"_crash_links.link"
-
-    if [ ! -f $TRACE_FILE ]; then
-        touch $TRACE_FILE
-    fi
-
-    while :
-    do
-            PID=$(cat $SERVERPID)
-            checkStatus $PID
-            if [ $TEST -eq 0 ]; then
-                    DATE=$(date)
-                    echo "Restarting $SCREEN_NAME Core blizz($DATE)"
-                    if [ $GDB_ENABLED -eq 1 ]; then
-                            echo "GDB enabled"
-                            grep -B 10 -A 1800 "$TRACE_BEGIN_STRING" "$SYSLOG" >> "$TRACE_FILE"
-                            cat "$SYSERR" > "$ERR_FILE"
-                            screen -A -m -d -S $SCREEN_NAME "$CURRENT_PATH/starter" $SERVERBIN $GDB "$CONFIG" "$SYSLOG" "$SYSERR" 1
-                    fi
-
-                    if [ $GDB_ENABLED -eq 0 ]; then
-                            echo "GDB disabled"
-                            screen -A -m -d -S $SCREEN_NAME "$CURRENT_PATH/starter" $SERVERBIN null "$CONFIG" null null 0
-                    fi
-            fi
-
-            sleep 15
-    done
-}

bin/runners/starter

@@ -1,22 +0,0 @@
-#!/bin/bash
-
-GDB_FILE="$2"
-CONFIG="$3"
-SYSLOG="$4"
-SYSERR="$5"
-GBD_ENABLED="$6"
-
-if [ $GBD_ENABLED -eq 1 ]; then
-    echo "run -c $3" > "$GDB_FILE"
-    echo "bt" >> "$GDB_FILE"
-    echo "bt full" >> "$GDB_FILE"
-    echo "info threads" >> "$GDB_FILE"
-    echo "thread apply all bt full" >> "$GDB_FILE"
-
-    [ ! -f "$SYSLOG" ] && touch "$SYSLOG"
-    [ ! -f "$SYSERR" ] && touch "$SYSERR"
-
-    gdb -x $GDB_FILE --batch $1 >> "$SYSLOG" 2>> "$SYSERR"
-elif [ $GBD_ENABLED -eq 0 ]; then
-    "./$1" -c "$CONFIG"
-fi

cmake/genrev.cmake

@@ -1,4 +1,4 @@
-# Copyright (C)
+# Copyright (C) 
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -8,7 +8,7 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-include(${CMAKE_SOURCE_DIR}/src/cmake/macros/EnsureVersion.cmake)
+include(${CMAKE_SOURCE_DIR}/cmake/macros/EnsureVersion.cmake)
 
 set(_REQUIRED_GIT_VERSION "1.7")
 
@@ -31,11 +31,11 @@ if (SVN_EXECUTABLE)
 
     Subversion_GET_REVISION(${CMAKE_SOURCE_DIR} REV2)
 endif ()
-
+  
   set(rev_hash_str ${REV2})
   set(rev_hash ${REV2})
   set(rev_id_str ${REV2})
   set(rev_id ${REV2})
-
-
+  
+  
   configure_file ( ${CMAKE_SOURCE_DIR}/revision.h.in.cmake ${BUILDDIR}/revision.h )

cmake/macros/CheckPlatform.cmake

@@ -7,10 +7,10 @@ else()
     MESSAGE(STATUS "Detected 32-bit platform")
 endif()
 
-include("${CMAKE_SOURCE_DIR}/src/cmake/platform/settings.cmake")
+include("${CMAKE_SOURCE_DIR}/cmake/platform/settings.cmake")
 
 if(WIN32)
-  include("${CMAKE_SOURCE_DIR}/src/cmake/platform/win/settings.cmake")
+  include("${CMAKE_SOURCE_DIR}/cmake/platform/win/settings.cmake")
 elseif(UNIX)
-  include("${CMAKE_SOURCE_DIR}/src/cmake/platform/unix/settings.cmake")
+  include("${CMAKE_SOURCE_DIR}/cmake/platform/unix/settings.cmake")
 endif()

cmake/macros/FindGit.cmake

@@ -1,4 +1,4 @@
-# Copyright (C)
+# Copyright (C) 
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -7,7 +7,7 @@
 # This program is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-include(${CMAKE_SOURCE_DIR}/src/cmake/macros/EnsureVersion.cmake)
+include(${CMAKE_SOURCE_DIR}/cmake/macros/EnsureVersion.cmake)
 
 set(_REQUIRED_GIT_VERSION "1.7")
 

cmake/platform/unix/settings.cmake

@@ -20,7 +20,7 @@ endif()
 
 # configure uninstaller
 configure_file(
-  "${CMAKE_SOURCE_DIR}/src/cmake/platform/cmake_uninstall.in.cmake"
+  "${CMAKE_SOURCE_DIR}/cmake/platform/cmake_uninstall.in.cmake"
   "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake"
   @ONLY
 )
@@ -34,11 +34,11 @@ message(STATUS "UNIX: Created uninstall target")
 
 message(STATUS "UNIX: Detected compiler: ${CMAKE_C_COMPILER}")
 if(CMAKE_C_COMPILER MATCHES "gcc" OR CMAKE_C_COMPILER_ID STREQUAL "GNU")
-  include(${CMAKE_SOURCE_DIR}/src/cmake/compiler/gcc/settings.cmake)
+  include(${CMAKE_SOURCE_DIR}/cmake/compiler/gcc/settings.cmake)
 elseif(CMAKE_C_COMPILER MATCHES "icc")
-  include(${CMAKE_SOURCE_DIR}/src/cmake/compiler/icc/settings.cmake)
+  include(${CMAKE_SOURCE_DIR}/cmake/compiler/icc/settings.cmake)
 elseif(CMAKE_C_COMPILER MATCHES "clang")
-  include(${CMAKE_SOURCE_DIR}/src/cmake/compiler/clang/settings.cmake)
+  include(${CMAKE_SOURCE_DIR}/cmake/compiler/clang/settings.cmake)
 else()
 add_definitions(-D_BUILD_DIRECTIVE='"${CMAKE_BUILD_TYPE}"')
 endif()

cmake/platform/win/settings.cmake

@@ -2,13 +2,13 @@
 option(USE_MYSQL_SOURCES "Use included MySQL-sources to build libraries" 1)
 
 # Package overloads
-set(ACE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/modules/dep/acelite)
+set(ACE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/dep/acelite)
 set(ACE_LIBRARY "ace")
 set(BZIP2_LIBRARIES "bzip2")
 set(ZLIB_LIBRARIES "zlib")
 
 if( USE_MYSQL_SOURCES )
-  set(MYSQL_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/modules/dep/mysqllite/include)
+  set(MYSQL_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/dep/mysqllite/include)
   set(MYSQL_LIBRARY "libmysql")
   set( MYSQL_FOUND 1 )
   message(STATUS "Using supplied MySQL sources")
@@ -26,7 +26,7 @@ endif()
 #endif()
 
 if ( MSVC )
-  include(${CMAKE_SOURCE_DIR}/src/cmake/compiler/msvc/settings.cmake)
+  include(${CMAKE_SOURCE_DIR}/cmake/compiler/msvc/settings.cmake)
 elseif ( MINGW )
-  include(${CMAKE_SOURCE_DIR}/src/cmake/compiler/mingw/settings.cmake)
+  include(${CMAKE_SOURCE_DIR}/cmake/compiler/mingw/settings.cmake)
 endif()