diff options
| author | Haru <haru@dotalux.com> | 2013-08-05 16:36:45 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2013-08-08 02:21:25 +0200 |
| commit | defac0ef9714121a872ab48c3f6c4ddd177ae509 (patch) | |
| tree | 7e6a37f2284256da0bedb48eb3f5137cbf739b83 | |
| parent | a702c55f219519c1d9410f823bd7a9e4c6be256b (diff) | |
| download | hercules-defac0ef9714121a872ab48c3f6c4ddd177ae509.tar.gz hercules-defac0ef9714121a872ab48c3f6c4ddd177ae509.tar.bz2 hercules-defac0ef9714121a872ab48c3f6c4ddd177ae509.tar.xz hercules-defac0ef9714121a872ab48c3f6c4ddd177ae509.zip | |
Enabled Pre-Renewal builds in the CI buildbot
Both Renewal and Pre-Renewal branches will now be built and tested.
Signed-off-by: Haru <haru@dotalux.com>
| -rw-r--r-- | .travis.yml | 7 | ||||
| -rwxr-xr-x | configure | 36 | ||||
| -rw-r--r-- | configure.in | 34 | ||||
| -rw-r--r-- | src/config/renewal.h | 4 |
4 files changed, 77 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 283fe7a6c..fc209376b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,12 +7,13 @@ before_script: - uname -a script: - - ./configure --enable-debug - - make -j3 + - ./configure --enable-debug && make -j3 + - make clean + - ./configure --disable-renewal --enable-debug && make -j3 notifications: email: false branches: only: - - master
\ No newline at end of file + - master @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in 9d3dbd5. +# From configure.in c1dca64. # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69. # @@ -695,6 +695,7 @@ enable_rdtsc enable_profiler enable_64bit enable_lto +enable_renewal with_maxconn with_mysql with_MYSQL_CFLAGS @@ -1337,6 +1338,8 @@ Optional Features: --disable-64bit Enforce 32bit output on x86_64 systems. --enable-lto Enables or Disables Linktime Code Optimization (LTO is enabled by default) + --disable-renewal Disable Ragnarok Renewal support (override settings + in src/config/renewal.h) Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -3561,6 +3564,26 @@ fi # +# Renewal +# +# Check whether --enable-renewal was given. +if test "${enable_renewal+set}" = set; then : + enableval=$enable_renewal; + enable_renewal="$enableval" + case $enableval in + "no");; + "yes");; + *) as_fn_error $? "invalid argument --enable-renewal=$enableval... stopping" "$LINENO" 5;; + esac + +else + enable_renewal="yes" + +fi + + + +# # Optionally set the max number of network conenctions # the core will be support # @@ -5324,6 +5347,17 @@ case $enable_profiler in ;; esac +# +# Renewal +# +case $enable_renewal in + "no") + CFLAGS="$CFLAGS -DDISABLE_RENEWAL" + ;; + "yes") + # default value + ;; +esac # # zlib library (required) diff --git a/configure.in b/configure.in index 9e13e89ab..d9353f51c 100644 --- a/configure.in +++ b/configure.in @@ -189,6 +189,29 @@ AC_ARG_ENABLE( # +# Renewal +# +AC_ARG_ENABLE( + [renewal], + AC_HELP_STRING( + [--disable-renewal], + [ + Disable Ragnarok Renewal support (override settings in src/config/renewal.h) + ] + ), + [ + enable_renewal="$enableval" + case $enableval in + "no");; + "yes");; + *) AC_MSG_ERROR([[invalid argument --enable-renewal=$enableval... stopping]]);; + esac + ], + [enable_renewal="yes"] +) + + +# # Optionally set the max number of network conenctions # the core will be support # @@ -757,6 +780,17 @@ case $enable_profiler in ;; esac +# +# Renewal +# +case $enable_renewal in + "no") + CFLAGS="$CFLAGS -DDISABLE_RENEWAL" + ;; + "yes") + # default value + ;; +esac # # zlib library (required) diff --git a/src/config/renewal.h b/src/config/renewal.h index 8bd151f57..a7fd22c37 100644 --- a/src/config/renewal.h +++ b/src/config/renewal.h @@ -13,6 +13,8 @@ * @INFO: This file holds general-purpose renewal settings, for class-specific ones check /src/config/classes folder **/ +#ifndef DISABLE_RENEWAL + /// game renewal server mode /// (disable by commenting the line) /// @@ -69,4 +71,6 @@ /// - some skill/item ASPD bonuses won't stack #define RENEWAL_ASPD +#endif // DISABLE_RENEWAL + #endif // _CONFIG_RENEWAL_H_ |