From 1bd6310c5bc928835879108123968ff2ebbc17e6 Mon Sep 17 00:00:00 2001 From: boddicheg Date: Wed, 2 Sep 2015 14:40:39 +0300 Subject: [PATCH 01/12] Travis --- .travis.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..db78b7566 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,12 @@ +language: cpp + +os: +- linux +- osx + +sudo: true + +install: +- cmake . +- make +- sudo make install From 9f3ff3fab79977a8d55bbd9948dfb83f050948f3 Mon Sep 17 00:00:00 2001 From: boddicheg Date: Wed, 2 Sep 2015 15:06:02 +0300 Subject: [PATCH 02/12] Deps for travis ci --- .travis.yml | 5 +++-- install-deps.sh | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 install-deps.sh diff --git a/.travis.yml b/.travis.yml index db78b7566..b03a9f65b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,11 +2,12 @@ language: cpp os: - linux -- osx sudo: true +before_install: +- sh install-deps.sh + install: - cmake . - make -- sudo make install diff --git a/install-deps.sh b/install-deps.sh new file mode 100644 index 000000000..9c32572a2 --- /dev/null +++ b/install-deps.sh @@ -0,0 +1,6 @@ +wget http://www.cmake.org/files/v2.8/cmake-2.8.12.tar.gz +tar xzf http://www.cmake.org/files/v2.8/cmake-2.8.12.tar.gz +cd cmake-2.8.12 +cmake . +make +make install From 9e41afa22fb7f60d9f81983acc7e7ec10d6955a3 Mon Sep 17 00:00:00 2001 From: boddicheg Date: Wed, 2 Sep 2015 15:08:29 +0300 Subject: [PATCH 03/12] Fix install-deps --- install-deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install-deps.sh b/install-deps.sh index 9c32572a2..1819ea7a9 100644 --- a/install-deps.sh +++ b/install-deps.sh @@ -1,5 +1,5 @@ wget http://www.cmake.org/files/v2.8/cmake-2.8.12.tar.gz -tar xzf http://www.cmake.org/files/v2.8/cmake-2.8.12.tar.gz +tar xzf cmake-2.8.12.tar.gz cd cmake-2.8.12 cmake . make From ba5433d5a299b10851452c3e521093ed079abe86 Mon Sep 17 00:00:00 2001 From: boddicheg Date: Wed, 2 Sep 2015 15:19:48 +0300 Subject: [PATCH 04/12] Add sudo --- install-deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install-deps.sh b/install-deps.sh index 1819ea7a9..e09b635ff 100644 --- a/install-deps.sh +++ b/install-deps.sh @@ -3,4 +3,4 @@ tar xzf cmake-2.8.12.tar.gz cd cmake-2.8.12 cmake . make -make install +sudo make install From 7e9bc6c424ad72e62e4faabceb17b434eb1f8235 Mon Sep 17 00:00:00 2001 From: boddicheg Date: Wed, 2 Sep 2015 15:38:41 +0300 Subject: [PATCH 05/12] Change build to script --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b03a9f65b..a54929fc0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,9 +5,9 @@ os: sudo: true -before_install: +before_script: - sh install-deps.sh -install: +script: - cmake . - make From 9c949f0ce045704ee7442c68330e16465dbe2565 Mon Sep 17 00:00:00 2001 From: boddicheg Date: Wed, 2 Sep 2015 15:49:10 +0300 Subject: [PATCH 06/12] OSX --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index a54929fc0..5f155882e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ language: cpp os: - linux +- osx sudo: true From 0fe6361130d269f1639e4f18558baa66e2073c68 Mon Sep 17 00:00:00 2001 From: boddicheg Date: Wed, 2 Sep 2015 16:10:24 +0300 Subject: [PATCH 07/12] Badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 3176fba5f..8c538ffb6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # GLFW +[![Build Status](https://travis-ci.org/boddicheg/glfw.svg?branch=multi-platform)](https://travis-ci.org/boddicheg/glfw) ## Introduction From 64aeb6e04a1c42522dea25ba17a152295ae4c9dc Mon Sep 17 00:00:00 2001 From: boddicheg Date: Wed, 2 Sep 2015 16:31:34 +0300 Subject: [PATCH 08/12] appveyor --- appveyor.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 000000000..04da5e6ea --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,4 @@ +build_script: +- mkdir build +- cd build +- cmake From 98a708cb0d7092a754b6f43d4a34c7b1825a2aa1 Mon Sep 17 00:00:00 2001 From: boddicheg Date: Wed, 2 Sep 2015 16:40:22 +0300 Subject: [PATCH 09/12] Fix appveyor yaml file --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 04da5e6ea..e064c8384 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ build_script: - mkdir build - cd build -- cmake +- cmake . From e96411563f7da17d75cca9ef40a21c8160af2915 Mon Sep 17 00:00:00 2001 From: boddicheg Date: Wed, 2 Sep 2015 16:48:32 +0300 Subject: [PATCH 10/12] Correct path with CMakeLists.txt --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index e064c8384..4ef9737eb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ build_script: - mkdir build - cd build -- cmake . +- cmake .. From cb6110edbb94ca85547a6b0e472bd998f162304f Mon Sep 17 00:00:00 2001 From: boddicheg Date: Wed, 2 Sep 2015 16:59:02 +0300 Subject: [PATCH 11/12] Build glfw for windows --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 4ef9737eb..28d4fdcdf 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,3 +2,4 @@ build_script: - mkdir build - cd build - cmake .. +- cmake --build . From 4e3ae3c8ffce0e2307154c391063f27d09cab0db Mon Sep 17 00:00:00 2001 From: Bogdan Date: Wed, 2 Sep 2015 17:16:12 +0300 Subject: [PATCH 12/12] Add badge with appveyor build status --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8c538ffb6..2dedbe212 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # GLFW [![Build Status](https://travis-ci.org/boddicheg/glfw.svg?branch=multi-platform)](https://travis-ci.org/boddicheg/glfw) - +[![Build Status](https://ci.appveyor.com/api/projects/status/github/boddicheg/glfw?branch=multi-platform&svg=true)](https://ci.appveyor.com/project/boddicheg/glfw) ## Introduction GLFW is a free, Open Source, multi-platform library for OpenGL and OpenGL ES