Skip to content

Commit

Permalink
[mr3197] Startup travis-ci work. .gitmodule update to allow travis cl…
Browse files Browse the repository at this point in the history
…one SD2 submodule and compile together and allow to use markdown on readme file.
  • Loading branch information
Undergarun committed Mar 26, 2014
1 parent 602fb7b commit 9b5c1b1
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
@@ -1,3 +1,3 @@
[submodule "src/bindings/ScriptDev2"]
path = src/bindings/ScriptDev2
url = git@github.com:mangosR2/scriptdev2.git
url = git://github.com/mangosR2/scriptdev2.git

This comment has been minimized.

Copy link
@rsa

rsa Mar 26, 2014

Member

in this case submodule read-only.

This comment has been minimized.

Copy link
@Undergarun

Undergarun Mar 26, 2014

Author Member

For why u use .git submodules? Travis has issues trying to clone read/write url version.

This comment has been minimized.

Copy link
@rsa

rsa Mar 27, 2014

Member

possible automate cloning/pushing all tree. but for travis need write this directly.

14 changes: 9 additions & 5 deletions .travis.yml
Expand Up @@ -8,16 +8,20 @@ compiler:
- gcc
- clang

before_install:
- sudo apt-get install libace-dev
- sudo apt-get update

script:
- test -d _build || mkdir _build
- test -d _install || mkdir _install
- cd _build
- cmake -DCMAKE_INSTALL_PREFIX=../_install ..
- test -d build || mkdir build
- test -d install || mkdir install
- cd build
- cmake -DPCH=0 -DCMAKE_BUILD_TYPE=Release -DUSE_STD_MALLOC=1 -DACE_USE_EXTERNAL=1 -DLIB_INSTALL_DIR="../install/lib" -DINCLUDE_INSTALL_DIR="../install/include" -DCMAKE_INSTALL_PREFIX=../install ..
- make -j4

notifications:
irc:
channels:
- "irc.rizon.net#mangosR2"
on_success: never
on_failure: newer
on_failure: never
15 changes: 8 additions & 7 deletions README → README.md
@@ -1,4 +1,6 @@
MangosR2 README
# MangosR2 (3.3.5 12340) [![Build Status](https://travis-ci.org/mangosR2/mangos.svg?branch=master)](https://travis-ci.org/mangosR2/mangos)

## About MangosR2

MangosR2 is a free, open source MMORPG Framework based mostly on C++.
open source, and is community supported. It is derived from MaNGOS,
Expand All @@ -24,9 +26,8 @@ in addition, the code of the original project practically not tested and
may cause problems while real usage.
/dev/rsa

Copyright (C) 2011-2013 MangosR2 <http://github.com/MangosR2/>
Copyright (C) 2006-2013 ScriptDev2 <https://github.com/scriptdev2>
Copyright (C) 2012-2013 C(ontinued) MaNGOS <http://github.com/cmangos/>
Copyright (C) 2009-2011 /dev/rsa <http://github.com/rsa/>
Copyright (C) 2005-2012 MaNGOS project <http://getmangos.com/>

Copyright (C) 2011-2014 MangosR2 <http://github.com/MangosR2/>
Copyright (C) 2006-2014 ScriptDev2 <http://github.com/scriptdev2>
Copyright (C) 2012-2014 C(ontinued) MaNGOS <http://github.com/cmangos/>
Copyright (C) 2009-2014 /dev/rsa <http://github.com/rsa/>
Copyright (C) 2005-2014 MaNGOS project <http://getmangos.com/>
2 changes: 1 addition & 1 deletion src/shared/revision_R2.h
@@ -1,4 +1,4 @@
#ifndef __REVISION_R2_H__
#define __REVISION_R2_H__
#define REVISION_R2 "3196"
#define REVISION_R2 "3197"
#endif // __REVISION_R2_H__

0 comments on commit 9b5c1b1

Please sign in to comment.