From 061fb4c482353633d2610166646a981998307a24 Mon Sep 17 00:00:00 2001
From: Lukasz Gromanowski <lgromanowski@gmail.com>
Date: Tue, 2 Apr 2013 23:15:22 +0200
Subject: [PATCH 01/31] Added simple Travis CI cfg file.
Added simple Travis CI configuration file for testing.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
---
.travis.yml | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 .travis.yml
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..94cf74924
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,18 @@
+language: cpp
+compiler:
+ - clang
+ - gcc
+before_script:
+ - mkdir build
+ - cd build
+ - cmake ..
+branches:
+ only:
+ - master
+ - travis_ci_test
+notifications:
+ recipients:
+ - lgromanowski+travis.ci@gmail.com
+ email:
+ on_success: change
+ on_failure: always
From df8da0486da56835f55ab31e2aa87bfda82a50e0 Mon Sep 17 00:00:00 2001
From: Lukasz Gromanowski <lgromanowski@gmail.com>
Date: Tue, 2 Apr 2013 23:20:59 +0200
Subject: [PATCH 02/31] Small changes in .travis.yml file.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
---
.travis.yml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.travis.yml b/.travis.yml
index 94cf74924..f2a9179f5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,9 @@ before_script:
- mkdir build
- cd build
- cmake ..
+before_install:
+ - git submodule update --init --recursive
+script: make
branches:
only:
- master
From cb18cf1eee9ab28ced4347aa880403972ed18dde Mon Sep 17 00:00:00 2001
From: Lukasz Gromanowski <lgromanowski@gmail.com>
Date: Tue, 2 Apr 2013 23:30:44 +0200
Subject: [PATCH 03/31] Added OpenMW dependencies into .travis.yml file.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
---
.travis.yml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index f2a9179f5..6e3748056 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,10 @@ before_script:
- cd build
- cmake ..
before_install:
- - git submodule update --init --recursive
+ - git submodule update --init --recursive
+ - sudo apt-add-repository ppa:openmw/deps
+ - sudo apt-get update -qq
+ - sudo apt-get install -qq ffmpeg-dev boost-dev libbullet libogre-static mygui-static
script: make
branches:
only:
From 4f19fb0cdbfa5ac3815f83133cb1d864f371274a Mon Sep 17 00:00:00 2001
From: Lukasz Gromanowski <lgromanowski@gmail.com>
Date: Tue, 2 Apr 2013 23:38:23 +0200
Subject: [PATCH 04/31] Changes in apt-add-repository line - added echo.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
---
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 6e3748056..cdbabb1a1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ before_script:
- cmake ..
before_install:
- git submodule update --init --recursive
- - sudo apt-add-repository ppa:openmw/deps
+ - echo -e "\n" | sudo apt-add-repository ppa:openmw/deps
- sudo apt-get update -qq
- sudo apt-get install -qq ffmpeg-dev boost-dev libbullet libogre-static mygui-static
script: make
From f8497895149469720e56c25fc0b9b25e08e3c058 Mon Sep 17 00:00:00 2001
From: Lukasz Gromanowski <lgromanowski@gmail.com>
Date: Tue, 2 Apr 2013 23:41:24 +0200
Subject: [PATCH 05/31] Changes in apt-add-repository line.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
---
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index cdbabb1a1..3d3ad404c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ before_script:
- cmake ..
before_install:
- git submodule update --init --recursive
- - echo -e "\n" | sudo apt-add-repository ppa:openmw/deps
+ - echo "yes" | sudo apt-add-repository ppa:openmw/deps
- sudo apt-get update -qq
- sudo apt-get install -qq ffmpeg-dev boost-dev libbullet libogre-static mygui-static
script: make
From 73b984cc2d01ccca61cd5efeaa51f324060e69d9 Mon Sep 17 00:00:00 2001
From: Lukasz Gromanowski <lgromanowski@gmail.com>
Date: Wed, 3 Apr 2013 00:08:24 +0200
Subject: [PATCH 06/31] Corrected packages names in .travis.yml file.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
---
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 3d3ad404c..75fe32299 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ before_install:
- git submodule update --init --recursive
- echo "yes" | sudo apt-add-repository ppa:openmw/deps
- sudo apt-get update -qq
- - sudo apt-get install -qq ffmpeg-dev boost-dev libbullet libogre-static mygui-static
+ - sudo apt-get install -qq ffmpeg libboost-all-dev libbullet-dev libogre-static-dev mygui-static-dev
script: make
branches:
only:
From c32f4d853e6ca6b9f5f06367ad526f911c034bfb Mon Sep 17 00:00:00 2001
From: Lukasz Gromanowski <lgromanowski@gmail.com>
Date: Wed, 3 Apr 2013 00:14:26 +0200
Subject: [PATCH 07/31] Another change in packages names in .travis.yml file.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
---
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 75fe32299..a29140b25 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ before_install:
- git submodule update --init --recursive
- echo "yes" | sudo apt-add-repository ppa:openmw/deps
- sudo apt-get update -qq
- - sudo apt-get install -qq ffmpeg libboost-all-dev libbullet-dev libogre-static-dev mygui-static-dev
+ - sudo apt-get install -qq ffmpeg libboost-all-dev libbullet-dev libogre-static-dev libmygui-static-dev libqt4-dev libgtest-dev
script: make
branches:
only:
From c73209c049b4ba2776fb8c11ae91132dba8515a8 Mon Sep 17 00:00:00 2001
From: Lukasz Gromanowski <lgromanowski@gmail.com>
Date: Wed, 3 Apr 2013 00:21:42 +0200
Subject: [PATCH 08/31] Added another part of dependencies, enabled building
with static ogre and mygui.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
---
.travis.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index a29140b25..1239f1ed0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,12 +5,12 @@ compiler:
before_script:
- mkdir build
- cd build
- - cmake ..
+ - cmake .. -DOGRE_STATIC=1 -DMYGUI_STATIC=1
before_install:
- git submodule update --init --recursive
- echo "yes" | sudo apt-add-repository ppa:openmw/deps
- sudo apt-get update -qq
- - sudo apt-get install -qq ffmpeg libboost-all-dev libbullet-dev libogre-static-dev libmygui-static-dev libqt4-dev libgtest-dev
+ - sudo apt-get install -qq ffmpeg libboost-all-dev libbullet-dev libogre-static-dev libmygui-static-dev libqt4-dev libgtest-dev zziplib-bin libmpg123-dev
script: make
branches:
only:
From 5a1bb21b23b1c68a1ea597ac339396a0a2704aee Mon Sep 17 00:00:00 2001
From: Lukasz Gromanowski <lgromanowski@gmail.com>
Date: Wed, 3 Apr 2013 00:30:43 +0200
Subject: [PATCH 09/31] Build dependecies.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
---
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 1239f1ed0..80c3a4653 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ before_install:
- git submodule update --init --recursive
- echo "yes" | sudo apt-add-repository ppa:openmw/deps
- sudo apt-get update -qq
- - sudo apt-get install -qq ffmpeg libboost-all-dev libbullet-dev libogre-static-dev libmygui-static-dev libqt4-dev libgtest-dev zziplib-bin libmpg123-dev
+ - sudo apt-get install -qq ffmpeg libboost-all-dev libbullet-dev libogre-static-dev libmygui-static-dev libqt4-dev libgtest-dev zziplib-bin libmpg123-dev libcg libav-tools
script: make
branches:
only:
From 74d519d4057fe9d06c4b3b0fe3d6d1cafb074390 Mon Sep 17 00:00:00 2001
From: Lukasz Gromanowski <lgromanowski@gmail.com>
Date: Wed, 3 Apr 2013 00:35:18 +0200
Subject: [PATCH 10/31] Added libois into build dependencies in .travis.yml
file.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
---
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 80c3a4653..51fa23e8e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ before_install:
- git submodule update --init --recursive
- echo "yes" | sudo apt-add-repository ppa:openmw/deps
- sudo apt-get update -qq
- - sudo apt-get install -qq ffmpeg libboost-all-dev libbullet-dev libogre-static-dev libmygui-static-dev libqt4-dev libgtest-dev zziplib-bin libmpg123-dev libcg libav-tools
+ - sudo apt-get install -qq ffmpeg libboost-all-dev libbullet-dev libogre-static-dev libmygui-static-dev libqt4-dev libgtest-dev zziplib-bin libmpg123-dev libcg libav-tools libois-dev
script: make
branches:
only:
From 798ed642030dc059e0ab4d4963061bffb07131b6 Mon Sep 17 00:00:00 2001
From: Lukasz Gromanowski <lgromanowski@gmail.com>
Date: Wed, 3 Apr 2013 00:40:01 +0200
Subject: [PATCH 11/31] Added google-mock and libopenal into build
dependencies.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
---
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 51fa23e8e..003a4d801 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ before_install:
- git submodule update --init --recursive
- echo "yes" | sudo apt-add-repository ppa:openmw/deps
- sudo apt-get update -qq
- - sudo apt-get install -qq ffmpeg libboost-all-dev libbullet-dev libogre-static-dev libmygui-static-dev libqt4-dev libgtest-dev zziplib-bin libmpg123-dev libcg libav-tools libois-dev
+ - sudo apt-get install -qq ffmpeg libboost-all-dev libbullet-dev libogre-static-dev libmygui-static-dev libqt4-dev libgtest-dev google-mock zziplib-bin libmpg123-dev libcg libav-tools libois-dev libopenal-dev
script: make
branches:
only:
From 5957a9e037942934b30202b572ed9d8bb0cb4876 Mon Sep 17 00:00:00 2001
From: Lukasz Gromanowski <lgromanowski@gmail.com>
Date: Wed, 3 Apr 2013 00:44:03 +0200
Subject: [PATCH 12/31] Added libxaw7 into dependencies.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
---
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 003a4d801..4939ad0ec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ before_install:
- git submodule update --init --recursive
- echo "yes" | sudo apt-add-repository ppa:openmw/deps
- sudo apt-get update -qq
- - sudo apt-get install -qq ffmpeg libboost-all-dev libbullet-dev libogre-static-dev libmygui-static-dev libqt4-dev libgtest-dev google-mock zziplib-bin libmpg123-dev libcg libav-tools libois-dev libopenal-dev
+ - sudo apt-get install -qq ffmpeg libboost-all-dev libbullet-dev libogre-static-dev libmygui-static-dev libqt4-dev libgtest-dev google-mock zziplib-bin libmpg123-dev libcg libav-tools libois-dev libopenal-dev libxaw7-dev
script: make
branches:
only:
From e7bb3743cc491d00e036791d6f74ccf512d92286 Mon Sep 17 00:00:00 2001
From: Lukasz Gromanowski <lgromanowski@gmail.com>
Date: Wed, 3 Apr 2013 00:58:59 +0200
Subject: [PATCH 13/31] Trying to build with Ogre shared lib .
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
---
.travis.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 4939ad0ec..d31e4afc8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,12 +5,12 @@ compiler:
before_script:
- mkdir build
- cd build
- - cmake .. -DOGRE_STATIC=1 -DMYGUI_STATIC=1
+ - cmake .. -DMYGUI_STATIC=1
before_install:
- git submodule update --init --recursive
- echo "yes" | sudo apt-add-repository ppa:openmw/deps
- sudo apt-get update -qq
- - sudo apt-get install -qq ffmpeg libboost-all-dev libbullet-dev libogre-static-dev libmygui-static-dev libqt4-dev libgtest-dev google-mock zziplib-bin libmpg123-dev libcg libav-tools libois-dev libopenal-dev libxaw7-dev
+ - sudo apt-get install -qq ffmpeg libboost-all-dev libbullet-dev libogre-dev libmygui-static-dev libqt4-dev libgtest-dev google-mock zziplib-bin libmpg123-dev libcg libav-tools libois-dev libopenal-dev libxaw7-dev
script: make
branches:
only:
From 30654a1faa0d9181e4beb28babfd09fd801b809b Mon Sep 17 00:00:00 2001
From: Lukasz Gromanowski <lgromanowski@gmail.com>
Date: Wed, 3 Apr 2013 18:11:57 +0200
Subject: [PATCH 14/31] Added removing of ogre static.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
---
.travis.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.travis.yml b/.travis.yml
index d31e4afc8..f517a4da8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,7 @@ before_install:
- git submodule update --init --recursive
- echo "yes" | sudo apt-add-repository ppa:openmw/deps
- sudo apt-get update -qq
+ - sudo apt-get remove -qq libogre-static-dev
- sudo apt-get install -qq ffmpeg libboost-all-dev libbullet-dev libogre-dev libmygui-static-dev libqt4-dev libgtest-dev google-mock zziplib-bin libmpg123-dev libcg libav-tools libois-dev libopenal-dev libxaw7-dev
script: make
branches:
From 4bf87948a03e6073c2c527c25f7ee45d7ba47c18 Mon Sep 17 00:00:00 2001
From: Lukasz Gromanowski <lgromanowski@gmail.com>
Date: Wed, 3 Apr 2013 18:19:46 +0200
Subject: [PATCH 15/31] Removed clang compilation target.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
---
.travis.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index f517a4da8..4852efb81 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,5 @@
language: cpp
compiler:
- - clang
- gcc
before_script:
- mkdir build
From 71b4319a0ce170b9815c480ee5e5a1cb2b1f0d6f Mon Sep 17 00:00:00 2001
From: Lukasz Gromanowski <lgromanowski@gmail.com>
Date: Wed, 3 Apr 2013 18:31:38 +0200
Subject: [PATCH 16/31] Yet another change in build dependencies.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
---
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 4852efb81..a9c47aa4e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ before_install:
- echo "yes" | sudo apt-add-repository ppa:openmw/deps
- sudo apt-get update -qq
- sudo apt-get remove -qq libogre-static-dev
- - sudo apt-get install -qq ffmpeg libboost-all-dev libbullet-dev libogre-dev libmygui-static-dev libqt4-dev libgtest-dev google-mock zziplib-bin libmpg123-dev libcg libav-tools libois-dev libopenal-dev libxaw7-dev
+ - sudo apt-get install -qq libois-dev libopenal-dev libpng-dev libogre-dev libmpg123-dev libsndfile1-dev libblkid-dev libfreeimage-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-program-options-dev libboost-system-dev libboost-wave-dev uuid-dev libqt4-opengl libqt4-dev libavcodec-dev libavformat-dev libavdevice-dev libavutil-dev libswscale-dev libpostproc-dev ffmpeg libbullet-dev libmygui-dev libqt4-dev libgtest-dev google-mock zziplib-bin libcg libav-tools libois-dev libopenal-dev libxaw7-dev
script: make
branches:
only:
From 2a5fc7cd822e9a204b63bfdf858cec1c7eefba53 Mon Sep 17 00:00:00 2001
From: Lukasz Gromanowski <lgromanowski@gmail.com>
Date: Wed, 3 Apr 2013 19:02:21 +0200
Subject: [PATCH 17/31] Change in build dependencies.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
---
.travis.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index a9c47aa4e..4d1257d2b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,8 +10,8 @@ before_install:
- echo "yes" | sudo apt-add-repository ppa:openmw/deps
- sudo apt-get update -qq
- sudo apt-get remove -qq libogre-static-dev
- - sudo apt-get install -qq libois-dev libopenal-dev libpng-dev libogre-dev libmpg123-dev libsndfile1-dev libblkid-dev libfreeimage-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-program-options-dev libboost-system-dev libboost-wave-dev uuid-dev libqt4-opengl libqt4-dev libavcodec-dev libavformat-dev libavdevice-dev libavutil-dev libswscale-dev libpostproc-dev ffmpeg libbullet-dev libmygui-dev libqt4-dev libgtest-dev google-mock zziplib-bin libcg libav-tools libois-dev libopenal-dev libxaw7-dev
-script: make
+ - sudo apt-get install -qq libois-dev libopenal-dev libpng-dev libogre-static-dev libmpg123-dev libsndfile1-dev libblkid-dev libfreeimage-dev libboost-all-dev uuid-dev libqt4-opengl libqt4-dev libavcodec-dev libavformat-dev libavdevice-dev libavutil-dev libswscale-dev 0ibpostproc-dev ffmpeg libbullet-dev libmygui-static-dev libgtest-dev google-mock zziplib-bin libcg libav-tools libois-dev libopenal-dev libxaw7-dev
+script: "make -j`grep -c processor /proc/cpuinfo`"
branches:
only:
- master
From f655b9997cc4e04f606f726452ad241eabe57c5c Mon Sep 17 00:00:00 2001
From: Lukasz Gromanowski <lgromanowski@gmail.com>
Date: Wed, 3 Apr 2013 19:10:57 +0200
Subject: [PATCH 18/31] Added printing CMakeCache.txt file
For debug purposes, should be removed if compilation succeed.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
---
.travis.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.travis.yml b/.travis.yml
index 4d1257d2b..d99809590 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ before_script:
- mkdir build
- cd build
- cmake .. -DMYGUI_STATIC=1
+ - cat CMakeCache.txt
before_install:
- git submodule update --init --recursive
- echo "yes" | sudo apt-add-repository ppa:openmw/deps
From d070860f0943c2fa5ac22762128554b5fcf623be Mon Sep 17 00:00:00 2001
From: Lukasz Gromanowski <lgromanowski@gmail.com>
Date: Wed, 3 Apr 2013 19:14:13 +0200
Subject: [PATCH 19/31] Fixed typo.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
---
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index d99809590..7f361f5d4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ before_install:
- echo "yes" | sudo apt-add-repository ppa:openmw/deps
- sudo apt-get update -qq
- sudo apt-get remove -qq libogre-static-dev
- - sudo apt-get install -qq libois-dev libopenal-dev libpng-dev libogre-static-dev libmpg123-dev libsndfile1-dev libblkid-dev libfreeimage-dev libboost-all-dev uuid-dev libqt4-opengl libqt4-dev libavcodec-dev libavformat-dev libavdevice-dev libavutil-dev libswscale-dev 0ibpostproc-dev ffmpeg libbullet-dev libmygui-static-dev libgtest-dev google-mock zziplib-bin libcg libav-tools libois-dev libopenal-dev libxaw7-dev
+ - sudo apt-get install -qq libois-dev libopenal-dev libpng-dev libogre-static-dev libmpg123-dev libsndfile1-dev libblkid-dev libfreeimage-dev libboost-all-dev uuid-dev libqt4-opengl libqt4-dev libavcodec-dev libavformat-dev libavdevice-dev libavutil-dev libswscale-dev libpostproc-dev ffmpeg libbullet-dev libmygui-static-dev libgtest-dev google-mock zziplib-bin libcg libav-tools libois-dev libopenal-dev libxaw7-dev
script: "make -j`grep -c processor /proc/cpuinfo`"
branches:
only:
From af509ce016ee85094fcd75f69eadf29109c2757f Mon Sep 17 00:00:00 2001
From: Lukasz Gromanowski <lgromanowski@gmail.com>
Date: Wed, 3 Apr 2013 19:19:25 +0200
Subject: [PATCH 20/31] Restored building with static ogre.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
---
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 7f361f5d4..db0a47d84 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ compiler:
before_script:
- mkdir build
- cd build
- - cmake .. -DMYGUI_STATIC=1
+ - cmake .. -DOGRE_STATIC=1 -DMYGUI_STATIC=1
- cat CMakeCache.txt
before_install:
- git submodule update --init --recursive
From b1257620d90904571a49fb75ac2a2080051311ff Mon Sep 17 00:00:00 2001
From: Lukasz Gromanowski <lgromanowski@gmail.com>
Date: Fri, 5 Apr 2013 22:58:21 +0200
Subject: [PATCH 21/31] Some cleanup in build dependencies.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
---
.travis.yml | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index db0a47d84..35fb3a598 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,13 +5,16 @@ before_script:
- mkdir build
- cd build
- cmake .. -DOGRE_STATIC=1 -DMYGUI_STATIC=1
- - cat CMakeCache.txt
before_install:
- git submodule update --init --recursive
- echo "yes" | sudo apt-add-repository ppa:openmw/deps
- sudo apt-get update -qq
- - sudo apt-get remove -qq libogre-static-dev
- - sudo apt-get install -qq libois-dev libopenal-dev libpng-dev libogre-static-dev libmpg123-dev libsndfile1-dev libblkid-dev libfreeimage-dev libboost-all-dev uuid-dev libqt4-opengl libqt4-dev libavcodec-dev libavformat-dev libavdevice-dev libavutil-dev libswscale-dev libpostproc-dev ffmpeg libbullet-dev libmygui-static-dev libgtest-dev google-mock zziplib-bin libcg libav-tools libois-dev libopenal-dev libxaw7-dev
+ - sudo apt-get install -qq libboost-all-dev libgtest-dev google-mock libzzip-dev
+ - sudo apt-get install -qq libqt4-dev libxaw7-dev libxrand-dev libfreeimage-dev libpng-dev
+ - sudo apt-get install -qq libopenal-dev libmpg123-dev libsndfile1-dev
+ - sudo apt-get install -qq libcg nvidia-cg-dev
+ - sudo apt-get install -qq libavcodec-dev libavformat-dev libavdevice-dev libavutil-dev libswscale-dev libpostproc-dev
+ - sudo apt-get install -qq libois-dev libbullet-dev libogre-static-dev libmygui-static-dev
script: "make -j`grep -c processor /proc/cpuinfo`"
branches:
only:
From 07d5d26b4a2f724553feb8ecacc9fe58ed15d9d2 Mon Sep 17 00:00:00 2001
From: Lukasz Gromanowski <lgromanowski@gmail.com>
Date: Fri, 5 Apr 2013 23:02:44 +0200
Subject: [PATCH 22/31] Corrected typo.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
---
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 35fb3a598..b8ebe6275 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ before_install:
- echo "yes" | sudo apt-add-repository ppa:openmw/deps
- sudo apt-get update -qq
- sudo apt-get install -qq libboost-all-dev libgtest-dev google-mock libzzip-dev
- - sudo apt-get install -qq libqt4-dev libxaw7-dev libxrand-dev libfreeimage-dev libpng-dev
+ - sudo apt-get install -qq libqt4-dev libxaw7-dev libxrandr-dev libfreeimage-dev libpng-dev
- sudo apt-get install -qq libopenal-dev libmpg123-dev libsndfile1-dev
- sudo apt-get install -qq libcg nvidia-cg-dev
- sudo apt-get install -qq libavcodec-dev libavformat-dev libavdevice-dev libavutil-dev libswscale-dev libpostproc-dev
From d999c0a91c692289b4a3aba805c72ae41e4adf15 Mon Sep 17 00:00:00 2001
From: Lukasz Gromanowski <lgromanowski@gmail.com>
Date: Fri, 5 Apr 2013 23:18:10 +0200
Subject: [PATCH 23/31] Enabled addtional Ubuntu repositories.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
---
.travis.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.travis.yml b/.travis.yml
index b8ebe6275..f383d8272 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,7 @@ before_script:
- cmake .. -DOGRE_STATIC=1 -DMYGUI_STATIC=1
before_install:
- git submodule update --init --recursive
+ - echo "yes" | sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu `lsb_release -sc` main universe restricted multiverse partner"
- echo "yes" | sudo apt-add-repository ppa:openmw/deps
- sudo apt-get update -qq
- sudo apt-get install -qq libboost-all-dev libgtest-dev google-mock libzzip-dev
From fb4f50ce8f577081bfdc796c9f6cbc998debcec9 Mon Sep 17 00:00:00 2001
From: Lukasz Gromanowski <lgromanowski@gmail.com>
Date: Fri, 5 Apr 2013 23:28:44 +0200
Subject: [PATCH 24/31] Removed 'partner' repository.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
---
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index f383d8272..61d5fa551 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ before_script:
- cmake .. -DOGRE_STATIC=1 -DMYGUI_STATIC=1
before_install:
- git submodule update --init --recursive
- - echo "yes" | sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu `lsb_release -sc` main universe restricted multiverse partner"
+ - echo "yes" | sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu `lsb_release -sc` main universe restricted multiverse"
- echo "yes" | sudo apt-add-repository ppa:openmw/deps
- sudo apt-get update -qq
- sudo apt-get install -qq libboost-all-dev libgtest-dev google-mock libzzip-dev
From a48d60b5e34ed1d6dcfe6396392ec40120bf5412 Mon Sep 17 00:00:00 2001
From: Lukasz Gromanowski <lgromanowski@gmail.com>
Date: Fri, 5 Apr 2013 23:34:23 +0200
Subject: [PATCH 25/31] Changed packet name from nvidia-cg-dev to
nvidia-cg-toolkit.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
---
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 61d5fa551..c57457249 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ before_install:
- sudo apt-get install -qq libboost-all-dev libgtest-dev google-mock libzzip-dev
- sudo apt-get install -qq libqt4-dev libxaw7-dev libxrandr-dev libfreeimage-dev libpng-dev
- sudo apt-get install -qq libopenal-dev libmpg123-dev libsndfile1-dev
- - sudo apt-get install -qq libcg nvidia-cg-dev
+ - sudo apt-get install -qq libcg nvidia-cg-toolkit
- sudo apt-get install -qq libavcodec-dev libavformat-dev libavdevice-dev libavutil-dev libswscale-dev libpostproc-dev
- sudo apt-get install -qq libois-dev libbullet-dev libogre-static-dev libmygui-static-dev
script: "make -j`grep -c processor /proc/cpuinfo`"
From 99ff89d668b8d51a3f6b46af35a94bc26ef1d256 Mon Sep 17 00:00:00 2001
From: Lukasz Gromanowski <lgromanowski@gmail.com>
Date: Fri, 5 Apr 2013 23:41:15 +0200
Subject: [PATCH 26/31] Lowered number of used CPUs for compilation.
Enabled building of unit tests.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
---
.travis.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index c57457249..ee26fd5c1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ compiler:
before_script:
- mkdir build
- cd build
- - cmake .. -DOGRE_STATIC=1 -DMYGUI_STATIC=1
+ - cmake .. -DOGRE_STATIC=1 -DMYGUI_STATIC=1 -DBUILD_WITH_CODE_COVERAGE=1 -DBUILD_UNITTESTS=1
before_install:
- git submodule update --init --recursive
- echo "yes" | sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu `lsb_release -sc` main universe restricted multiverse"
@@ -16,7 +16,7 @@ before_install:
- sudo apt-get install -qq libcg nvidia-cg-toolkit
- sudo apt-get install -qq libavcodec-dev libavformat-dev libavdevice-dev libavutil-dev libswscale-dev libpostproc-dev
- sudo apt-get install -qq libois-dev libbullet-dev libogre-static-dev libmygui-static-dev
-script: "make -j`grep -c processor /proc/cpuinfo`"
+script: "make -j4"
branches:
only:
- master
From 6529919102bde1d126121a5669cbb802949162dc Mon Sep 17 00:00:00 2001
From: Lukasz Gromanowski <lgromanowski@gmail.com>
Date: Sat, 6 Apr 2013 00:01:44 +0200
Subject: [PATCH 27/31] Enabled building of Gtest libary.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
---
.travis.yml | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index ee26fd5c1..96ce6d7eb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,6 @@
language: cpp
compiler:
- - gcc
-before_script:
- - mkdir build
- - cd build
- - cmake .. -DOGRE_STATIC=1 -DMYGUI_STATIC=1 -DBUILD_WITH_CODE_COVERAGE=1 -DBUILD_UNITTESTS=1
+ - gcc
before_install:
- git submodule update --init --recursive
- echo "yes" | sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu `lsb_release -sc` main universe restricted multiverse"
@@ -15,7 +11,17 @@ before_install:
- sudo apt-get install -qq libopenal-dev libmpg123-dev libsndfile1-dev
- sudo apt-get install -qq libcg nvidia-cg-toolkit
- sudo apt-get install -qq libavcodec-dev libavformat-dev libavdevice-dev libavutil-dev libswscale-dev libpostproc-dev
- - sudo apt-get install -qq libois-dev libbullet-dev libogre-static-dev libmygui-static-dev
+ - sudo apt-get install -qq libois-dev libbullet-dev libogre-static-dev libmygui-static-dev
+ - sudo mkdir /usr/src/gtest/build
+ - cd /usr/src/gtest/build
+ - sudo cmake .. -DBUILD_SHARED_LIBS=1
+ - sudo make -j4
+ - sudo ln -s /usr/src/gtest/build/libgtest.so /usr/lib/libgtest.so
+ - sudo ln -s /usr/src/gtest/build/libgtest_main.so /usr/lib/libgtest_main.so
+before_script:
+ - mkdir build
+ - cd build
+ - cmake .. -DOGRE_STATIC=1 -DMYGUI_STATIC=1 -DBUILD_WITH_CODE_COVERAGE=1 -DBUILD_UNITTESTS=1
script: "make -j4"
branches:
only:
From 977da3eeb80d09d3eccc0d0f7cd19308e2e71472 Mon Sep 17 00:00:00 2001
From: Lukasz Gromanowski <lgromanowski@gmail.com>
Date: Sat, 6 Apr 2013 00:18:14 +0200
Subject: [PATCH 28/31] Change back directory to the one where OpenMW is
downloaded.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
---
.travis.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.travis.yml b/.travis.yml
index 96ce6d7eb..8df94ca48 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,7 @@ language: cpp
compiler:
- gcc
before_install:
+ - pwd
- git submodule update --init --recursive
- echo "yes" | sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu `lsb_release -sc` main universe restricted multiverse"
- echo "yes" | sudo apt-add-repository ppa:openmw/deps
@@ -19,6 +20,7 @@ before_install:
- sudo ln -s /usr/src/gtest/build/libgtest.so /usr/lib/libgtest.so
- sudo ln -s /usr/src/gtest/build/libgtest_main.so /usr/lib/libgtest_main.so
before_script:
+ - cd -
- mkdir build
- cd build
- cmake .. -DOGRE_STATIC=1 -DMYGUI_STATIC=1 -DBUILD_WITH_CODE_COVERAGE=1 -DBUILD_UNITTESTS=1
From 86457ce488b233141091b04487d1ed5d89ac4338 Mon Sep 17 00:00:00 2001
From: Lukasz Gromanowski <lgromanowski@gmail.com>
Date: Sat, 6 Apr 2013 00:45:04 +0200
Subject: [PATCH 29/31] Enabled running of openmw test suite.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
---
.travis.yml | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 8df94ca48..9ed8b7526 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,10 @@
language: cpp
compiler:
- gcc
+branches:
+ only:
+ - master
+ - travis_ci_test
before_install:
- pwd
- git submodule update --init --recursive
@@ -24,11 +28,10 @@ before_script:
- mkdir build
- cd build
- cmake .. -DOGRE_STATIC=1 -DMYGUI_STATIC=1 -DBUILD_WITH_CODE_COVERAGE=1 -DBUILD_UNITTESTS=1
-script: "make -j4"
-branches:
- only:
- - master
- - travis_ci_test
+script:
+ - make -j4
+after_script:
+ - openmw_test_suite
notifications:
recipients:
- lgromanowski+travis.ci@gmail.com
From 05e7cfeb70c80ebb3fcaa0d9f984366e65988a7f Mon Sep 17 00:00:00 2001
From: Lukasz Gromanowski <lgromanowski@gmail.com>
Date: Sat, 6 Apr 2013 01:04:41 +0200
Subject: [PATCH 30/31] Corrected path to the openmw test suite.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
---
.travis.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 9ed8b7526..54fff44e2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ compiler:
branches:
only:
- master
+ - next
- travis_ci_test
before_install:
- pwd
@@ -31,7 +32,7 @@ before_script:
script:
- make -j4
after_script:
- - openmw_test_suite
+ - ./openmw_test_suite
notifications:
recipients:
- lgromanowski+travis.ci@gmail.com
From 9ac56ce60e2d03761be32a3e83e947cdfc9f1f4e Mon Sep 17 00:00:00 2001
From: Lukasz Gromanowski <lgromanowski@gmail.com>
Date: Sat, 6 Apr 2013 01:24:38 +0200
Subject: [PATCH 31/31] Removed travis_ci_test branch from checked branches
list.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
---
.travis.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 54fff44e2..374b38ce0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,6 @@ branches:
only:
- master
- next
- - travis_ci_test
before_install:
- pwd
- git submodule update --init --recursive