From a0f7e4321b0c65f0d7f9016153a65b723217d5e0 Mon Sep 17 00:00:00 2001 From: troido Date: Thu, 3 Jan 2019 20:20:48 +0100 Subject: [PATCH 01/18] Tried a travis script Tried to write a travis script that compiles Torque according to http://wiki.torque3d.org/coder:compiling-in-linux#toc11 --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index 8e59706861..58a2b98ab0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,3 +2,10 @@ language: cpp compiler: - clang - gcc + +script: + - cp -r Templates/BaseGame/ My\ Projects/ + - mkdir My\ Projects/BaseGame/travis/ + - cd My\ Projects/BaseGame/travis/ + - cmake ../../../.. -DTORQUE_APP_NAME=BaseGame -DCMAKE_BUILD_TYPE=Debug + - make From c2a97790cb07ae9a11ba1e0ce73871a01d78a46e Mon Sep 17 00:00:00 2001 From: troido Date: Thu, 3 Jan 2019 20:30:22 +0100 Subject: [PATCH 02/18] put build files in builtFiles directory and added more ls and pwd commands --- .travis.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 58a2b98ab0..95248d8917 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,14 @@ compiler: - gcc script: + - pwd + - ls - cp -r Templates/BaseGame/ My\ Projects/ - - mkdir My\ Projects/BaseGame/travis/ - - cd My\ Projects/BaseGame/travis/ + - mkdir My\ Projects/BaseGame/buildFiles/travis/ + - cd My\ Projects/BaseGame/buildFile/travis/ + - pwd - cmake ../../../.. -DTORQUE_APP_NAME=BaseGame -DCMAKE_BUILD_TYPE=Debug + - ls - make + - cd ../../game/ + - ls From f398408f3527772769493cce915698dd05eaf11d Mon Sep 17 00:00:00 2001 From: troido Date: Thu, 3 Jan 2019 20:34:29 +0100 Subject: [PATCH 03/18] also make buildFiles directory --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 95248d8917..f94a8548b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ script: - pwd - ls - cp -r Templates/BaseGame/ My\ Projects/ + - mkdir My\ Projects/BaseGame/buildFiles/ - mkdir My\ Projects/BaseGame/buildFiles/travis/ - cd My\ Projects/BaseGame/buildFile/travis/ - pwd From b85aedeb1b5770c93daec245ade4451015d9f2c2 Mon Sep 17 00:00:00 2001 From: troido Date: Thu, 3 Jan 2019 20:36:37 +0100 Subject: [PATCH 04/18] fix spelling error buildFile -> buildFiles --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f94a8548b1..75056d8b1e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ script: - cp -r Templates/BaseGame/ My\ Projects/ - mkdir My\ Projects/BaseGame/buildFiles/ - mkdir My\ Projects/BaseGame/buildFiles/travis/ - - cd My\ Projects/BaseGame/buildFile/travis/ + - cd My\ Projects/BaseGame/buildFiles/travis/ - pwd - cmake ../../../.. -DTORQUE_APP_NAME=BaseGame -DCMAKE_BUILD_TYPE=Debug - ls From 09c6ed8908a30066de60ec6f69b91cd65a3328c0 Mon Sep 17 00:00:00 2001 From: troido Date: Thu, 3 Jan 2019 20:42:00 +0100 Subject: [PATCH 05/18] more package installations --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 75056d8b1e..447dc7d713 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,10 @@ compiler: - clang - gcc +install: + - sudo apt-get install git build-essential nasm xorg-dev ninja-build cmake + - sudo apt-get install libogg-dev libxft-dev libx11-dev libxxf86vm-dev libopenal-dev libfreetype6-dev libxcursor-dev libxinerama-dev libxi-dev libxrandr-dev libxss-dev libglu1-mesa-dev + script: - pwd - ls From 384e1eebce162028708e3e34859b3e0d62e05a37 Mon Sep 17 00:00:00 2001 From: troido Date: Thu, 3 Jan 2019 20:48:17 +0100 Subject: [PATCH 06/18] tried with xenial ubuntu (16.04) --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 447dc7d713..b83f9747b7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: cpp +dist: xenial compiler: - clang - gcc From b6472ede566cb3991647f4de37e2a3aede0f23f4 Mon Sep 17 00:00:00 2001 From: troido Date: Thu, 3 Jan 2019 20:51:37 +0100 Subject: [PATCH 07/18] install more dependencies in travis --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b83f9747b7..69e6ba3a52 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,9 @@ compiler: - gcc install: - - sudo apt-get install git build-essential nasm xorg-dev ninja-build cmake + - sudo apt-get install git build-essential nasm xorg-dev ninja-build gcc-multilib g++-multilib cmake cmake-qt-gui - sudo apt-get install libogg-dev libxft-dev libx11-dev libxxf86vm-dev libopenal-dev libfreetype6-dev libxcursor-dev libxinerama-dev libxi-dev libxrandr-dev libxss-dev libglu1-mesa-dev + - sudo apt-get install build-essential libgtk-3-dev script: - pwd From 8a9c835306be28da976c9a13308324f5d580dec1 Mon Sep 17 00:00:00 2001 From: troido Date: Thu, 3 Jan 2019 21:53:28 +0100 Subject: [PATCH 08/18] don't warn for deprecations (as attempt to get the travis output log shorted) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 69e6ba3a52..3039a6d6cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ script: - mkdir My\ Projects/BaseGame/buildFiles/travis/ - cd My\ Projects/BaseGame/buildFiles/travis/ - pwd - - cmake ../../../.. -DTORQUE_APP_NAME=BaseGame -DCMAKE_BUILD_TYPE=Debug + - cmake ../../../.. -DTORQUE_APP_NAME=BaseGame -DCMAKE_BUILD_TYPE=Debug -Wno-deprecated - ls - make - cd ../../game/ From 072dfbd8212a58edb355b65828e08de7b6bed6d3 Mon Sep 17 00:00:00 2001 From: troido Date: Thu, 3 Jan 2019 22:30:22 +0100 Subject: [PATCH 09/18] removed some dependencies and try if log is less verbose if the build type is a release --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3039a6d6cb..a9aa4363c2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ compiler: - gcc install: - - sudo apt-get install git build-essential nasm xorg-dev ninja-build gcc-multilib g++-multilib cmake cmake-qt-gui + - sudo apt-get install build-essential nasm xorg-dev ninja-build gcc-multilib g++-multilib cmake - sudo apt-get install libogg-dev libxft-dev libx11-dev libxxf86vm-dev libopenal-dev libfreetype6-dev libxcursor-dev libxinerama-dev libxi-dev libxrandr-dev libxss-dev libglu1-mesa-dev - sudo apt-get install build-essential libgtk-3-dev @@ -17,7 +17,7 @@ script: - mkdir My\ Projects/BaseGame/buildFiles/travis/ - cd My\ Projects/BaseGame/buildFiles/travis/ - pwd - - cmake ../../../.. -DTORQUE_APP_NAME=BaseGame -DCMAKE_BUILD_TYPE=Debug -Wno-deprecated + - cmake ../../../.. -DTORQUE_APP_NAME=BaseGame -DCMAKE_BUILD_TYPE=Release -Wno-deprecated - ls - make - cd ../../game/ From ff547b5b709440a0e0ce94dde06ae9bbe29cc3a0 Mon Sep 17 00:00:00 2001 From: troido Date: Thu, 3 Jan 2019 23:07:02 +0100 Subject: [PATCH 10/18] stupid solution for ignoring the warnings --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a9aa4363c2..8ba68c6c6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,7 @@ script: - pwd - cmake ../../../.. -DTORQUE_APP_NAME=BaseGame -DCMAKE_BUILD_TYPE=Release -Wno-deprecated - ls - - make + - make 2>/dev/null # Do the actual build, but ignore all the warnings + - make # build again. This time all output is printed but the warnings that happened earlier do not happen again - cd ../../game/ - ls From fa7f7e9f97686c411464af169c9bfd5e68637253 Mon Sep 17 00:00:00 2001 From: troido Date: Fri, 4 Jan 2019 11:13:32 +0100 Subject: [PATCH 11/18] packages are now installed with apt addon --- .travis.yml | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8ba68c6c6a..93eb3b2327 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,10 +4,24 @@ compiler: - clang - gcc -install: - - sudo apt-get install build-essential nasm xorg-dev ninja-build gcc-multilib g++-multilib cmake - - sudo apt-get install libogg-dev libxft-dev libx11-dev libxxf86vm-dev libopenal-dev libfreetype6-dev libxcursor-dev libxinerama-dev libxi-dev libxrandr-dev libxss-dev libglu1-mesa-dev - - sudo apt-get install build-essential libgtk-3-dev +addons: + apt: + packages: + - build-essential + - nasm + - libogg-dev + - libxft-dev + - libx11-dev + - libxxf86vm-dev + - libopenal-dev + - libfreetype6-dev + - libxcursor-dev + - libxinerama-dev + - libxi-dev + - libxrandr-dev + - libxss-dev + - libglu1-mesa-dev + - libgtk-3-dev script: - pwd From 85474dbe0e4c7c7b49dfae3c0e422b3356e56915 Mon Sep 17 00:00:00 2001 From: troido Date: Fri, 4 Jan 2019 11:29:18 +0100 Subject: [PATCH 12/18] tried to add osx to travis --- .travis.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 93eb3b2327..18fc4e3211 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,11 @@ language: cpp +os: + - linux + - osx dist: xenial compiler: - - clang - gcc + - clang addons: apt: @@ -31,7 +34,7 @@ script: - mkdir My\ Projects/BaseGame/buildFiles/travis/ - cd My\ Projects/BaseGame/buildFiles/travis/ - pwd - - cmake ../../../.. -DTORQUE_APP_NAME=BaseGame -DCMAKE_BUILD_TYPE=Release -Wno-deprecated + - cmake ../../../.. -DTORQUE_APP_NAME=BaseGame -DCMAKE_BUILD_TYPE=Debug - ls - make 2>/dev/null # Do the actual build, but ignore all the warnings - make # build again. This time all output is printed but the warnings that happened earlier do not happen again From 4c5c9430093cbfbacdb27b6f9f0993657c9a942e Mon Sep 17 00:00:00 2001 From: troido Date: Fri, 4 Jan 2019 11:52:21 +0100 Subject: [PATCH 13/18] osX does not want a trailing / in cp directory --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 18fc4e3211..b616a03a9b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: cpp os: - - linux - osx + - linux dist: xenial compiler: - gcc @@ -29,7 +29,7 @@ addons: script: - pwd - ls - - cp -r Templates/BaseGame/ My\ Projects/ + - cp -r Templates/BaseGame My\ Projects/ - mkdir My\ Projects/BaseGame/buildFiles/ - mkdir My\ Projects/BaseGame/buildFiles/travis/ - cd My\ Projects/BaseGame/buildFiles/travis/ From 57de13d88586ec4580d97cdf70d142c36befd5bc Mon Sep 17 00:00:00 2001 From: troido Date: Fri, 4 Jan 2019 11:57:29 +0100 Subject: [PATCH 14/18] tried to include nasm in osX travis build --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index b616a03a9b..473150095c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,6 +25,9 @@ addons: - libxss-dev - libglu1-mesa-dev - libgtk-3-dev + homebrew: + packages: + - nasm script: - pwd From 922ccae55ec9b5af45cae6e8d14e2e11b284eca4 Mon Sep 17 00:00:00 2001 From: troido Date: Fri, 4 Jan 2019 12:19:01 +0100 Subject: [PATCH 15/18] tried osX solutions from #2032 --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 473150095c..4845efa039 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,8 @@ compiler: - gcc - clang +env: CXXFLAGS="fgnu-inline-asm -fasm-blocks" + addons: apt: packages: From 948f0ff23bea75e881f06db08758d1ed3a401d32 Mon Sep 17 00:00:00 2001 From: troido Date: Fri, 4 Jan 2019 12:32:32 +0100 Subject: [PATCH 16/18] add missing dash --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4845efa039..60cf52d338 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ compiler: - gcc - clang -env: CXXFLAGS="fgnu-inline-asm -fasm-blocks" +env: CXXFLAGS="-fgnu-inline-asm -fasm-blocks" addons: apt: From e5af6c77cd146fafb8646a38eb769f0ab890f15e Mon Sep 17 00:00:00 2001 From: troido Date: Fri, 4 Jan 2019 13:13:22 +0100 Subject: [PATCH 17/18] tried to use a build matrix --- .travis.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 60cf52d338..94d4336fab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,16 @@ language: cpp -os: - - osx - - linux + dist: xenial -compiler: - - gcc - - clang -env: CXXFLAGS="-fgnu-inline-asm -fasm-blocks" +matrix: + include: + - os: osx + compiler: clang + env: if CXXFLAGS="-fgnu-inline-asm -fasm-blocks" + - os: linux + compiler: gcc + - os: linux + compiler: clang addons: apt: @@ -27,9 +30,6 @@ addons: - libxss-dev - libglu1-mesa-dev - libgtk-3-dev - homebrew: - packages: - - nasm script: - pwd From ccf39359eb82cbe77ad108b1c6d0ae53975e6430 Mon Sep 17 00:00:00 2001 From: troido Date: Sat, 5 Jan 2019 20:43:41 +0100 Subject: [PATCH 18/18] build a new project the correct way (using make insteall instead of cp -r) --- .travis.yml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 94d4336fab..3842df29ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,16 +32,13 @@ addons: - libgtk-3-dev script: - - pwd - - ls - - cp -r Templates/BaseGame My\ Projects/ - - mkdir My\ Projects/BaseGame/buildFiles/ - - mkdir My\ Projects/BaseGame/buildFiles/travis/ - - cd My\ Projects/BaseGame/buildFiles/travis/ - - pwd - - cmake ../../../.. -DTORQUE_APP_NAME=BaseGame -DCMAKE_BUILD_TYPE=Debug - - ls + - mkdir My\ Projects/TestProject/ + - mkdir My\ Projects/TestProject/buildFiles/ + - mkdir My\ Projects/TestProject/buildFiles/travis/ + - cd My\ Projects/TestProject/buildFiles/travis/ + - cmake ../../../.. -DTORQUE_APP_NAME=TestProject -DCMAKE_BUILD_TYPE=Debug - make 2>/dev/null # Do the actual build, but ignore all the warnings - make # build again. This time all output is printed but the warnings that happened earlier do not happen again + - make install - cd ../../game/ - ls