From 87a8e71c20c2b1f3517c49aeecb253c6683c6726 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Fri, 2 Oct 2015 17:34:37 +0800 Subject: [PATCH 1/3] TravisCI: support osx build --- .travis.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1f26b6b..50e9a6f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,15 @@ language: cpp -compiler: + +os: + - linux + - osx + +compiler: - g++ - clang -os: linux -before_script: cmake . -script: make && ./xmltest +before_script: cmake . + +script: + - make -j3 + - ./xmltest From a58de11b428c911b0d0608f95e06539603ba270f Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Fri, 2 Oct 2015 18:08:48 +0800 Subject: [PATCH 2/3] Add appveyor.yml --- appveyor.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 0000000..aac8867 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,7 @@ +before_build: + - cmake . + +build_script: + - msbuild tinyxml2.sln /m /p:Configuration=Release /t:ALL_BUILD + - copy Release\xmltest.exe .\ && copy Release\tinyxml2.dll .\ + - xmltest.exe From f2c6b118dae097687571e70b3574dbc2e37b10fe Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Fri, 2 Oct 2015 22:09:12 +0800 Subject: [PATCH 3/3] readme.md: add CI build status badges --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 485e00f..38c29dc 100644 --- a/readme.md +++ b/readme.md @@ -1,4 +1,4 @@ -TinyXML-2 +TinyXML-2 [![TravisCI Status](https://travis-ci.org/leethomason/tinyxml2.svg?branch=master)](https://travis-ci.org/leethomason/tinyxml2) [![AppVeyor Status](https://ci.appveyor.com/api/projects/status/github/leethomason/tinyxml2?branch=master&svg=true)](https://ci.appveyor.com/project/leethomason/tinyxml2) ========= ![TinyXML-2 Logo](http://www.grinninglizard.com/tinyxml2/TinyXML2_small.png)