From c88d8a6d64cc72e044b26ba8beecf1b1a1da46b0 Mon Sep 17 00:00:00 2001 From: Julien Lamy Date: Fri, 1 Jan 2016 18:14:18 +0100 Subject: [PATCH] Appveyor : do not compile dependencies --- appveyor.full.yml | 52 +++++++++++++++++++++++++++++++++++++++++++++++ appveyor.yml | 43 +++++++++++---------------------------- 2 files changed, 64 insertions(+), 31 deletions(-) create mode 100644 appveyor.full.yml diff --git a/appveyor.full.yml b/appveyor.full.yml new file mode 100644 index 00000000..092d607f --- /dev/null +++ b/appveyor.full.yml @@ -0,0 +1,52 @@ +version: "{build}" + +os: Visual Studio 2015 + +clone_folder: c:\projects\dcmtkpp + +environment: + BOOST_ROOT: C:/Libraries/boost_1_59_0 + BOOST_LIBRARYDIR: C:/Libraries/boost_1_59_0/lib64-msvc-14.0 + ICU_INCLUDE_DIR: C:/Libraries/icu/include + ICU_LIBRARY: C:/Libraries/icu/lib64/icuuc.lib + JsonCpp_INCLUDE_DIR: c:/Libraries/jsoncpp_0_10_5/include + JsonCpp_LIBRARY: c:/Libraries/jsoncpp_0_10_5/lib/jsoncpp.lib + DCMTK_INCLUDE_DIR: C:/Libraries/dcmtk-3.6.1_20150924/include + DCMTK_LIBRARY: C:/Libraries/dcmtk-3.6.1_20150924/lib/dcmdata.lib + +#init: +#- ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) + +install: + # ICU4C +- ps: Start-FileDownload http://download.icu-project.org/files/icu4c/56.1/icu4c-56_1-Win64-msvc10.zip +- 7z x -oC:\Libraries icu4c-56_1-Win64-msvc10.zip + # JsonCpp +- ps: Start-FileDownload https://github.com/open-source-parsers/jsoncpp/archive/0.10.5.zip +- 7z x -oC:\projects 0.10.5.zip +- cd C:\projects\jsoncpp-0.10.5 +- mkdir build +- cd build +- cmake -D CMAKE_INSTALL_PREFIX=c:\Libraries\jsoncpp_0_10_5 .. +- cmake --build . --config release --target install + # DCMTK +- ps: Start-FileDownload http://dicom.offis.de/download/dcmtk/snapshot/dcmtk-3.6.1_20150924.tar.gz +- 7z x -so dcmtk-3.6.1_20150924.tar.gz | 7z x -si -oC:\projects -ttar +- cd C:\projects\dcmtk-3.6.1_20150924 +- mkdir build +- cd build +- cmake -D CMAKE_INSTALL_PREFIX=c:\Libraries\dcmtk-3.6.1_20150924 .. +- cmake --build . --config release --target install + +before_build: + - cd c:\projects\dcmtkpp + - md build + - cd build + - set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH% + - cmake -DBOOST_ROOT="%BOOST_ROOT%" -DBOOST_LIBRARYDIR="%BOOST_LIBRARYDIR%" -DICU_INCLUDE_DIR="%ICU_INCLUDE_DIR%" -DICU_LIBRARY="%ICU_LIBRARY%" -DJsonCpp_INCLUDE_DIR="%JsonCpp_INCLUDE_DIR%" -DJsonCpp_LIBRARY="%JsonCpp_LIBRARY%" -DDCMTK_INCLUDE_DIR="%DCMTK_INCLUDE_DIR%" -DDCMTK_LIBRARY="%DCMTK_LIBRARY%" .. + +build: + project: C:\projects\dcmtkpp\build\dcmtkpp.sln + +#on_finish: +#- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) diff --git a/appveyor.yml b/appveyor.yml index d49563d7..9e11a0f7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,48 +7,29 @@ clone_folder: c:\projects\dcmtkpp environment: BOOST_ROOT: C:/Libraries/boost_1_59_0 BOOST_LIBRARYDIR: C:/Libraries/boost_1_59_0/lib64-msvc-14.0 - ICU_INCLUDE_DIR: C:/projects/icu/include - ICU_LIBRARY: C:/projects/icu/lib64/icuuc.lib - JsonCpp_INCLUDE_DIR: C:/projects/jsoncpp-0.10.5/include - JsonCpp_LIBRARY: C:/projects/jsoncpp-0.10.5/build/src/lib_json/Release/jsoncpp.lib - DCMTK_INCLUDE_DIR: C:\projects\dcmtk-3.6.1_20150924\install_dir\include - DCMTK_LIBRARY: C:\projects\dcmtk-3.6.1_20150924\install_dir\lib\dcmdata.lib - -#init: -#- ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) + ICU_INCLUDE_DIR: C:/Libraries/icu/include + ICU_LIBRARY: C:/Libraries/icu/lib64/icuuc.lib + JsonCpp_INCLUDE_DIR: c:/Libraries/jsoncpp_0_10_5/include + JsonCpp_LIBRARY: c:/Libraries/jsoncpp_0_10_5/lib/jsoncpp.lib + DCMTK_INCLUDE_DIR: C:/Libraries/dcmtk-3.6.1_20150924/include + DCMTK_LIBRARY: C:/Libraries/dcmtk-3.6.1_20150924/lib/dcmdata.lib install: -- '"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64' # ICU4C - ps: Start-FileDownload http://download.icu-project.org/files/icu4c/56.1/icu4c-56_1-Win64-msvc10.zip -- 7z x -oC:\projects icu4c-56_1-Win64-msvc10.zip +- 7z x -oC:\Libraries icu4c-56_1-Win64-msvc10.zip # JsonCpp -- ps: Start-FileDownload https://github.com/open-source-parsers/jsoncpp/archive/0.10.5.zip -- 7z x -oC:\projects 0.10.5.zip -- cd C:\projects\jsoncpp-0.10.5 -- mkdir build -- cd build -- cmake -G "Visual Studio 14 2015 Win64" .. -- cmake --build . --config release +- ps: Start-FileDownload https://github.com/lamyj/jsoncpp/releases/download/0.10.5/jsoncpp_0_10_5_Win64_msvc14.zip +- 7z x -oC:\Libraries jsoncpp_0_10_5_Win64_msvc14.zip # DCMTK -- ps: Start-FileDownload http://dicom.offis.de/download/dcmtk/snapshot/dcmtk-3.6.1_20150924.tar.gz -- 7z x -so dcmtk-3.6.1_20150924.tar.gz | 7z x -si -oC:\projects -ttar -- cd C:\projects\dcmtk-3.6.1_20150924 -- mkdir build -- cd build -- cmake -G "Visual Studio 14 2015 Win64" -D CMAKE_INSTALL_PREFIX=c:\projects\dcmtk-3.6.1_20150924\install_dir .. -- cmake --build . --config release -- cmake --build . --config release --target install +- ps: Start-FileDownload https://github.com/lamyj/dcmtk/releases/download/DCMTK-3.6.1_20150924/dcmtk-3.6.1_20150924_Win64_msvc14.zip +- 7z x -oC:\Libraries dcmtk-3.6.1_20150924_Win64_msvc14.zip before_build: - cd c:\projects\dcmtkpp - md build - cd build - - set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH% - - cmake -G "Visual Studio 14 2015 Win64" -DBOOST_ROOT="%BOOST_ROOT%" -DBOOST_LIBRARYDIR="%BOOST_LIBRARYDIR%" -DICU_INCLUDE_DIR="%ICU_INCLUDE_DIR%" -DICU_LIBRARY="%ICU_LIBRARY%" -DJsonCpp_INCLUDE_DIR="%JsonCpp_INCLUDE_DIR%" -DJsonCpp_LIBRARY="%JsonCpp_LIBRARY%" -DDCMTK_INCLUDE_DIR="%DCMTK_INCLUDE_DIR%" -DDCMTK_LIBRARY="%DCMTK_LIBRARY%" .. + - cmake -DBOOST_ROOT="%BOOST_ROOT%" -DBOOST_LIBRARYDIR="%BOOST_LIBRARYDIR%" -DICU_INCLUDE_DIR="%ICU_INCLUDE_DIR%" -DICU_LIBRARY="%ICU_LIBRARY%" -DJsonCpp_INCLUDE_DIR="%JsonCpp_INCLUDE_DIR%" -DJsonCpp_LIBRARY="%JsonCpp_LIBRARY%" -DDCMTK_INCLUDE_DIR="%DCMTK_INCLUDE_DIR%" -DDCMTK_LIBRARY="%DCMTK_LIBRARY%" .. build: project: C:\projects\dcmtkpp\build\dcmtkpp.sln - -#on_finish: -#- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))