This repository was archived by the owner on Jul 8, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 33
Tango 9 lts - Windows fixes #413
Merged
bourtemb
merged 226 commits into
tango-controls:tango-9-lts
from
NexeyaSGara:tango-9-lts
Dec 7, 2017
Merged
Changes from all commits
Commits
Show all changes
226 commits
Select commit
Hold shift + click to select a range
0c587ce
Create appveyor.yml
NexeyaSGara f0996fc
Update for windows
NexeyaSGara 4245cfa
Create cmake_win.cmake
NexeyaSGara a0c591c
Create cmake_win_defs.cmake
NexeyaSGara 13ef4dc
Create cpack_win.cmake
NexeyaSGara 4502d47
Update appveyor.yml
NexeyaSGara 2a39adf
Update CMakeLists.txt
NexeyaSGara f6ef11d
Update CMakeLists.txt
NexeyaSGara 9dcaeb9
Update CMakeLists.txt
NexeyaSGara 05cf950
Update CMakeLists.txt
NexeyaSGara ff73304
Update CMakeLists.txt
NexeyaSGara 4c1e477
Update CMakeLists.txt
NexeyaSGara ebd1ff8
Update CMakeLists.txt
NexeyaSGara 16d43d9
Add windows specific
NexeyaSGara 88030de
Update CMakeLists.txt
NexeyaSGara c252ee8
Add windows specific
NexeyaSGara e900aa2
Update CMakeLists.txt
NexeyaSGara 301f79d
Update CMakeLists.txt
NexeyaSGara af0fd5b
Update CMakeLists.txt
NexeyaSGara 7450de1
Create appveyor.yml
NexeyaSGara ccc108c
Update for windows
NexeyaSGara 5fab290
Create cmake_win.cmake
NexeyaSGara 72c396b
Create cmake_win_defs.cmake
NexeyaSGara e0698b0
Create cpack_win.cmake
NexeyaSGara 2922f5c
Update appveyor.yml
NexeyaSGara cc0e012
Update CMakeLists.txt
NexeyaSGara 6153f58
Update CMakeLists.txt
NexeyaSGara 053f963
Update CMakeLists.txt
NexeyaSGara b92557f
Update CMakeLists.txt
NexeyaSGara b0b08c1
Update CMakeLists.txt
NexeyaSGara 7229dc4
Update CMakeLists.txt
NexeyaSGara 7551b60
Update CMakeLists.txt
NexeyaSGara 96a87cc
Add windows specific
NexeyaSGara fd2c23d
Update CMakeLists.txt
NexeyaSGara 15fa10d
Add windows specific
NexeyaSGara 678e5d6
Update CMakeLists.txt
NexeyaSGara 0426629
Update CMakeLists.txt
NexeyaSGara e72fe17
Update CMakeLists.txt
NexeyaSGara eaad529
Fix conflict
828b18c
Create appveyor.yml
NexeyaSGara c4be612
Update for windows
NexeyaSGara ee5a4dd
Create cmake_win.cmake
NexeyaSGara a17f166
Create cmake_win_defs.cmake
NexeyaSGara 083ff43
Create cpack_win.cmake
NexeyaSGara 0e24cb0
Update appveyor.yml
NexeyaSGara 5627105
Update CMakeLists.txt
NexeyaSGara e7bdd39
Update CMakeLists.txt
NexeyaSGara af1589d
Update CMakeLists.txt
NexeyaSGara 3ced50d
Update CMakeLists.txt
NexeyaSGara f0181f6
Update CMakeLists.txt
NexeyaSGara ec020aa
Update CMakeLists.txt
NexeyaSGara 6b1e5d2
Update CMakeLists.txt
NexeyaSGara 1175eeb
Add windows specific
NexeyaSGara 52c0b1f
Update CMakeLists.txt
NexeyaSGara 03fbc90
Add windows specific
NexeyaSGara febbab0
Update CMakeLists.txt
NexeyaSGara b194162
Update CMakeLists.txt
NexeyaSGara 8eefcaa
Update CMakeLists.txt
NexeyaSGara 7a8202a
Create appveyor.yml
NexeyaSGara aeed23c
Update for windows
NexeyaSGara e0744e7
Update CMakeLists.txt
NexeyaSGara 5c9b09d
Update CMakeLists.txt
NexeyaSGara faecceb
Fix conflict
6e4d70d
Update CMakeLists.txt
NexeyaSGara 71de138
fix not by !
NexeyaSGara 5c1743b
Fix remaining not
NexeyaSGara ff6cc48
Fix remaining not by !
NexeyaSGara 18ef4f0
Fix remaning not by !
NexeyaSGara acc91d4
Fix not by !
NexeyaSGara 3f44894
Create resource.h
NexeyaSGara 3208dff
Update tango.h
NexeyaSGara 7fefc6a
add algorithm for windows
NexeyaSGara 8869e9e
Chn
NexeyaSGara c356eaf
Add fix for windows timeval
NexeyaSGara fe8e045
Change zmq to 4.0.5
NexeyaSGara 70ae036
disable warning 4267 4244 on windows
NexeyaSGara 39db9c5
Update cmake_win_defs.cmake
NexeyaSGara cd5fc3e
Update cmake_win_defs.cmake
NexeyaSGara 5aed66b
Update cmake_win_defs.cmake
NexeyaSGara 56dc194
add windows def
NexeyaSGara 0fa1351
Update cmake_win_defs.cmake
NexeyaSGara d80341e
Update cmake_win.cmake
NexeyaSGara 73846b5
Update cmake_win.cmake
NexeyaSGara 9d298d5
Update utils.cpp
NexeyaSGara ec670d3
Update utils.cpp
NexeyaSGara 6db172f
Update CMakeLists.txt
NexeyaSGara 791224d
Update clock.hh
NexeyaSGara 7461f22
Update cxx_nan_inf_in_prop.cpp
NexeyaSGara ff4fb19
Update CMakeLists.txt
NexeyaSGara d6a7fed
Update cmake_win.cmake
NexeyaSGara 727479b
Update cmake_win.cmake
NexeyaSGara d3a3e10
Update cmake_win.cmake
NexeyaSGara 234a1f4
Update CMakeLists.txt
NexeyaSGara 559e017
Update cmake_win.cmake
NexeyaSGara 7eb3d9d
Update CMakeLists.txt
NexeyaSGara f101053
Update cmake_win.cmake
NexeyaSGara 1473240
Update CMakeLists.txt
NexeyaSGara df3e8c6
Update cmake_win.cmake
NexeyaSGara b037f80
Update CMakeLists.txt
NexeyaSGara eff8b79
Update CMakeLists.txt
NexeyaSGara 7881bda
Update zmq version
NexeyaSGara cc955ac
Update cmake_win.cmake
NexeyaSGara e63a875
new zmq version
NexeyaSGara 81265d4
update zmq + disable nsis
NexeyaSGara 5c40e7d
Update appveyor.yml
NexeyaSGara 5b011b4
Update cmake_win.cmake
NexeyaSGara 7be2753
Update cmake_win.cmake
NexeyaSGara 09966d0
Update cmake_win.cmake
NexeyaSGara 2231bdc
New zmq version (fix vc9 x64)
NexeyaSGara 326397d
Fix files installed
NexeyaSGara 4b0a303
Fix pattern files_matching
NexeyaSGara 337e7a1
Re fix install structure
NexeyaSGara a128316
Add tpp
NexeyaSGara 5ca3d8c
Retrying CPACK
NexeyaSGara bf80dd5
Create dummy fille for creating directory
NexeyaSGara 379ba81
Add Tango.ico for NSIS Windows installer
NexeyaSGara 790af02
remove dummy
NexeyaSGara f1e5898
Upload executables Setup
NexeyaSGara 3d62ab9
Fix typo tango version x64 vc14
NexeyaSGara 71ea34e
Fix order for target compile options
NexeyaSGara 11ea4d1
Fix bad copy from master
NexeyaSGara c516ee0
Update to zmq (fix dyn lib asking libzmq.dll instead of libzmq-vcXX-m…
NexeyaSGara 74223c6
Change perform_work method
NexeyaSGara f71c07c
Update cmake_win_defs.cmake
NexeyaSGara 1ef36ad
Try static omniorb
NexeyaSGara df5c26c
Update zmq
NexeyaSGara 52a240f
Fix x64 msvc12 link
NexeyaSGara 3e0d15e
Update cmake_win.cmake
NexeyaSGara 5d19a5e
Try to fix vc14 def to add
NexeyaSGara 56e9410
vc14 x64 first
NexeyaSGara e2bbe92
Update cmake_win.cmake
NexeyaSGara 428063f
Update cmake_win.cmake
NexeyaSGara 89057c5
Update cmake_win_defs.cmake
NexeyaSGara dcf46a3
Update cmake_win_defs.cmake
NexeyaSGara a350761
Update cmake_win.cmake
NexeyaSGara 86c642b
Update cmake_win_defs.cmake
NexeyaSGara 9e1559b
Add compile options before library
NexeyaSGara ab4f55c
Trying to apply defs
NexeyaSGara c5d141c
Trying another fix for the differents definitions on static and dynamic
NexeyaSGara 609612f
Update cmake_win.cmake
NexeyaSGara b07f85e
Update cmake_win.cmake
NexeyaSGara f68f8b7
Add list of def for static and dyn
NexeyaSGara 6cb558f
Compile in static and dynamic for windows
NexeyaSGara 0866f08
Compile in static and dynamic for windows
NexeyaSGara 90ba10a
Compile in static and dynamic for windows
NexeyaSGara 5237bdf
Compile in static and dynamic for windows
NexeyaSGara 25a8a9a
Compile in static and dynamic for windows
NexeyaSGara 86177c9
Compile in static and dynamic for windows
NexeyaSGara c0c1d68
Use differents temp objets for sta and dyn
NexeyaSGara efb0f06
Add dyn and sta for windows
NexeyaSGara fcfbcc9
Update CMakeLists.txt
NexeyaSGara 6f98c75
Update CMakeLists.txt
NexeyaSGara fe4fd51
Update CMakeLists.txt
NexeyaSGara 6d512ac
Update CMakeLists.txt
NexeyaSGara 6929df9
Update CMakeLists.txt
NexeyaSGara 66b3788
Update CMakeLists.txt
NexeyaSGara 05ad1b3
Update CMakeLists.txt
NexeyaSGara d186213
Update cmake_win.cmake
NexeyaSGara fb1d87e
Update CMakeLists.txt
NexeyaSGara c3769bc
Update appveyor.yml
NexeyaSGara 3f62ed2
Update cmake_win_defs.cmake
NexeyaSGara 31251f3
Update cmake_win_defs.cmake
NexeyaSGara 9678c2b
Update cmake_win_defs.cmake
NexeyaSGara 557624e
Update cmake_win_defs.cmake
NexeyaSGara a3833d4
Update appveyor.yml
NexeyaSGara 6dc4f57
Update zmq (fix x64 static)
NexeyaSGara 73d60ed
Use new builded pthreadwin32
NexeyaSGara c067349
Adding pthread_win static and dynamic
NexeyaSGara 125a1fa
Using dyn and sta for pthread_win
NexeyaSGara 7d118e5
Update cmake_win.cmake
NexeyaSGara 3d3c8d2
Update appveyor.yml
NexeyaSGara 3e0f602
Update cmake_win_defs.cmake
NexeyaSGara 35c16c2
add pdb
NexeyaSGara 1bce8a5
Update CMakeLists.txt
NexeyaSGara e9898d7
Update Omniorb
NexeyaSGara fd1de23
Update CMakeLists.txt
NexeyaSGara 4840bab
Update CMakeLists.txt
NexeyaSGara b68f703
Update utils.cpp
NexeyaSGara d40b10b
Add MT for sta
NexeyaSGara de4a481
Add /MT for static
NexeyaSGara 8b8c30b
Add /MT for static
NexeyaSGara f9b4938
Add missing /MT for static
NexeyaSGara b3b3217
Add /MT for static
NexeyaSGara 48e8447
Add /MT for static
NexeyaSGara ab70094
fix bad copy
NexeyaSGara 0000a53
add /MT for static
NexeyaSGara feaabc7
fix bad copy
NexeyaSGara f50fe72
Update CMakeLists.txt
NexeyaSGara 7084ff9
Add /MT for static
NexeyaSGara 21068fc
Fix zmq naming static
NexeyaSGara f30bc06
Update zmq version (/MT static)
NexeyaSGara 5157d28
Fix zmq naming
NexeyaSGara a9120e0
/MTd for debug
NexeyaSGara 74586f6
/MTd for debug
NexeyaSGara 6561edf
MTd for debug
NexeyaSGara 0a52322
MTd for debug
NexeyaSGara e7c045e
MTd for debug
NexeyaSGara 0080edc
MTd for debug
NexeyaSGara 46312ae
MTd for debug
NexeyaSGara a803b43
MTd for debug
NexeyaSGara e85543b
Re-adding test on linux
NexeyaSGara cc9526e
Remove 64 sepcific since it's the same
NexeyaSGara 99a03f4
Update CMakeLists.txt
NexeyaSGara f7a8ac6
Add comment for new pragma warning
NexeyaSGara 52aafaa
removing \n
NexeyaSGara 8200729
Revert modif for windows
NexeyaSGara 84e4666
Removing ENV
NexeyaSGara 151f67b
Removing Test for windows
NexeyaSGara 6dd6c14
Update clock.hh
NexeyaSGara e4f76e4
Update CMakeLists.txt
NexeyaSGara ca89e8e
Reverting changes
NexeyaSGara 2c5d575
Replace RELEASE with Release
bourtemb 0cae502
Update README.md and INSTALL.md
bourtemb 8be0f59
Fix indentation on CMake files
bourtemb 8eba956
Add/Fix indentation in .cmake files
bourtemb 4a40f3b
Fix indentation
bourtemb 6a450c0
Fix indentation in configure/cmake_win.cmake
bourtemb 130349a
Change packagin
NexeyaSGara e998a93
Trying to fix the long path problem
NexeyaSGara 560bfce
Fix download of nsis
NexeyaSGara 4b40111
Update appveyor.yml
NexeyaSGara ef3244b
Update appveyor.yml
NexeyaSGara 14c4d1e
Adding Wix specific
NexeyaSGara 9c1519a
Trying WIX for generating setup
NexeyaSGara 01d7615
Update cpack_win.cmake
NexeyaSGara 14f4a38
Update appveyor.yml
NexeyaSGara File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,252 @@ | ||
| version: 0.0.{build} | ||
| branches: | ||
| only: | ||
| - tango-9-lts | ||
|
|
||
| image: Visual Studio 2015 | ||
|
|
||
| environment: | ||
| matrix: | ||
| - platform: win32 | ||
| ARCH: win32-msvc9 | ||
| configuration: Release | ||
| CMAKE_GENERATOR: "Visual Studio 9 2008" | ||
| MSVCVERSION: v90 | ||
| MSVCYEAR: "vs2008" | ||
| MSVCABR: "9" | ||
| VC_VER: 9.0 | ||
| PYTHONPATHOMNI: "/cygdrive/c/Python27/python" | ||
| BOOST_ROOT: C:\Libraries\boost_1_63_0 | ||
| ZMQ_BASE: C:\projects\libzmq | ||
| IDL_BASE: C:\projects\tangoidl | ||
| IDL_BIN: C:\Program Files (x86)\tangoidl | ||
| OMNI_BASE: C:\projects\omniORB-4.2.1 | ||
| - platform: x64 | ||
| ARCH: x64-msvc9 | ||
| configuration: Release | ||
| CMAKE_GENERATOR: "Visual Studio 9 2008 Win64" | ||
| MSVCVERSION: v90 | ||
| MSVCYEAR: "vs2008" | ||
| MSVCABR: "9" | ||
| VC_VER: 9.0 | ||
| PYTHONPATHOMNI: "/cygdrive/c/Python27/python" | ||
| BOOST_ROOT: C:\Libraries\boost_1_63_0 | ||
| ZMQ_BASE: C:\projects\libzmq | ||
| IDL_BASE: C:\projects\tangoidl | ||
| IDL_BIN: C:\Program Files\tangoidl | ||
| OMNI_BASE: C:\projects\omniORB-4.2.1 | ||
| - platform: win32 | ||
| ARCH: win32-msvc10 | ||
| configuration: Release | ||
| CMAKE_GENERATOR: "Visual Studio 10 2010" | ||
| MSVCVERSION: v100 | ||
| MSVCYEAR: "vs2010" | ||
| MSVCABR: "10" | ||
| VC_VER: 10.0 | ||
| PYTHONPATH: c:\Python33\ | ||
| PYTHONPATHOMNI: "/cygdrive/c/Python33/python" | ||
| BOOST_ROOT: C:\Libraries\boost_1_63_0 | ||
| ZMQ_BASE: C:\projects\libzmq | ||
| IDL_BASE: C:\projects\tangoidl | ||
| IDL_BIN: C:\Program Files (x86)\tangoidl | ||
| OMNI_BASE: C:\projects\omniORB-4.2.1 | ||
| - platform: x64 | ||
| ARCH: x64-msvc10 | ||
| configuration: Release | ||
| CMAKE_GENERATOR: "Visual Studio 10 2010 Win64" | ||
| MSVCVERSION: v100 | ||
| MSVCYEAR: "vs2010" | ||
| MSVCABR: "10" | ||
| VC_VER: 10.0 | ||
| PYTHONPATH: c:\Python33-x64\ | ||
| PYTHONPATHOMNI: "/cygdrive/c/Python33-x64/python" | ||
| BOOST_ROOT: C:\Libraries\boost_1_63_0 | ||
| ZMQ_BASE: C:\projects\libzmq | ||
| IDL_BASE: C:\projects\tangoidl | ||
| IDL_BIN: C:\Program Files\tangoidl | ||
| OMNI_BASE: C:\projects\omniORB-4.2.1 | ||
| - platform: x64 | ||
| ARCH: x64-msvc12 | ||
| configuration: Release | ||
| CMAKE_GENERATOR: "Visual Studio 12 2013 Win64" | ||
| MSVCVERSION: v120 | ||
| MSVCYEAR: "vs2013" | ||
| MSVCABR: "13" | ||
| VC_VER: 13.0 | ||
| PYTHONPATHOMNI: "/cygdrive/c/Python33-x64/python" | ||
| BOOST_ROOT: C:\Libraries\boost_1_63_0 | ||
| ZMQ_BASE: C:\projects\libzmq | ||
| IDL_BASE: C:\projects\tangoidl | ||
| IDL_BIN: C:\Program Files\tangoidl | ||
| OMNI_BASE: C:\projects\omniORB-4.2.1 | ||
| - platform: x64 | ||
| ARCH: x64-msvc14 | ||
| configuration: Release | ||
| CMAKE_GENERATOR: "Visual Studio 14 2015 Win64" | ||
| MSVCVERSION: v140 | ||
| MSVCYEAR: "vs2015" | ||
| MSVCABR: "14" | ||
| VC_VER: 14.0 | ||
| PYTHONPATH: c:\Python35-x64\ | ||
| PYTHONPATHOMNI: "/cygdrive/c/Python35-x64/python" | ||
| BOOST_ROOT: C:\Libraries\boost_1_63_0 | ||
| ZMQ_BASE: C:\projects\libzmq | ||
| IDL_BASE: C:\projects\tangoidl | ||
| IDL_BIN: C:\Program Files\tangoidl | ||
| OMNI_BASE: C:\projects\omniORB-4.2.1 | ||
|
|
||
| init: | ||
| # go to hell Xamarin (see http://help.appveyor.com/discussions/problems/4569) | ||
| - del "C:\Program Files (x86)\MSBuild\4.0\Microsoft.Common.Targets\ImportAfter\Xamarin.Common.targets" | ||
| - del "C:\Program Files (x86)\MSBuild\14.0\Microsoft.Common.targets\ImportAfter\Xamarin.Common.targets" | ||
| - del "C:\Program Files (x86)\MSBuild\12.0\Microsoft.Common.targets\ImportAfter\Xamarin.Common.targets" | ||
| #RDP from start | ||
| #- ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) | ||
| # Update NSIS to support long path | ||
| - ps: (new-object System.Net.WebClient).DownloadFile("https://downloads.sourceforge.net/project/nsis/NSIS%203/3.02.1/nsis-3.02.1-strlen_8192.zip?r=&ts=1512138514&use_mirror=10gbps-io", "C:\projects\nsis-3.02.1-strlen_8192.zip") | ||
| - cmd: cd "C:\projects\" | ||
| - cmd: 7z -y x nsis-3.02.1-strlen_8192.zip -oC:\Program Files (x86)\NSIS | ||
| # Tango IDL | ||
| - cmd: set TANGOIDLDIR=C:\projects\tangoidl | ||
| - cmd: git clone --depth 1 --quiet https://github.com/tango-controls/tango-idl %TANGOIDLDIR% | ||
| - cmd: cd "C:\projects\" | ||
| # Zmq | ||
| - cmd: cd "C:\projects\" | ||
| - cmd: md zeromq | ||
| - cmd: cd "C:\projects\" | ||
| - if %ARCH%==win32-msvc9 appveyor DownloadFile https://ci.appveyor.com/api/buildjobs/kif9t1ni9dorv7ai/artifacts/zmq-4.0.5_%ARCH%.zip | ||
| - if %ARCH%==x64-msvc9 appveyor DownloadFile https://ci.appveyor.com/api/buildjobs/v08rh5ojx3uljbm0/artifacts/zmq-4.0.5_%ARCH%.zip | ||
| - if %ARCH%==win32-msvc10 appveyor DownloadFile https://ci.appveyor.com/api/buildjobs/bfw1w51dmwb4t1s8/artifacts/zmq-4.0.5_%ARCH%.zip | ||
| - if %ARCH%==x64-msvc10 appveyor DownloadFile https://ci.appveyor.com/api/buildjobs/dv6koti648n78wru/artifacts/zmq-4.0.5_%ARCH%.zip | ||
| - if %ARCH%==x64-msvc12 appveyor DownloadFile https://ci.appveyor.com/api/buildjobs/92i5i0466vrsf8uf/artifacts/zmq-4.0.5_%ARCH%.zip | ||
| - if %ARCH%==x64-msvc14 appveyor DownloadFile https://ci.appveyor.com/api/buildjobs/jlsd4d38c425kumq/artifacts/zmq-4.0.5_%ARCH%.zip | ||
| - cmd: 7z -y x zmq-4.0.5_%ARCH%.zip -oC:\projects\zeromq\ | ||
| #- cmd: move C:\projects\zeromq\lib\Release\libzmq*mt-4*.lib C:\projects\zeromq\lib\Release\libzmq.lib | ||
| # OmniOrb | ||
| - cmd: cd "C:\projects\" | ||
| - cmd: md omniorb | ||
| - cmd: cd "C:\projects\" | ||
| - if %ARCH%==win32-msvc9 appveyor DownloadFile https://ci.appveyor.com/api/buildjobs/b3j87c59nps33ga8/artifacts/omniorb-4.2.1_%ARCH%.zip | ||
| - if %ARCH%==x64-msvc9 appveyor DownloadFile https://ci.appveyor.com/api/buildjobs/t0c9a59fr0ixb6to/artifacts/omniorb-4.2.1_%ARCH%.zip | ||
| - if %ARCH%==win32-msvc10 appveyor DownloadFile https://ci.appveyor.com/api/buildjobs/0ywhsy2wnmfw99ia/artifacts/omniorb-4.2.1_%ARCH%.zip | ||
| - if %ARCH%==x64-msvc10 appveyor DownloadFile https://ci.appveyor.com/api/buildjobs/x2sr2c1i0f7hy1cg/artifacts/omniorb-4.2.1_%ARCH%.zip | ||
| - if %ARCH%==x64-msvc12 appveyor DownloadFile https://ci.appveyor.com/api/buildjobs/2e8wjs2aalg6cryl/artifacts/omniorb-4.2.1_%ARCH%.zip | ||
| - if %ARCH%==x64-msvc14 appveyor DownloadFile https://ci.appveyor.com/api/buildjobs/ry9yevfyjddf6j2e/artifacts/omniorb-4.2.1_%ARCH%.zip | ||
| - cmd: 7z -y x omniorb-4.2.1_%ARCH%.zip -oC:\projects\omniorb\ | ||
| #Pthread-Win32 | ||
| - cmd: cd "C:\projects\" | ||
| - cmd: md pthreads-win32 | ||
| - cmd: cd "C:\projects\" | ||
| - if %ARCH%==win32-msvc9 appveyor DownloadFile https://ci.appveyor.com/api/buildjobs/7aj99tp6e6fvron0/artifacts/pthreads-win32-2.9.1_win32-msvc9.zip | ||
| - if %ARCH%==x64-msvc9 appveyor DownloadFile https://ci.appveyor.com/api/buildjobs/pgefsid2t7ma16j6/artifacts/pthreads-win32-2.9.1_x64-msvc9.zip | ||
| - if %ARCH%==win32-msvc10 appveyor DownloadFile https://ci.appveyor.com/api/buildjobs/3hhh3rfhif1lgw0f/artifacts/pthreads-win32-2.9.1_win32-msvc10.zip | ||
| - if %ARCH%==x64-msvc10 appveyor DownloadFile https://ci.appveyor.com/api/buildjobs/g6g73i5paldagoc4/artifacts/pthreads-win32-2.9.1_x64-msvc10.zip | ||
| - if %ARCH%==x64-msvc12 appveyor DownloadFile https://ci.appveyor.com/api/buildjobs/w4vojpste8j6l823/artifacts/pthreads-win32-2.9.1_x64-msvc12.zip | ||
| - if %ARCH%==x64-msvc14 appveyor DownloadFile https://ci.appveyor.com/api/buildjobs/6tson2rjxm3vgwra/artifacts/pthreads-win32-2.9.1_x64-msvc14.zip | ||
| - cmd: 7z -y x pthreads-win32-2.9.1_%ARCH%.zip -oC:\projects\pthreads-win32\ | ||
| #VS2008 patch | ||
| - cmd: cd "C:\projects\" | ||
| - cmd: appveyor DownloadFile https://github.com/menpo/condaci/raw/master/vs2008_patch.zip | ||
| - cmd: 7z -y x vs2008_patch.zip -oC:\projects\vs2008_patch\ | ||
| - cmd: if %ARCH%==x64-msvc9 call C:\projects\vs2008_patch\setup_x64.bat | ||
| - cmd: if %ARCH%==x32-msvc9 call C:\projects\vs2008_patch\setup_x86.bat | ||
| - cmd: copy "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\vcvars64.bat" "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\amd64\vcvarsamd64.bat" | ||
|
|
||
| - cmd: cd "C:\projects\cppTango" | ||
| install: | ||
| #copy tree for debug build | ||
| - cmd: cd c:/projects/ | ||
| - cmd: md debug_build | ||
| - cmd: xcopy "C:/projects/cppTango" "c:/projects/debug_build" /c /g /d /i /e /r /h /y | ||
| # Setting Visual Compiler | ||
| - cmd: cd "C:\projects\" | ||
| - cmd: if %ARCH%==win32-msvc9 call "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" | ||
| - cmd: if %ARCH%==win32-msvc9 set path=C:\Windows\Microsoft.NET\Framework\v4.0.30319;%path% | ||
| - cmd: if %ARCH%==x64-msvc9 call "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\vcvars64.bat" | ||
| - cmd: if %ARCH%==win32-msvc10 call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" | ||
| - cmd: if %ARCH%==win32-msvc10 set path=C:\Windows\Microsoft.NET\Framework\v4.0.30319;%path% | ||
| - cmd: if %ARCH%==x64-msvc10 call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 | ||
| - cmd: if %ARCH%==win32-msvc14 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" | ||
| - cmd: if %ARCH%==x64-msvc14 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 | ||
| - cmd: echo "Generator='%CMAKE_GENERATOR%'" | ||
| - cmd: echo "Platform='%Platform%'" | ||
| - cmd: set PYTHONPATH=%PYTHONPATH% | ||
| # Tango IDL | ||
| - cmd: cd "C:\projects\tangoidl" | ||
| - cmd: cmake -G "%CMAKE_GENERATOR%" | ||
| - cmd: cmake --build ./ --target install --config Debug | ||
| - cmd: if %ARCH%==x64-msvc10 call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 /Release | ||
| - cmd: cmake --build ./ --target install --config Release | ||
| # Tango API | ||
| - cmd: cd "C:\projects\cppTango" | ||
| - cmd: set BOOST_ROOT=%BOOST_ROOT% | ||
| - cmd: set ZMQ_BASE=C:/projects/zeromq/ | ||
| - cmd: set IDL_BASE=%IDL_BIN% | ||
| - cmd: set OMNI_BASE=C:/projects/omniorb/ | ||
| - cmd: set PTHREAD_WIN=C:/projects/pthreads-win32/ | ||
| - cmd: if %ARCH%==x64-msvc14 set path=%path%;%PYTHONPATH% | ||
| #- cmd: cmake -G "%CMAKE_GENERATOR%" -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE -DBUILD_SHARED_LIBS=TRUE | ||
| #- cmd: cmake -G "%CMAKE_GENERATOR%" -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE | ||
| - cmd: cmake -G "%CMAKE_GENERATOR%" -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE -DIDL_BASE="%IDL_BASE%" -DOMNI_BASE="%OMNI_BASE%" -DZMQ_BASE="%ZMQ_BASE%" -DPTHREAD_WIN=%PTHREAD_WIN% | ||
| - cmd: cd c:/projects/debug_build | ||
| #- cmd: cmake -G "%CMAKE_GENERATOR%" -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE -DBUILD_SHARED_LIBS=TRUE -DCMAKE_BUILD_TYPE=Debug | ||
| - cmd: cmake -G "%CMAKE_GENERATOR%" -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE -DCMAKE_BUILD_TYPE=Debug -DIDL_BASE="%IDL_BASE%" -DOMNI_BASE="%OMNI_BASE%" -DZMQ_BASE="%ZMQ_BASE%" -DPTHREAD_WIN=%PTHREAD_WIN% | ||
|
|
||
| clone_folder: C:\projects\cppTango | ||
|
|
||
| build: | ||
| project: C:\projects\cppTango\tango.sln | ||
| verbosity: minimal | ||
|
|
||
| build_script: | ||
| - cmd: cd C:/projects/cppTango | ||
| - cmake --build ./ --config Release | ||
| - cmd: if %ARCH%==x64-msvc10 call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 | ||
| - cmd: cd c:/projects/debug_build | ||
| - cmake --build ./ --config Debug | ||
| #- cmake --build ./ --target install --config Debug | ||
|
|
||
|
|
||
| after_build: | ||
| - cmd: cd C:/projects/cppTango | ||
| # Generating installer | ||
| - cmd: cpack -G WIX | ||
| - cmd: cpack -G ZIP | ||
| - cmd: cd c:/projects/debug_build | ||
| # Generating installer | ||
| - cmd: cpack -C Debug -G WIX | ||
| - cmd: cpack -C Debug -G ZIP | ||
| #rename x64-msvc10 | ||
| - cmd: if %ARCH%==x64-msvc10 move libtango_9.2.6_Windows7.1SDK_x64_debug.msi libtango_9.2.6_v100_x64_debug.msi | ||
| - cmd: if %ARCH%==x64-msvc10 move libtango_9.2.6_Windows7.1SDK_x64_debug.zip libtango_9.2.6_v100_x64_debug.zip | ||
| - cmd: cd C:/projects/cppTango | ||
| - cmd: if %ARCH%==x64-msvc10 move libtango_9.2.6_Windows7.1SDK_x64.msi libtango_9.2.6_v100_x64.msi | ||
| - cmd: if %ARCH%==x64-msvc10 move libtango_9.2.6_Windows7.1SDK_x64.zip libtango_9.2.6_v100_x64.zip | ||
| # copying debug versions for upload | ||
| - cmd: cd c:/projects/debug_build | ||
| - cmd: if %ARCH%==win32-msvc9 move libtango_9.2.6_v90_x86_debug.msi C:/projects/cppTango | ||
| - cmd: if %ARCH%==win32-msvc9 move libtango_9.2.6_v90_x86_debug.zip C:/projects/cppTango | ||
| - cmd: if %ARCH%==x64-msvc9 move libtango_9.2.6_v90_x64_debug.msi C:/projects/cppTango | ||
| - cmd: if %ARCH%==x64-msvc9 move libtango_9.2.6_v90_x64_debug.zip C:/projects/cppTango | ||
| - cmd: if %ARCH%==win32-msvc10 move libtango_9.2.6_v100_x86_debug.msi C:/projects/cppTango | ||
| - cmd: if %ARCH%==win32-msvc10 move libtango_9.2.6_v100_x86_debug.zip C:/projects/cppTango | ||
| - cmd: if %ARCH%==x64-msvc10 move libtango_9.2.6_v100_x64_debug.msi C:/projects/cppTango | ||
| - cmd: if %ARCH%==x64-msvc10 move libtango_9.2.6_v100_x64_debug.zip C:/projects/cppTango | ||
| - cmd: if %ARCH%==x64-msvc12 move libtango_9.2.6_v120_x64_debug.msi C:/projects/cppTango | ||
| - cmd: if %ARCH%==x64-msvc12 move libtango_9.2.6_v120_x64_debug.zip C:/projects/cppTango | ||
| - cmd: if %ARCH%==x64-msvc14 move libtango_9.2.6_v140_x64_debug.msi C:/projects/cppTango | ||
| - cmd: if %ARCH%==x64-msvc14 move libtango_9.2.6_v140_x64_debug.zip C:/projects/cppTango | ||
|
|
||
|
|
||
| on_finish: | ||
| #RDP for finish | ||
| #- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) | ||
|
|
||
| on_failure: | ||
| #RDP for failure | ||
| - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) | ||
|
|
||
| artifacts: | ||
| - path: ./*.exe | ||
| - path: ./*.zip | ||
| - path: ./*.msi | ||
Binary file not shown.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As we said during the last Tango kernel teleconference, the repositories to build ZMQ and omniORB should be on GitHub tango-controls organization so we could have full control on how to build these artifacts.
This can be done eventually after accepting this PR. But another PR will be necesseray in order to update all these download links.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think so, for the moment, theses artefacts are OK. We will just update them when you will have all setted up
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I get this CMake warning with your change:
CMake Warning (dev) in CMakeLists.txt:
A logical block opening on the line
cppTango/CMakeLists.txt:34 (if)
closes on the line
cppTango/CMakeLists.txt:36 (endif)
with mis-matching arguments.
endif(WIN32) should be replaced with endif(NOT WIN32) in this case.
Ooops wrong location for this comment. This comment is about the commit which added the tests on Linux again.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok