Merge branch 'release/0.18.1'

mangosArchives · Nov 2, 2013 · 727c0a5 · 727c0a5
2 parents d74c022 + 053d546
commit 727c0a5
Show file tree

Hide file tree

Showing 3,650 changed files with 118,627 additions and 705,135 deletions.
diff --git a/.gitignore b/.gitignore
@@ -22,6 +22,7 @@
 /.externalToolBuilders
 
 # Sublime Text 2 - project files
+/*.sublime-build
 /*.sublime-project
 /*.sublime-workspace
 

diff --git a/.travis.yml b/.travis.yml
@@ -8,42 +8,21 @@ git:
 branches:
  only:
  - master
+ - develop
 
-# do not build with clang until fixed
+# build with both gcc and clang to ensure compatibility
 compiler:
  - gcc
+ - clang
 
 before_install:
  - sudo apt-get update -qq
  - sudo apt-get install -qq libbz2-dev libncurses5-dev libmysqlclient-dev libreadline-dev libsdl1.2-dev libssl-dev zlib1g-dev libace-dev
 
 script:
- - cd dep/libmpq/
- - ./autogen.sh
- - ./configure && make
- - cd ../../contrib/extractor/
- - test -d _build || mkdir _build
- - cd _build
- - cmake -DCMAKE_INSTALL_PREFIX=../_install -DCMAKE_BUILD_TYPE=Debug ..
- - make -j4
- - cd ../../vmap_assembler/
- - test -d _build || mkdir _build
- - cd _build
- - cmake -DCMAKE_INSTALL_PREFIX=../_install -DCMAKE_BUILD_TYPE=Debug ..
- - make -j4
- - cd ../../vmap_extractor/
- - test -d _build || mkdir _build
- - cd _build
- - cmake -DCMAKE_INSTALL_PREFIX=../_install -DCMAKE_BUILD_TYPE=Debug ..
- - make -j4
- - cd ../../mmap/
- - test -d _build || mkdir _build
- - cd _build
- - cmake -DCMAKE_INSTALL_PREFIX=../_install -DCMAKE_BUILD_TYPE=Debug ..
- - make -j4
- - cd ../../../
  - test -d _build || mkdir _build
  - test -d _install || mkdir _install
  - cd _build
- - cmake -DCMAKE_INSTALL_PREFIX=../_install -DCMAKE_BUILD_TYPE=Debug -DDEBUG=1 -DPCH=1 -DUSE_STD_MALLOC=1 -DACE_USE_EXTERNAL=1 ..
+ - cmake -DCMAKE_INSTALL_PREFIX=../_install -DCMAKE_BUILD_TYPE=Debug -DWITH_MOD_LUA=0 -DWITH_MOD_SCRIPTDEV2=1 ..
  - make -j4
+