From de589441405d5daa68e36df7b885a11e8004176d Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Wed, 1 Apr 2015 23:51:18 -0700 Subject: [PATCH 1/6] Change checkout-deps.sh to do a user install instead of sudo. --- tools/checkout-deps.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/checkout-deps.sh b/tools/checkout-deps.sh index 40461e0c..d89af54f 100755 --- a/tools/checkout-deps.sh +++ b/tools/checkout-deps.sh @@ -118,7 +118,7 @@ if [ $? -eq 1 ]; then python setup.py install else python setup.py build - echo "About to install AMBuild - press Ctrl+C to abort, otherwise enter your password for sudo." - sudo python setup.py install + echo "Installing AMBuild at the user level. Location can be: ~/.local/bin" + python setup.py install --user fi fi From a42cfed39cdc40c28254aedb2dbbcf603206391a Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Thu, 2 Apr 2015 10:38:34 -0700 Subject: [PATCH 2/6] Enable travis-ci container environment. --- .travis.yml | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index e0576367..40c9191d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,21 +1,24 @@ +addons: + apt: + packages: + - clang-3.5 + - lib32stdc++6 + - lib32z1-dev + - libc6-dev-i386 + sources: + - llvm-toolchain-precise-3.5 + - ubuntu-toolchain-r-test + cache: + directories: + - ../mysql-5.0 language: cpp +sudo: false compiler: - clang before_script: - - sudo apt-get update -qq - - sudo apt-get install -y python-software-properties - - sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/ppa - - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y - - sudo apt-get update -qq - - sudo apt-get install -qq g++-4.8 - - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90 - - echo "deb http://llvm.org/apt/precise/ llvm-toolchain-precise-3.5 main" | sudo tee --append /etc/apt/sources.list - - echo "deb-src http://llvm.org/apt/precise/ llvm-toolchain-precise-3.5 main" | sudo tee --append /etc/apt/sources.list - - wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add - - - sudo apt-get update -qq - - sudo apt-get install -y g++-multilib libc6-dev-i386 lib32stdc++6 lib32z1-dev clang-3.5 - CHECKOUT_DIR=$PWD && cd .. && $CHECKOUT_DIR/tools/checkout-deps.sh && cd $CHECKOUT_DIR script: - mkdir build && cd build + - PATH="~/.local/bin:$PATH" - CC=clang-3.5 CXX=clang-3.5 python ../configure.py --enable-optimize --sdks=episode1,tf2,l4d2,csgo,dota - ambuild \ No newline at end of file From a6ab14f28ef271fabe6ded801d8b8b04ae353af6 Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Thu, 2 Apr 2015 10:46:11 -0700 Subject: [PATCH 3/6] Add errno. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 40c9191d..356117e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ addons: - lib32stdc++6 - lib32z1-dev - libc6-dev-i386 + - linux-libc-dev sources: - llvm-toolchain-precise-3.5 - ubuntu-toolchain-r-test From 47eabfb7fbe165154fe3e2159cdf0d1c18bfe292 Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Thu, 2 Apr 2015 10:46:49 -0700 Subject: [PATCH 4/6] Spaces --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 356117e2..13c98451 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ addons: - lib32stdc++6 - lib32z1-dev - libc6-dev-i386 - - linux-libc-dev + - linux-libc-dev sources: - llvm-toolchain-precise-3.5 - ubuntu-toolchain-r-test From 41297b96d09c4f12eb407d7c8b8c82a4e377736e Mon Sep 17 00:00:00 2001 From: Nicholas Hastings Date: Mon, 13 Jul 2015 21:43:27 -0400 Subject: [PATCH 5/6] Add gcc-multilib to build reqs. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 13c98451..de446cbb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ addons: - lib32z1-dev - libc6-dev-i386 - linux-libc-dev + - gcc-multilib sources: - llvm-toolchain-precise-3.5 - ubuntu-toolchain-r-test From c4e7b8a7959dfdc4023755b5e70c2425bbc0110f Mon Sep 17 00:00:00 2001 From: Nicholas Hastings Date: Tue, 14 Jul 2015 19:44:52 -0400 Subject: [PATCH 6/6] More tweaks. --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index de446cbb..b4e527a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,8 @@ addons: - lib32z1-dev - libc6-dev-i386 - linux-libc-dev - - gcc-multilib + - g++-multilib + - g++4.8 sources: - llvm-toolchain-precise-3.5 - ubuntu-toolchain-r-test