PBot

.gitattributes

@@ -3,6 +3,9 @@
 *.vcproj     eol=crlf
 *.vcxproj*   eol=crlf
 
+src/shared/revision_nr.h eol=lf
+src/shared/revision_sql.h eol=lf
+
 # Whitespace rules
 # strict (no trailing, no tabs)
 *.cpp        whitespace=trailing-space,space-before-tab,tab-in-indent,cr-at-eol

.gitignore

@@ -27,6 +27,7 @@ tags
 TAGS
 !.gitignore
 !.gitattributes
+!.travis.yml
 
 #
 # Build generated files
@@ -39,6 +40,7 @@ autom4te.cache
 *~
 *.bak
 *.orig
+*.rej
 *.patch
 callgrind.out.*
 
@@ -52,6 +54,11 @@ patches-*
 # VS binaries output
 #
 bin/*
+*win32_Debug*
+*win32_Release*
+*x64_Debug*
+*x64_Release*
+win/*/*.log
 
 #
 # VS temporary files
@@ -64,6 +71,10 @@ bin/*
 *.vsp
 ipch
 *.user
+*.obj
+*.pdb
+*.tlog
+
 
 #
 # CMake temporary files
@@ -72,6 +83,11 @@ CMakeFiles
 CMakeCache.txt
 cmake_install.cmake
 
+#
+# System-internal temporary files
+#
+config.h
+
 #
 # OS specific
 #

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "src/bindings/ScriptDev2"]
+	path = src/bindings/ScriptDev2
+	url = git://github.com/mangosR2/scriptdev2.git

.travis.yml

@@ -0,0 +1,16 @@
+language: cpp
+
+branches:
+  only:
+    - mangosr2-wotlk_ai
+
+compiler:
+  - gcc
+  - clang
+
+script:
+  - test -d _build || mkdir _build
+  - test -d _install || mkdir _install
+  - cd _build
+  - cmake -DPCH=1 -DCMAKE_INSTALL_PREFIX=../_install ..
+  - make -j4

CMakeLists.txt

@@ -17,7 +17,6 @@
 #
 
 project(MaNGOS)
-set(MANGOS_VERSION 0.17.0)
 
 # CMake policies
 cmake_minimum_required(VERSION 2.8)
@@ -27,6 +26,78 @@ set(CMAKE_MODULE_PATH
   ${CMAKE_SOURCE_DIR}/cmake
 )
 
+# define all options here
+option(DEBUG                "Debug mode"                            OFF)
+option(TBB_USE_EXTERNAL     "Use external TBB"                      OFF)
+#option(USE_STD_MALLOC       "Use standard malloc instead of TBB"    OFF)
+#option(USE_TBB_MALLOC       "Use included TBB malloc"               OFF)
+option(ACE_USE_EXTERNAL     "Use external ACE"                      ON)
+
+if(WIN32)
+  if(PLATFORM MATCHES X86) # 32-bit
+    option(USE_FASTMM_MALLOC "Use included FastMM malloc (default for win*)" 1)
+    option(USE_STD_MALLOC "Use standard malloc instead of TBB" 0)
+  else() # 64-bit
+    option(USE_STD_MALLOC "Use standard malloc instead of TBB" 0)
+    option(USE_FASTMM_MALLOC "Use included FastMM malloc (default for win*)" 1)
+  endif()
+else()
+#Unix and other platforms
+  option(USE_STD_MALLOC "Use standard malloc instead of TBB" 1)
+endif()
+
+option(POSTGRESQL           "Use PostgreSQL"                        OFF)
+
+if(PCHSupport_FOUND AND WIN32) # TODO: why only enable it on windows by default?
+  option(PCH                "Use precompiled headers"               ON)
+else()
+  option(PCH                "Use precompiled headers"               OFF)
+endif()
+# TODO: options that should be checked/created:
+#option(CLI                  "With CLI"                              ON)
+#option(RA                   "With Remote Access"                    OFF)
+#option(SQL                  "Copy SQL files"                        OFF)
+#option(TOOLS                "Build tools"                           OFF)
+
+find_package(PCHSupport)
+
+# Add options for compile of mangos
+if(PCHSupport_FOUND)
+  if(WIN32)
+    option(PCH "Use precompiled headers" 1)
+  else()
+    option(PCH "Use precompiled headers" 0)
+  endif()
+endif()
+
+# FIXME: options that should be checked
+# option(SQL "Copy SQL files" 0)
+# option(TOOLS "Build tools" 0)
+
+# Output description of this script
+message("")
+message(
+  "This script builds the MangosR2 server.
+  Options that can be used in order to configure the process:
+    CMAKE_INSTALL_PREFIX    Path where the server should be installed to
+    PCH                     Use precompiled headers
+    DEBUG                   Debug mode
+    INCLUDE_BINDINGS_DIR    Include a script library in src/bindings/ with the
+                            defined name. the name must corespond to the name of
+                            the folder and the folder must contain a valid
+                            CMakeLists.txt
+    TBB_USE_EXTERNAL        Use external TBB
+    USE_STD_MALLOC          Use standard malloc (default for *NIX)
+    USE_TBB_MALLOC          Use TBB malloc (not recommended)
+    USE_FASTMM_MALLOC       Use included FastMM malloc (default for win*)
+    ACE_USE_EXTERNAL        Use external ACE (default. usage included ACE not recommended, possible only for win*)
+
+  To set an option simply type -D<OPTION>=<VALUE> after 'cmake <srcs>'.
+  Also, you can specify the generator with -G. see 'cmake --help' for more details
+  For example: cmake .. -DDEBUG=1 -DCMAKE_INSTALL_PREFIX=/opt/mangos"
+)
+message("")
+
 # Force out-of-source build
 string(COMPARE EQUAL "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" BUILDING_IN_SOURCE)
 if(BUILDING_IN_SOURCE)
@@ -59,11 +130,11 @@ endif()
 message(
   "\nThis script builds the MaNGOS server.
   Options that can be used in order to configure the process:
-    PREFIX: Path where the server should be installed to
+    CMAKE_INSTALL_PREFIX: Path where the server should be installed to
     PCH: Use precompiled headers
     DEBUG: Debug mode
   To set an option simply type -D<OPTION>=<VALUE> after 'cmake <srcs>'.
-  For example: cmake .. -DDEBUG=1 -DPREFIX=/opt/mangos\n"
+  For example: cmake .. -DDEBUG=1 -DCMAKE_INSTALL_PREFIX=/opt/mangos\n"
 ) # TODO: PLATFORM: Sets the architecture for compile (X86,X64)
 
 # Override configuration-types - we don't use anything else than debug and release
@@ -97,41 +168,12 @@ endif()
 #   endif()
 # endif()
 
-option(DEBUG "Debug mode" 0)
-# option(CLI "With CLI" 1) # Not used by MaNGOS so far
-# option(RA "With Remote Access" 0) # TODO: support remote access
-option(TBB_USE_EXTERNAL "Use external TBB" 0)
-option(USE_STD_MALLOC "Use standard malloc instead of TBB" 0)
-option(ACE_USE_EXTERNAL "Use external ACE" 0)
 
-find_package(PCHSupport)
 
-# Add options for compile of mangos
-if(PCHSupport_FOUND)
-  if(WIN32)
-    option(PCH "Use precompiled headers" 1)
-  else()
-    option(PCH "Use precompiled headers" 0)
-  endif()
-endif()
-
-# FIXME: options that should be checked
-# option(SQL "Copy SQL files" 0)
-# option(TOOLS "Build tools" 0)
 
-# Set up the install-prefix
-if(CMAKE_INSTALL_PREFIX STREQUAL "/usr/local")
-  get_filename_component(PREFIX_ABSOLUTE "../mangos-server" ABSOLUTE)
-  set(CMAKE_INSTALL_PREFIX ${PREFIX_ABSOLUTE} CACHE PATH "Install path prefix." FORCE)
-endif()
+# TODO: remove this in the future! it has only been added to make the switch easier for end users
 if(PREFIX)
-  if(!WIN32)
-    string(REGEX REPLACE "^~" "$ENV{HOME}" PREFIX ${PREFIX})
-  endif()
-  get_filename_component(PREFIX_ABSOLUTE ${PREFIX} ABSOLUTE)
-  set(CMAKE_INSTALL_PREFIX ${PREFIX} CACHE PATH "Install path prefix." FORCE)
-else()
-  set(PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Install path prefix.")
+  message(FATAL_ERROR "The parameter PREFIX has been removed. Please re-run CMake and use CMAKE_INSTALL_PREFIX instead to define your installation location!")
 endif()
 
 set(BIN_DIR ${CMAKE_INSTALL_PREFIX}/bin)
@@ -170,7 +212,7 @@ else()
   include(cmake/ImportACE.cmake)
 endif()
 
-if(NOT USE_STD_MALLOC)
+if(USE_TBB_MALLOC)
   unset(TBB_INCLUDE_DIR CACHE)
   unset(TBB_LIBRARIES CACHE)
   unset(TBB_LIBRARIES_DIR CACHE)
@@ -202,7 +244,17 @@ endif()
 
 # *nix-specific packages
 if(UNIX)
-  find_package(MySQL REQUIRED)
+  if(POSTGRESQL)
+    find_package(PostgreSQL REQUIRED)
+
+    if(POSTGRESQL_FOUND)
+      include_directories(${POSTGRESQL_INCLUDE_DIRS})
+    endif(POSTGRESQL_FOUND)
+
+  else()
+    find_package(MySQL REQUIRED)
+  endif()
+
   find_package(OpenSSL REQUIRED)
   find_package(ZLIB REQUIRED)
 endif()
@@ -284,8 +336,8 @@ endif()
 if(UNIX)
   set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} --no-warnings")
   set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} --no-warnings")
-  set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -Wfatal-errors -Wextra")
-  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wfatal-errors -Wextra")
+  set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -Wfatal-errors")
+  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wfatal-errors")
 elseif(WIN32)
   # Disable warnings in Visual Studio 8 and above and add /MP
   if(MSVC AND NOT CMAKE_GENERATOR MATCHES "Visual Studio 7")
@@ -398,24 +450,31 @@ if(XCODE)
   endif()
 endif()
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_SOURCE_DIR}/config.h)
 
 add_subdirectory(dep) # TODO: add vmap extractor build support
 
 # Add definitions for all build types
 # Don't place this above 'dep' subdirectory! Because of defines build will crash.
-set(DEFINITIONS
-  DO_MYSQL
-  HAVE_CONFIG_H
-  VERSION="${MANGOS_VERSION}"
-  SYSCONFDIR="${CONF_DIR}/"
-)
+if (UNIX)
+    set(DEFINITIONS DO_MYSQL SYSCONFDIR="${CONF_DIR}/")
+else()
+    set(DEFINITIONS DO_MYSQL SYSCONFDIR="../etc/")
+endif()
+
+if(POSTGRESQL)
+  set(DEFINITIONS ${DEFINITIONS} DO_POSTGRESQL)
+else()
+  set(DEFINITIONS ${DEFINITIONS} DO_MYSQL)
+endif()
+
 set(DEFINITIONS_RELEASE NDEBUG)
 set(DEFINITIONS_DEBUG _DEBUG MANGOS_DEBUG)
 if(WIN32)
   set(DEFINITIONS ${DEFINITIONS} WIN32 _WIN32)
   set(DEFINITIONS_RELEASE ${DEFINITIONS_RELEASE} _CRT_SECURE_NO_WARNINGS)
 endif()
+
 if(USE_STD_MALLOC)
   set(DEFINITIONS ${DEFINITIONS} USE_STANDARD_MALLOC)
 endif()
@@ -427,4 +486,4 @@ set_directory_properties(PROPERTIES COMPILE_DEFINITIONS_DEBUG "${DEFINITIONS_DEB
 add_subdirectory(src)
 # if(SQL)
 #   add_subdirectory(sql)
-# endif()
+# endif()

README.md

@@ -0,0 +1,30 @@
+= AI Playerbot -- README =
+
+This is a fork of playerbot with completely different AI based on strategies.
+Documentation can be found in doc/playerbot folder 
+
+Copyright (C) 2005-2012 MaNGOS project <http://getmangos.com/>
+
+MaNGOS is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+In addition, as a special exception, the MaNGOS project
+gives permission to link the code of its release of MaNGOS with the
+OpenSSL project's "OpenSSL" library (or with modified versions of it
+that use the same license as the "OpenSSL" library), and distribute
+the linked executables.  You must obey the GNU General Public License
+in all respects for all of the code used other than "OpenSSL".  If you
+modify this file, you may extend this exception to your version of the
+file, but you are not obligated to do so.  If you do not wish to do
+so, delete this exception statement from your version.

VERSION

@@ -0,0 +1 @@
+0.2-random-bots

cmake/FindPCHSupport.cmake

@@ -17,13 +17,13 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
         ARGS  ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
         OUTPUT_VARIABLE gcc_compiler_version)
     #MESSAGE("GCC Version: ${gcc_compiler_version}")
-    IF(gcc_compiler_version MATCHES "4\\.[0-9]\\.[0-9]")
+    IF(gcc_compiler_version MATCHES "4\\.[0-9](\\.[0-9])?")
         SET(PCHSupport_FOUND TRUE)
-    ELSE(gcc_compiler_version MATCHES "4\\.[0-9]\\.[0-9]")
-        IF(gcc_compiler_version MATCHES "3\\.4\\.[0-9]")
+    ELSE(gcc_compiler_version MATCHES "4\\.[0-9](\\.[0-9])?")
+        IF(gcc_compiler_version MATCHES "3\\.4(\\.[0-9])?")
             SET(PCHSupport_FOUND TRUE)
-        ENDIF(gcc_compiler_version MATCHES "3\\.4\\.[0-9]")
-    ENDIF(gcc_compiler_version MATCHES "4\\.[0-9]\\.[0-9]")
+        ENDIF(gcc_compiler_version MATCHES "3\\.4(\\.[0-9])?")
+    ENDIF(gcc_compiler_version MATCHES "4\\.[0-9](\\.[0-9])?")
 
   SET(_PCH_include_prefix "-I")
 
@@ -270,6 +270,8 @@ MACRO(GET_NATIVE_PRECOMPILED_HEADER _targetName _input)
     endif(EXISTS ${${_targetName}_pch})
   endif(CMAKE_GENERATOR MATCHES Visual*)
 
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zm500")
+
 ENDMACRO(GET_NATIVE_PRECOMPILED_HEADER)
 
 

cmake/mingw32-i686.cmake

@@ -0,0 +1,19 @@
+# the name of the target operating system
+SET(CMAKE_SYSTEM_NAME      Windows)
+SET(CMAKE_SYSTEM_PROCESSOR i686)
+SET(COMPILER_PREFIX ${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32)
+
+# which compilers to use for C and C++ and ASM-ATT
+find_program(CMAKE_RC_COMPILER NAMES ${COMPILER_PREFIX}-windres)
+find_program(CMAKE_C_COMPILER NAMES ${COMPILER_PREFIX}-gcc)
+find_program(CMAKE_CXX_COMPILER NAMES ${COMPILER_PREFIX}-g++)
+find_program(CMAKE_CXX_COMPILER NAMES ${COMPILER_PREFIX}-as)
+
+SET(CMAKE_FIND_ROOT_PATH  /usr/${COMPILER_PREFIX} ${USER_ROOT_PATH})
+
+# adjust the default behaviour of the FIND_XXX() commands:
+# search headers and libraries in the target environment, search 
+# programs in the host environment
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)