Mercurial > hg > orthanc
changeset 1263:961482485deb
mingw32
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Thu, 08 Jan 2015 16:03:02 +0100 |
| parents | 602d419598cb |
| children | 15b1783fc60e |
| files | .travis.yml Resources/TravisBuild.sh Resources/TravisUbuntu-12.04.sh |
| diffstat | 3 files changed, 26 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/.travis.yml Thu Jan 08 15:48:02 2015 +0100 +++ b/.travis.yml Thu Jan 08 16:03:02 2015 +0100 @@ -5,7 +5,7 @@ - clang os: - - osx +# - osx - linux osx_image: xcode61 @@ -20,7 +20,7 @@ - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get update -qq && sudo apt-get install -qq build-essential unzip cmake mercurial uuid-dev libcurl4-openssl-dev liblua5.1-0-dev libgtest-dev libpng-dev libsqlite3-dev libssl-dev zlib1g-dev libdcmtk2-dev libwrap0-dev - libcharls-dev; fi + libcharls-dev mingw32; fi before_script: - mkdir Build @@ -31,8 +31,15 @@ ..; fi - if [ $TRAVIS_OS_NAME == osx ]; then cmake -DSTATIC_BUILD=ON -DSTANDALONE_BUILD=ON -DALLOW_DOWNLOADS=ON ..; fi + - cd .. -script: make && ./UnitTests + - mkdir BuildMinGW32 + - cd BuildMinGW32 + - if [ $TRAVIS_OS_NAME == linux ]; then cmake -DSTATIC_BUILD=ON -DSTANDALONE_BUILD=ON + -DALLOW_DOWNLOADS=ON -DCMAKE_TOOLCHAIN_FILE=../Resources/MinGWToolchain.cmake ..; fi + - cd .. + +script: ./Resources/TravisBuild.sh deploy: provider: releases @@ -41,6 +48,7 @@ file: - 'Build/Orthanc' - 'Build/UnitTests' + skip_cleanup: true on: - repo: jodogne/OrthancMirror - branch: '' + tags: true + all_branches: true
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Resources/TravisBuild.sh Thu Jan 08 16:03:02 2015 +0100 @@ -0,0 +1,13 @@ +#!/bin/bash + +set -e + +if [ "$TRAVIS_OS_NAME" == "linux" ]; then + cd BuildMinGW32 + make + cd .. +fi + +cd Build +make +./UnitTests
--- a/Resources/TravisUbuntu-12.04.sh Thu Jan 08 15:48:02 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -#!/bin/sh - -set -e - -mkdir Build -cd Build - -cmake \ - "-DDCMTK_LIBRARIES=CharLS;dcmjpls;wrap;oflog" \ - -DALLOW_DOWNLOADS=ON \ - -DUSE_SYSTEM_BOOST=OFF \ - -DUSE_SYSTEM_MONGOOSE=OFF \ - -DUSE_SYSTEM_JSONCPP=OFF \ - -DUSE_SYSTEM_GOOGLE_LOG=OFF \ - -DUSE_SYSTEM_PUGIXML=OFF \ - -DUSE_GTEST_DEBIAN_SOURCE_PACKAGE=ON \ - .. - -make -./UnitTests