From a83e749e0977ae057e9ae4e0e82cd2d3cf5b9bba Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Thu, 29 May 2014 14:17:58 -0700
Subject: [travis] try building with thread and address sanitizer in Debug

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 5d46212f11..99dad26fd3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,6 +28,7 @@ install:
 
 before_script:
 - if [[ ${CXX} == "g++" ]]; then export CXX="g++-4.8" ; fi
+- if [[ $BUILDTYPE} == "Debug" ]]; then export CXXFLAGS="-fsanitize=address -fsanitize=thread";export LDFLAGS="-fsanitize=address -fsanitize=thread"
 
 script:
 - make llmr BUILDTYPE=${BUILDTYPE}
-- 
cgit v1.2.1


From a501f8788f9be0ec97f4c54170e2e3af792dd1f6 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Thu, 29 May 2014 14:51:05 -0700
Subject: [travis] fix syntax

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 99dad26fd3..789083764f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,7 @@ install:
 
 before_script:
 - if [[ ${CXX} == "g++" ]]; then export CXX="g++-4.8" ; fi
-- if [[ $BUILDTYPE} == "Debug" ]]; then export CXXFLAGS="-fsanitize=address -fsanitize=thread";export LDFLAGS="-fsanitize=address -fsanitize=thread"
+- if [[ $BUILDTYPE} == "Debug" ]]; then export CXXFLAGS="-fsanitize=address -fsanitize=thread";export LDFLAGS="-fsanitize=address -fsanitize=thread" ; fi
 
 script:
 - make llmr BUILDTYPE=${BUILDTYPE}
-- 
cgit v1.2.1


From b79f6f736f019969e496c8c22fe9b3b505e07f5a Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Thu, 29 May 2014 16:04:10 -0700
Subject: [travis] we can only sanitize either addresses or threads, choose one

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 789083764f..00b80fe5e7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,7 @@ install:
 
 before_script:
 - if [[ ${CXX} == "g++" ]]; then export CXX="g++-4.8" ; fi
-- if [[ $BUILDTYPE} == "Debug" ]]; then export CXXFLAGS="-fsanitize=address -fsanitize=thread";export LDFLAGS="-fsanitize=address -fsanitize=thread" ; fi
+- if [[ ${BUILDTYPE} == "Debug" ]]; then export CXXFLAGS="-fsanitize=address";export LDFLAGS="-fsanitize=address" ; fi
 
 script:
 - make llmr BUILDTYPE=${BUILDTYPE}
-- 
cgit v1.2.1


From 7c589b9da49631667c4847ffe29fca37970a327a Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Thu, 29 May 2014 16:54:36 -0700
Subject: sanitizer needs CFLAGS set for libtess

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 00b80fe5e7..a464bf2030 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,8 @@ install:
 
 before_script:
 - if [[ ${CXX} == "g++" ]]; then export CXX="g++-4.8" ; fi
-- if [[ ${BUILDTYPE} == "Debug" ]]; then export CXXFLAGS="-fsanitize=address";export LDFLAGS="-fsanitize=address" ; fi
+- if [[ ${BUILDTYPE} == "Debug" ]] && [[ ${CXX} == "g++" ]]; then export CXXFLAGS="-fsanitize=address";export CFLAGS="${CXXFLAGS}";export LDFLAGS="-fsanitize=address" ; fi
+- if [[ ${BUILDTYPE} == "Debug" ]] && [[ ${CXX} == "clang++" ]]; then export CXXFLAGS="-fsanitize=thread -fPIC";export CFLAGS="${CXXFLAGS}";export LDFLAGS="-fsanitize=thread -pie" ; fi
 
 script:
 - make llmr BUILDTYPE=${BUILDTYPE}
-- 
cgit v1.2.1


From 0b9c45721f4feedee49475454eb2a3f0c193d069 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Thu, 29 May 2014 17:11:11 -0700
Subject: [travis] turn off a few clang++ warnings

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index a464bf2030..72d834a32a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,7 +30,7 @@ before_script:
 - if [[ ${CXX} == "g++" ]]; then export CXX="g++-4.8" ; fi
 - if [[ ${BUILDTYPE} == "Debug" ]] && [[ ${CXX} == "g++" ]]; then export CXXFLAGS="-fsanitize=address";export CFLAGS="${CXXFLAGS}";export LDFLAGS="-fsanitize=address" ; fi
 - if [[ ${BUILDTYPE} == "Debug" ]] && [[ ${CXX} == "clang++" ]]; then export CXXFLAGS="-fsanitize=thread -fPIC";export CFLAGS="${CXXFLAGS}";export LDFLAGS="-fsanitize=thread -pie" ; fi
-
+- if [[ ${CXX} == "clang++" ]]; then export CXXFLAGS="-Wno-unused-local-typedefs -Wno-unknown-pragmas $CXXFLAGS"; fi
 script:
 - make llmr BUILDTYPE=${BUILDTYPE}
 - make clean
-- 
cgit v1.2.1


From 78ad02597381166a23769a3d5814cd9d2eef7dad Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Fri, 30 May 2014 13:28:37 -0700
Subject: [travis] -Wno-unknown-pragmas

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 72d834a32a..1c72c857d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,7 +30,7 @@ before_script:
 - if [[ ${CXX} == "g++" ]]; then export CXX="g++-4.8" ; fi
 - if [[ ${BUILDTYPE} == "Debug" ]] && [[ ${CXX} == "g++" ]]; then export CXXFLAGS="-fsanitize=address";export CFLAGS="${CXXFLAGS}";export LDFLAGS="-fsanitize=address" ; fi
 - if [[ ${BUILDTYPE} == "Debug" ]] && [[ ${CXX} == "clang++" ]]; then export CXXFLAGS="-fsanitize=thread -fPIC";export CFLAGS="${CXXFLAGS}";export LDFLAGS="-fsanitize=thread -pie" ; fi
-- if [[ ${CXX} == "clang++" ]]; then export CXXFLAGS="-Wno-unused-local-typedefs -Wno-unknown-pragmas $CXXFLAGS"; fi
+- if [[ ${CXX} == "clang++" ]]; then export CXXFLAGS="-Wno-unknown-warning-option -Wno-unused-local-typedefs -Wno-unknown-pragmas $CXXFLAGS"; fi
 script:
 - make llmr BUILDTYPE=${BUILDTYPE}
 - make clean
-- 
cgit v1.2.1


From b24dc07fdddb13de9b984ce89a9d433fa431697a Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Fri, 30 May 2014 13:44:25 -0700
Subject: [travis] build with libc++ when building with clang++ - refs #287

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 1c72c857d0..6a2b65fdd8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,7 +30,7 @@ before_script:
 - if [[ ${CXX} == "g++" ]]; then export CXX="g++-4.8" ; fi
 - if [[ ${BUILDTYPE} == "Debug" ]] && [[ ${CXX} == "g++" ]]; then export CXXFLAGS="-fsanitize=address";export CFLAGS="${CXXFLAGS}";export LDFLAGS="-fsanitize=address" ; fi
 - if [[ ${BUILDTYPE} == "Debug" ]] && [[ ${CXX} == "clang++" ]]; then export CXXFLAGS="-fsanitize=thread -fPIC";export CFLAGS="${CXXFLAGS}";export LDFLAGS="-fsanitize=thread -pie" ; fi
-- if [[ ${CXX} == "clang++" ]]; then export CXXFLAGS="-Wno-unknown-warning-option -Wno-unused-local-typedefs -Wno-unknown-pragmas $CXXFLAGS"; fi
+- if [[ ${CXX} == "clang++" ]]; then sudo apt-get install -y libc++1 libc++-dev; export LDFLAGS="-stdlib=libc++ ${LDFLAGS}"; export CXXFLAGS="-stdlib=libc++ -Wno-unknown-warning-option -Wno-unused-local-typedefs -Wno-unknown-pragmas ${CXXFLAGS}"; fi
 script:
 - make llmr BUILDTYPE=${BUILDTYPE}
 - make clean
-- 
cgit v1.2.1


From 3dd5d4cd24364aadfcbbc0518343f99e7061faef Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Fri, 30 May 2014 13:56:48 -0700
Subject: add 'make setup' target a simplier way to get started than running
 ./setup-libraries.sh

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 6a2b65fdd8..cb8ada0d95 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ before_install:
 - sudo apt-get -y install libxi-dev libglu1-mesa-dev x11proto-randr-dev x11proto-xext-dev libxrandr-dev x11proto-xf86vidmode-dev libxxf86vm-dev libxcursor-dev
 
 install:
-- ./setup-libraries.sh
+- make setup
 - rm -rf mapnik-packaging/out/packages
 
 
-- 
cgit v1.2.1


From 62430f7b1b283864abac35b94e035ac491c13c60 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Fri, 30 May 2014 14:15:27 -0700
Subject: [travis] scrap attempt at using libc++ which is only packaged for >
 trusty - refs #287

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index cb8ada0d95..d9cd3a212d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,7 +30,7 @@ before_script:
 - if [[ ${CXX} == "g++" ]]; then export CXX="g++-4.8" ; fi
 - if [[ ${BUILDTYPE} == "Debug" ]] && [[ ${CXX} == "g++" ]]; then export CXXFLAGS="-fsanitize=address";export CFLAGS="${CXXFLAGS}";export LDFLAGS="-fsanitize=address" ; fi
 - if [[ ${BUILDTYPE} == "Debug" ]] && [[ ${CXX} == "clang++" ]]; then export CXXFLAGS="-fsanitize=thread -fPIC";export CFLAGS="${CXXFLAGS}";export LDFLAGS="-fsanitize=thread -pie" ; fi
-- if [[ ${CXX} == "clang++" ]]; then sudo apt-get install -y libc++1 libc++-dev; export LDFLAGS="-stdlib=libc++ ${LDFLAGS}"; export CXXFLAGS="-stdlib=libc++ -Wno-unknown-warning-option -Wno-unused-local-typedefs -Wno-unknown-pragmas ${CXXFLAGS}"; fi
+- if [[ ${CXX} == "clang++" ]]; then export LDFLAGS="${LDFLAGS}"; export CXXFLAGS="-Wno-unknown-warning-option -Wno-unused-local-typedefs -Wno-unknown-pragmas ${CXXFLAGS}"; fi
 script:
 - make llmr BUILDTYPE=${BUILDTYPE}
 - make clean
-- 
cgit v1.2.1


From 2646d77008e16c474308f13cc3406d78c9e49522 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= <mail@kkaefer.com>
Date: Sun, 1 Jun 2014 21:36:51 +0200
Subject: update yml syntax

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index d9cd3a212d..aafdf894cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,7 +41,7 @@ script:
 #- make run-headless-test BUILDTYPE=${BUILDTYPE}
 
 notifications:
-- hipchat: WB52YkcbCGMbNcStsGeaoRO7cyBSK4wX2ZHo2Y4b@GL
+  hipchat: WB52YkcbCGMbNcStsGeaoRO7cyBSK4wX2ZHo2Y4b@GL
 
 git:
   submodules: false
-- 
cgit v1.2.1


From 76097367670ed569572168b83eea8594c2600b6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= <mail@kkaefer.com>
Date: Sun, 1 Jun 2014 21:37:03 +0200
Subject: don't trash package dir

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index aafdf894cd..2d396c8e1b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,8 +23,6 @@ before_install:
 
 install:
 - make setup
-- rm -rf mapnik-packaging/out/packages
-
 
 before_script:
 - if [[ ${CXX} == "g++" ]]; then export CXX="g++-4.8" ; fi
-- 
cgit v1.2.1


From 5d588c5997b5a9e8fa76111ac395b4f613815287 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= <mail@kkaefer.com>
Date: Sun, 1 Jun 2014 22:35:44 +0200
Subject: Revert "don't trash package dir"

This reverts commit 76097367670ed569572168b83eea8594c2600b6d.
---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 2d396c8e1b..aafdf894cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,6 +23,8 @@ before_install:
 
 install:
 - make setup
+- rm -rf mapnik-packaging/out/packages
+
 
 before_script:
 - if [[ ${CXX} == "g++" ]]; then export CXX="g++-4.8" ; fi
-- 
cgit v1.2.1


From 93e8386af479001f445df642c4e1372720e1f5a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= <mail@kkaefer.com>
Date: Sun, 1 Jun 2014 23:23:27 +0200
Subject: update hipchat key

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index aafdf894cd..70540e02ba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,7 +41,9 @@ script:
 #- make run-headless-test BUILDTYPE=${BUILDTYPE}
 
 notifications:
-  hipchat: WB52YkcbCGMbNcStsGeaoRO7cyBSK4wX2ZHo2Y4b@GL
+  hipchat:
+    rooms:
+      secure: H/Z51pvNrTgdePfHpF66obRy2JF+yBCmp70MWjGnW8RZDyUQ+U5HgcVe/HBeCYFRg81hjSr3TxV70WrTUHP1NNPQ4+kcuW194bjZqq8TACwXOasFGNQ5L32izthfGto6rKtgNz6TzR5t44BpJnJhJMmqh46ybZvNTN2XBIaYkDQ=
 
 git:
   submodules: false
-- 
cgit v1.2.1


From 7ab3ef875fbad9b7bee8a25a5a253b1246cf4db7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= <mail@kkaefer.com>
Date: Mon, 2 Jun 2014 11:49:36 +0200
Subject: update hipchat notifications

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 70540e02ba..130965cba5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,7 +43,9 @@ script:
 notifications:
   hipchat:
     rooms:
-      secure: H/Z51pvNrTgdePfHpF66obRy2JF+yBCmp70MWjGnW8RZDyUQ+U5HgcVe/HBeCYFRg81hjSr3TxV70WrTUHP1NNPQ4+kcuW194bjZqq8TACwXOasFGNQ5L32izthfGto6rKtgNz6TzR5t44BpJnJhJMmqh46ybZvNTN2XBIaYkDQ=
+      secure: "ZKtTiFjXgXfrAO8eMU1nJBe46OBLgk0H7VAVmk84QwAb6DuoqT+mGMs+1yrWtjLwZI8vayZyaucupp1siM7lBWCOADx5GXA6GCCLOuE7fYLSNJFrXHa1u70IUBLOU8b5bDWRn8tcd5CM754R609l4ckTzBH3y4CIh9YNFrB0b+g="
+    template:
+      - '%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message}'
 
 git:
   submodules: false
-- 
cgit v1.2.1


From 30c95180076d82affc2a63f094002a162aa063e8 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Mon, 2 Jun 2014 15:54:34 -0700
Subject: [travis] avoid clean for now to speed up run times - refs #298 [skip
 ci]

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 130965cba5..39a02d05be 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,9 +33,7 @@ before_script:
 - if [[ ${CXX} == "clang++" ]]; then export LDFLAGS="${LDFLAGS}"; export CXXFLAGS="-Wno-unknown-warning-option -Wno-unused-local-typedefs -Wno-unknown-pragmas ${CXXFLAGS}"; fi
 script:
 - make llmr BUILDTYPE=${BUILDTYPE}
-- make clean
 - make linux BUILDTYPE=${BUILDTYPE}
-- make clean
 - make run-tests BUILDTYPE=${BUILDTYPE}
 # TODO - port to linux
 #- make run-headless-test BUILDTYPE=${BUILDTYPE}
-- 
cgit v1.2.1


From c357a17f847e95cd7a2c52ac1b64e8de6bb962d6 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Mon, 2 Jun 2014 15:59:16 -0700
Subject: [travis] don't double build libllmr.a - refs #298

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 39a02d05be..b407cec837 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,14 +25,13 @@ install:
 - make setup
 - rm -rf mapnik-packaging/out/packages
 
-
 before_script:
 - if [[ ${CXX} == "g++" ]]; then export CXX="g++-4.8" ; fi
 - if [[ ${BUILDTYPE} == "Debug" ]] && [[ ${CXX} == "g++" ]]; then export CXXFLAGS="-fsanitize=address";export CFLAGS="${CXXFLAGS}";export LDFLAGS="-fsanitize=address" ; fi
 - if [[ ${BUILDTYPE} == "Debug" ]] && [[ ${CXX} == "clang++" ]]; then export CXXFLAGS="-fsanitize=thread -fPIC";export CFLAGS="${CXXFLAGS}";export LDFLAGS="-fsanitize=thread -pie" ; fi
 - if [[ ${CXX} == "clang++" ]]; then export LDFLAGS="${LDFLAGS}"; export CXXFLAGS="-Wno-unknown-warning-option -Wno-unused-local-typedefs -Wno-unknown-pragmas ${CXXFLAGS}"; fi
+
 script:
-- make llmr BUILDTYPE=${BUILDTYPE}
 - make linux BUILDTYPE=${BUILDTYPE}
 - make run-tests BUILDTYPE=${BUILDTYPE}
 # TODO - port to linux
-- 
cgit v1.2.1