From 9b83e2bcdf22e98ff72e25425ab0c4ff73e45c7c Mon Sep 17 00:00:00 2001 From: Mateusz Nabywaniec Date: Mon, 17 Apr 2023 07:21:42 +0200 Subject: [PATCH 01/14] Add msvc 2019 support --- appveyor.yml | 325 ++++++++++++++++++++++++++++----------------------- 1 file changed, 181 insertions(+), 144 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 54d0334..389c8f9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,15 +5,15 @@ branches: environment: matrix: - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 platform: win32 - ARCH: win32-msvc15 + ARCH: win32-msvc16 configuration: Release - CMAKE_GENERATOR: "Visual Studio 15 2017" - MSVCVERSION: v141 - MSVCYEAR: "vs2017" - MSVCABR: "15" - VC_VER: 15.0 + CMAKE_GENERATOR: "Visual Studio 16 2019" + MSVCVERSION: v142 + MSVCYEAR: "vs2019" + MSVCABR: "16" + VC_VER: 16.0 PYTHONPATH: c:\Python35\ PYTHONPATHOMNI: "/cygdrive/c/Python35/python" BOOST_ROOT: C:\Libraries\boost_1_63_0 @@ -21,15 +21,15 @@ environment: IDL_BASE: C:\projects\tangoidl IDL_BIN: C:\Program Files\tangoidl OMNI_BASE: C:\projects\omniORB-4.2.1 - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 platform: x64 - ARCH: x64-msvc15 + ARCH: x64-msvc16 configuration: Release - CMAKE_GENERATOR: "Visual Studio 15 2017 Win64" - MSVCVERSION: v141 - MSVCYEAR: "vs2017" - MSVCABR: "15" - VC_VER: 15.0 + CMAKE_GENERATOR: "Visual Studio 16 2019 Win64" + MSVCVERSION: v142 + MSVCYEAR: "vs2019" + MSVCABR: "16" + VC_VER: 16.0 PYTHONPATH: c:\Python35-x64\ PYTHONPATHOMNI: "/cygdrive/c/Python35-x64/python" BOOST_ROOT: C:\Libraries\boost_1_63_0 @@ -37,135 +37,167 @@ environment: IDL_BASE: C:\projects\tangoidl IDL_BIN: C:\Program Files\tangoidl OMNI_BASE: C:\projects\omniORB-4.2.1 - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - 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 - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - 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 - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - 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 - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - 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 - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - platform: win32 - ARCH: win32-msvc12 - configuration: Release - CMAKE_GENERATOR: "Visual Studio 12 2013" - MSVCVERSION: v120 - MSVCYEAR: "vs2013" - MSVCABR: "13" - VC_VER: 13.0 - 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\tangoidl - OMNI_BASE: C:\projects\omniORB-4.2.1 - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - 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 - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - platform: win32 - ARCH: win32-msvc14 - configuration: Release - CMAKE_GENERATOR: "Visual Studio 14 2015" - MSVCVERSION: v140 - MSVCYEAR: "vs2015" - MSVCABR: "14" - VC_VER: 14.0 - PYTHONPATH: c:\Python35\ - PYTHONPATHOMNI: "/cygdrive/c/Python35/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 - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - 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 + # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + # platform: win32 + # ARCH: win32-msvc15 + # configuration: Release + # CMAKE_GENERATOR: "Visual Studio 15 2017" + # MSVCVERSION: v141 + # MSVCYEAR: "vs2017" + # MSVCABR: "15" + # VC_VER: 15.0 + # PYTHONPATH: c:\Python35\ + # PYTHONPATHOMNI: "/cygdrive/c/Python35/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 + # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + # platform: x64 + # ARCH: x64-msvc15 + # configuration: Release + # CMAKE_GENERATOR: "Visual Studio 15 2017 Win64" + # MSVCVERSION: v141 + # MSVCYEAR: "vs2017" + # MSVCABR: "15" + # VC_VER: 15.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 + # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + # 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 + # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + # 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 + # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + # 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 + # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + # 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 + # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + # platform: win32 + # ARCH: win32-msvc12 + # configuration: Release + # CMAKE_GENERATOR: "Visual Studio 12 2013" + # MSVCVERSION: v120 + # MSVCYEAR: "vs2013" + # MSVCABR: "13" + # VC_VER: 13.0 + # 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\tangoidl + # OMNI_BASE: C:\projects\omniORB-4.2.1 + # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + # 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 + # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + # platform: win32 + # ARCH: win32-msvc14 + # configuration: Release + # CMAKE_GENERATOR: "Visual Studio 14 2015" + # MSVCVERSION: v140 + # MSVCYEAR: "vs2015" + # MSVCABR: "14" + # VC_VER: 14.0 + # PYTHONPATH: c:\Python35\ + # PYTHONPATHOMNI: "/cygdrive/c/Python35/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 + # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + # 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) - - cmd: if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2017" del "C:\Program Files (x86)\MSBuild\4.0\Microsoft.Common.Targets\ImportAfter\Xamarin.Common.targets" - - cmd: if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2017" del "C:\Program Files (x86)\MSBuild\14.0\Microsoft.Common.targets\ImportAfter\Xamarin.Common.targets" - - cmd: if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2017" del "C:\Program Files (x86)\MSBuild\12.0\Microsoft.Common.targets\ImportAfter\Xamarin.Common.targets" + - cmd: if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2017" if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2019" del "C:\Program Files (x86)\MSBuild\4.0\Microsoft.Common.Targets\ImportAfter\Xamarin.Common.targets" + - cmd: if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2017" if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2019" del "C:\Program Files (x86)\MSBuild\14.0\Microsoft.Common.targets\ImportAfter\Xamarin.Common.targets" + - cmd: if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2017" if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2019" 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')) #Pthread-Win32 @@ -176,11 +208,11 @@ init: - cmd: 7z -y x pthreads-w32-2-9-1-release.zip -oC:\projects\pthreads-win32-src\ #VS2008 patch - cmd: cd "C:\projects\" - - cmd: if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2017" appveyor DownloadFile https://github.com/menpo/condaci/raw/master/vs2008_patch.zip - - cmd: if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2017" 7z -y x vs2008_patch.zip -oC:\projects\vs2008_patch\ + - cmd: if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2017" if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2019" appveyor DownloadFile https://github.com/menpo/condaci/raw/master/vs2008_patch.zip + - cmd: if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2017" if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2019" 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: if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2017" 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: if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2017" if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2019" 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\Pthread_WIN32" install: @@ -203,6 +235,8 @@ install: - cmd: if %ARCH%==x64-msvc14 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 - cmd: if %ARCH%==win32-msvc15 call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat" - cmd: if %ARCH%==x64-msvc15 call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" + - cmd: if %ARCH%==win32-msvc16 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars32.bat" + - cmd: if %ARCH%==x64-msvc16 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" - cmd: echo "Generator='%CMAKE_GENERATOR%'" - cmd: echo "Platform='%Platform%'" - cmd: set PYTHONPATH=%PYTHONPATH% @@ -220,6 +254,9 @@ build_script: - cmd: if %ARCH%==x64-msvc14 move /Y C:\projects\Pthread_WIN32\Makefile C:\projects\pthreads-win32-src\pthreads.2\Makefile - cmd: if %ARCH%==x64-msvc15 move /Y C:\projects\Pthread_WIN32\Makefile C:\projects\pthreads-win32-src\pthreads.2\Makefile - cmd: if %ARCH%==win32-msvc15 move /Y C:\projects\Pthread_WIN32\Makefile C:\projects\pthreads-win32-src\pthreads.2\Makefile + - cmd: if %ARCH%==x64-msvc16 move /Y C:\projects\Pthread_WIN32\Makefile C:\projects\pthreads-win32-src\pthreads.2\Makefile + - cmd: if %ARCH%==win32-msvc16 move /Y C:\projects\Pthread_WIN32\Makefile C:\projects\pthreads-win32-src\pthreads.2\Makefile + - cmd: type "C:\projects\pthreads-win32-src\pthreads.2\Makefile" - cmd: cd C:/projects/pthreads-win32-src/pthreads.2 - cmd: nmake VC-static From 1a288e9318c84ddfd3936262d5f45c8cfebcacf0 Mon Sep 17 00:00:00 2001 From: Mateusz Nabywaniec Date: Mon, 17 Apr 2023 07:26:40 +0200 Subject: [PATCH 02/14] Leave only 1 env for test --- appveyor.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 389c8f9..eaab674 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -21,22 +21,22 @@ environment: IDL_BASE: C:\projects\tangoidl IDL_BIN: C:\Program Files\tangoidl OMNI_BASE: C:\projects\omniORB-4.2.1 - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - platform: x64 - ARCH: x64-msvc16 - configuration: Release - CMAKE_GENERATOR: "Visual Studio 16 2019 Win64" - MSVCVERSION: v142 - MSVCYEAR: "vs2019" - MSVCABR: "16" - VC_VER: 16.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 + # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + # platform: x64 + # ARCH: x64-msvc16 + # configuration: Release + # CMAKE_GENERATOR: "Visual Studio 16 2019 Win64" + # MSVCVERSION: v142 + # MSVCYEAR: "vs2019" + # MSVCABR: "16" + # VC_VER: 16.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 # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 # platform: win32 # ARCH: win32-msvc15 From 63a8783f7972feab0aaaf0cd879b60054f3fb55a Mon Sep 17 00:00:00 2001 From: Mateusz Nabywaniec Date: Mon, 17 Apr 2023 07:28:56 +0200 Subject: [PATCH 03/14] Remove only master for testing --- appveyor.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index eaab674..ea3159f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,4 @@ version: 1.0.{build} -branches: - only: - - master environment: matrix: From a96f4af8feef4ae9f10d9295d24bced549038834 Mon Sep 17 00:00:00 2001 From: Mateusz Nabywaniec Date: Mon, 17 Apr 2023 07:32:56 +0200 Subject: [PATCH 04/14] Uncomment other envs --- appveyor.yml | 347 ++++++++++++++++++++++++++------------------------- 1 file changed, 175 insertions(+), 172 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index ea3159f..36fa566 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,7 @@ version: 1.0.{build} +# branches: +# only: +# - master environment: matrix: @@ -18,178 +21,178 @@ environment: IDL_BASE: C:\projects\tangoidl IDL_BIN: C:\Program Files\tangoidl OMNI_BASE: C:\projects\omniORB-4.2.1 - # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - # platform: x64 - # ARCH: x64-msvc16 - # configuration: Release - # CMAKE_GENERATOR: "Visual Studio 16 2019 Win64" - # MSVCVERSION: v142 - # MSVCYEAR: "vs2019" - # MSVCABR: "16" - # VC_VER: 16.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 - # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - # platform: win32 - # ARCH: win32-msvc15 - # configuration: Release - # CMAKE_GENERATOR: "Visual Studio 15 2017" - # MSVCVERSION: v141 - # MSVCYEAR: "vs2017" - # MSVCABR: "15" - # VC_VER: 15.0 - # PYTHONPATH: c:\Python35\ - # PYTHONPATHOMNI: "/cygdrive/c/Python35/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 - # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - # platform: x64 - # ARCH: x64-msvc15 - # configuration: Release - # CMAKE_GENERATOR: "Visual Studio 15 2017 Win64" - # MSVCVERSION: v141 - # MSVCYEAR: "vs2017" - # MSVCABR: "15" - # VC_VER: 15.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 - # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - # 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 - # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - # 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 - # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - # 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 - # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - # 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 - # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - # platform: win32 - # ARCH: win32-msvc12 - # configuration: Release - # CMAKE_GENERATOR: "Visual Studio 12 2013" - # MSVCVERSION: v120 - # MSVCYEAR: "vs2013" - # MSVCABR: "13" - # VC_VER: 13.0 - # 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\tangoidl - # OMNI_BASE: C:\projects\omniORB-4.2.1 - # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - # 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 - # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - # platform: win32 - # ARCH: win32-msvc14 - # configuration: Release - # CMAKE_GENERATOR: "Visual Studio 14 2015" - # MSVCVERSION: v140 - # MSVCYEAR: "vs2015" - # MSVCABR: "14" - # VC_VER: 14.0 - # PYTHONPATH: c:\Python35\ - # PYTHONPATHOMNI: "/cygdrive/c/Python35/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 - # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - # 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 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + platform: x64 + ARCH: x64-msvc16 + configuration: Release + CMAKE_GENERATOR: "Visual Studio 16 2019 Win64" + MSVCVERSION: v142 + MSVCYEAR: "vs2019" + MSVCABR: "16" + VC_VER: 16.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 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + platform: win32 + ARCH: win32-msvc15 + configuration: Release + CMAKE_GENERATOR: "Visual Studio 15 2017" + MSVCVERSION: v141 + MSVCYEAR: "vs2017" + MSVCABR: "15" + VC_VER: 15.0 + PYTHONPATH: c:\Python35\ + PYTHONPATHOMNI: "/cygdrive/c/Python35/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 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + platform: x64 + ARCH: x64-msvc15 + configuration: Release + CMAKE_GENERATOR: "Visual Studio 15 2017 Win64" + MSVCVERSION: v141 + MSVCYEAR: "vs2017" + MSVCABR: "15" + VC_VER: 15.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 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + 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 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + 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 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + 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 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + 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 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + platform: win32 + ARCH: win32-msvc12 + configuration: Release + CMAKE_GENERATOR: "Visual Studio 12 2013" + MSVCVERSION: v120 + MSVCYEAR: "vs2013" + MSVCABR: "13" + VC_VER: 13.0 + 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\tangoidl + OMNI_BASE: C:\projects\omniORB-4.2.1 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + 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 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + platform: win32 + ARCH: win32-msvc14 + configuration: Release + CMAKE_GENERATOR: "Visual Studio 14 2015" + MSVCVERSION: v140 + MSVCYEAR: "vs2015" + MSVCABR: "14" + VC_VER: 14.0 + PYTHONPATH: c:\Python35\ + PYTHONPATHOMNI: "/cygdrive/c/Python35/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 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + 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) - cmd: if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2017" if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2019" del "C:\Program Files (x86)\MSBuild\4.0\Microsoft.Common.Targets\ImportAfter\Xamarin.Common.targets" From 7a28b55655a13d3b847be68b81e9ade48fdb2da8 Mon Sep 17 00:00:00 2001 From: Mateusz Nabywaniec Date: Mon, 17 Apr 2023 12:38:35 +0200 Subject: [PATCH 05/14] Remove unused variables --- appveyor.yml | 82 +--------------------------------------------------- 1 file changed, 1 insertion(+), 81 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 36fa566..ade8280 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,13 +14,6 @@ environment: MSVCYEAR: "vs2019" MSVCABR: "16" VC_VER: 16.0 - PYTHONPATH: c:\Python35\ - PYTHONPATHOMNI: "/cygdrive/c/Python35/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 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 platform: x64 ARCH: x64-msvc16 @@ -30,13 +23,6 @@ environment: MSVCYEAR: "vs2019" MSVCABR: "16" VC_VER: 16.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 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 platform: win32 ARCH: win32-msvc15 @@ -46,13 +32,6 @@ environment: MSVCYEAR: "vs2017" MSVCABR: "15" VC_VER: 15.0 - PYTHONPATH: c:\Python35\ - PYTHONPATHOMNI: "/cygdrive/c/Python35/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 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 platform: x64 ARCH: x64-msvc15 @@ -62,13 +41,6 @@ environment: MSVCYEAR: "vs2017" MSVCABR: "15" VC_VER: 15.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 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 platform: win32 ARCH: win32-msvc9 @@ -78,12 +50,6 @@ environment: 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 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 platform: x64 ARCH: x64-msvc9 @@ -93,12 +59,6 @@ environment: 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 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 platform: win32 ARCH: win32-msvc10 @@ -108,13 +68,6 @@ environment: 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 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 platform: x64 ARCH: x64-msvc10 @@ -124,13 +77,6 @@ environment: 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 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 platform: win32 ARCH: win32-msvc12 @@ -140,12 +86,6 @@ environment: MSVCYEAR: "vs2013" MSVCABR: "13" VC_VER: 13.0 - 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\tangoidl - OMNI_BASE: C:\projects\omniORB-4.2.1 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 platform: x64 ARCH: x64-msvc12 @@ -155,12 +95,6 @@ environment: 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 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 platform: win32 ARCH: win32-msvc14 @@ -170,13 +104,6 @@ environment: MSVCYEAR: "vs2015" MSVCABR: "14" VC_VER: 14.0 - PYTHONPATH: c:\Python35\ - PYTHONPATHOMNI: "/cygdrive/c/Python35/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 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 platform: x64 ARCH: x64-msvc14 @@ -186,13 +113,6 @@ environment: 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) - cmd: if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2017" if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2019" del "C:\Program Files (x86)\MSBuild\4.0\Microsoft.Common.Targets\ImportAfter\Xamarin.Common.targets" @@ -239,7 +159,7 @@ install: - cmd: if %ARCH%==x64-msvc16 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" - cmd: echo "Generator='%CMAKE_GENERATOR%'" - cmd: echo "Platform='%Platform%'" - - cmd: set PYTHONPATH=%PYTHONPATH% + # - cmd: set PYTHONPATH=%PYTHONPATH% - cmd: set ARCH=%ARCH% clone_folder: C:\projects\Pthread_WIN32 From 8bdf34df34ca48af9b3754b33f93f3aced0ef9c3 Mon Sep 17 00:00:00 2001 From: Mateusz Nabywaniec Date: Mon, 17 Apr 2023 13:18:59 +0200 Subject: [PATCH 06/14] Add support for msvc 2022 --- appveyor.yml | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index ade8280..cf7f93e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,6 +5,24 @@ version: 1.0.{build} environment: matrix: + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 + platform: win32 + ARCH: win32-msvc17 + configuration: Release + CMAKE_GENERATOR: "Visual Studio 17 2022" + MSVCVERSION: v143 + MSVCYEAR: "vs2022" + MSVCABR: "17" + VC_VER: 17.0 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 + platform: x64 + ARCH: x64-msvc17 + configuration: Release + CMAKE_GENERATOR: "Visual Studio 17 2022 Win64" + MSVCVERSION: v143 + MSVCYEAR: "vs2022" + MSVCABR: "17" + VC_VER: 17.0 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 platform: win32 ARCH: win32-msvc16 @@ -115,9 +133,11 @@ environment: VC_VER: 14.0 init: # go to hell Xamarin (see http://help.appveyor.com/discussions/problems/4569) - - cmd: if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2017" if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2019" del "C:\Program Files (x86)\MSBuild\4.0\Microsoft.Common.Targets\ImportAfter\Xamarin.Common.targets" - - cmd: if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2017" if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2019" del "C:\Program Files (x86)\MSBuild\14.0\Microsoft.Common.targets\ImportAfter\Xamarin.Common.targets" - - cmd: if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2017" if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2019" del "C:\Program Files (x86)\MSBuild\12.0\Microsoft.Common.targets\ImportAfter\Xamarin.Common.targets" + - cmd: set REMOVE_XAMARIN=0 + - cmd: if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2017" if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2019" if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2022" set REMOVE_XAMARIN=1 + - cmd: if %REMOVE_XAMARIN%==1 del "C:\Program Files (x86)\MSBuild\4.0\Microsoft.Common.Targets\ImportAfter\Xamarin.Common.targets" + - cmd: if %REMOVE_XAMARIN%==1 del "C:\Program Files (x86)\MSBuild\14.0\Microsoft.Common.targets\ImportAfter\Xamarin.Common.targets" + - cmd: if %REMOVE_XAMARIN%==1 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')) #Pthread-Win32 @@ -157,6 +177,9 @@ install: - cmd: if %ARCH%==x64-msvc15 call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" - cmd: if %ARCH%==win32-msvc16 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars32.bat" - cmd: if %ARCH%==x64-msvc16 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" + - cmd: if %ARCH%==win32-msvc17 call "C:\Program Files (x86)\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars32.bat" + - cmd: if %ARCH%==x64-msvc17 call "C:\Program Files (x86)\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat" + - cmd: echo "Generator='%CMAKE_GENERATOR%'" - cmd: echo "Platform='%Platform%'" # - cmd: set PYTHONPATH=%PYTHONPATH% From 9bf91af02c855282a101bdeb6ecabe56aa88005f Mon Sep 17 00:00:00 2001 From: Mateusz Nabywaniec Date: Mon, 17 Apr 2023 13:37:46 +0200 Subject: [PATCH 07/14] Fix check if perform old version patch --- appveyor.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index cf7f93e..c65b3e7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -132,12 +132,14 @@ environment: MSVCABR: "14" VC_VER: 14.0 init: + # Set variable if perform old msvc patch and remove xamarin + - cmd: set OLD_VERSION_PATCH=0 + - cmd: if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2017" if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2019" if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2022" set OLD_VERSION_PATCH=1 + # go to hell Xamarin (see http://help.appveyor.com/discussions/problems/4569) - - cmd: set REMOVE_XAMARIN=0 - - cmd: if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2017" if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2019" if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2022" set REMOVE_XAMARIN=1 - - cmd: if %REMOVE_XAMARIN%==1 del "C:\Program Files (x86)\MSBuild\4.0\Microsoft.Common.Targets\ImportAfter\Xamarin.Common.targets" - - cmd: if %REMOVE_XAMARIN%==1 del "C:\Program Files (x86)\MSBuild\14.0\Microsoft.Common.targets\ImportAfter\Xamarin.Common.targets" - - cmd: if %REMOVE_XAMARIN%==1 del "C:\Program Files (x86)\MSBuild\12.0\Microsoft.Common.targets\ImportAfter\Xamarin.Common.targets" + - cmd: if %OLD_VERSION_PATCH%==1 del "C:\Program Files (x86)\MSBuild\4.0\Microsoft.Common.Targets\ImportAfter\Xamarin.Common.targets" + - cmd: if %OLD_VERSION_PATCH%==1 del "C:\Program Files (x86)\MSBuild\14.0\Microsoft.Common.targets\ImportAfter\Xamarin.Common.targets" + - cmd: if %OLD_VERSION_PATCH%==1 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')) #Pthread-Win32 @@ -148,11 +150,11 @@ init: - cmd: 7z -y x pthreads-w32-2-9-1-release.zip -oC:\projects\pthreads-win32-src\ #VS2008 patch - cmd: cd "C:\projects\" - - cmd: if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2017" if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2019" appveyor DownloadFile https://github.com/menpo/condaci/raw/master/vs2008_patch.zip - - cmd: if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2017" if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2019" 7z -y x vs2008_patch.zip -oC:\projects\vs2008_patch\ + - cmd: if %OLD_VERSION_PATCH%==1 appveyor DownloadFile https://github.com/menpo/condaci/raw/master/vs2008_patch.zip + - cmd: if %OLD_VERSION_PATCH%==1 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: if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2017" if "%APPVEYOR_BUILD_WORKER_IMAGE%" NEQ "Visual Studio 2019" 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: if %OLD_VERSION_PATCH%==1 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\Pthread_WIN32" install: From c5fa1b6fb154c93390722217b0c27a18a24039b3 Mon Sep 17 00:00:00 2001 From: Mateusz Nabywaniec Date: Mon, 17 Apr 2023 13:46:22 +0200 Subject: [PATCH 08/14] Check visual studio versions --- appveyor.yml | 237 ++++++++++++++++++++++++++------------------------- 1 file changed, 120 insertions(+), 117 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index c65b3e7..4d02435 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,15 +5,15 @@ version: 1.0.{build} environment: matrix: - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 - platform: win32 - ARCH: win32-msvc17 - configuration: Release - CMAKE_GENERATOR: "Visual Studio 17 2022" - MSVCVERSION: v143 - MSVCYEAR: "vs2022" - MSVCABR: "17" - VC_VER: 17.0 + # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 + # platform: win32 + # ARCH: win32-msvc17 + # configuration: Release + # CMAKE_GENERATOR: "Visual Studio 17 2022" + # MSVCVERSION: v143 + # MSVCYEAR: "vs2022" + # MSVCABR: "17" + # VC_VER: 17.0 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 platform: x64 ARCH: x64-msvc17 @@ -23,114 +23,114 @@ environment: MSVCYEAR: "vs2022" MSVCABR: "17" VC_VER: 17.0 - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - platform: win32 - ARCH: win32-msvc16 - configuration: Release - CMAKE_GENERATOR: "Visual Studio 16 2019" - MSVCVERSION: v142 - MSVCYEAR: "vs2019" - MSVCABR: "16" - VC_VER: 16.0 - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - platform: x64 - ARCH: x64-msvc16 - configuration: Release - CMAKE_GENERATOR: "Visual Studio 16 2019 Win64" - MSVCVERSION: v142 - MSVCYEAR: "vs2019" - MSVCABR: "16" - VC_VER: 16.0 - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - platform: win32 - ARCH: win32-msvc15 - configuration: Release - CMAKE_GENERATOR: "Visual Studio 15 2017" - MSVCVERSION: v141 - MSVCYEAR: "vs2017" - MSVCABR: "15" - VC_VER: 15.0 - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - platform: x64 - ARCH: x64-msvc15 - configuration: Release - CMAKE_GENERATOR: "Visual Studio 15 2017 Win64" - MSVCVERSION: v141 - MSVCYEAR: "vs2017" - MSVCABR: "15" - VC_VER: 15.0 - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - platform: win32 - ARCH: win32-msvc9 - configuration: Release - CMAKE_GENERATOR: "Visual Studio 9 2008" - MSVCVERSION: v90 - MSVCYEAR: "vs2008" - MSVCABR: "9" - VC_VER: 9.0 - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - platform: x64 - ARCH: x64-msvc9 - configuration: Release - CMAKE_GENERATOR: "Visual Studio 9 2008 Win64" - MSVCVERSION: v90 - MSVCYEAR: "vs2008" - MSVCABR: "9" - VC_VER: 9.0 - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - platform: win32 - ARCH: win32-msvc10 - configuration: Release - CMAKE_GENERATOR: "Visual Studio 10 2010" - MSVCVERSION: v100 - MSVCYEAR: "vs2010" - MSVCABR: "10" - VC_VER: 10.0 - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - platform: x64 - ARCH: x64-msvc10 - configuration: Release - CMAKE_GENERATOR: "Visual Studio 10 2010 Win64" - MSVCVERSION: v100 - MSVCYEAR: "vs2010" - MSVCABR: "10" - VC_VER: 10.0 - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - platform: win32 - ARCH: win32-msvc12 - configuration: Release - CMAKE_GENERATOR: "Visual Studio 12 2013" - MSVCVERSION: v120 - MSVCYEAR: "vs2013" - MSVCABR: "13" - VC_VER: 13.0 - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - platform: x64 - ARCH: x64-msvc12 - configuration: Release - CMAKE_GENERATOR: "Visual Studio 12 2013 Win64" - MSVCVERSION: v120 - MSVCYEAR: "vs2013" - MSVCABR: "13" - VC_VER: 13.0 - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - platform: win32 - ARCH: win32-msvc14 - configuration: Release - CMAKE_GENERATOR: "Visual Studio 14 2015" - MSVCVERSION: v140 - MSVCYEAR: "vs2015" - MSVCABR: "14" - VC_VER: 14.0 - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - platform: x64 - ARCH: x64-msvc14 - configuration: Release - CMAKE_GENERATOR: "Visual Studio 14 2015 Win64" - MSVCVERSION: v140 - MSVCYEAR: "vs2015" - MSVCABR: "14" - VC_VER: 14.0 + # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + # platform: win32 + # ARCH: win32-msvc16 + # configuration: Release + # CMAKE_GENERATOR: "Visual Studio 16 2019" + # MSVCVERSION: v142 + # MSVCYEAR: "vs2019" + # MSVCABR: "16" + # VC_VER: 16.0 + # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + # platform: x64 + # ARCH: x64-msvc16 + # configuration: Release + # CMAKE_GENERATOR: "Visual Studio 16 2019 Win64" + # MSVCVERSION: v142 + # MSVCYEAR: "vs2019" + # MSVCABR: "16" + # VC_VER: 16.0 + # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + # platform: win32 + # ARCH: win32-msvc15 + # configuration: Release + # CMAKE_GENERATOR: "Visual Studio 15 2017" + # MSVCVERSION: v141 + # MSVCYEAR: "vs2017" + # MSVCABR: "15" + # VC_VER: 15.0 + # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + # platform: x64 + # ARCH: x64-msvc15 + # configuration: Release + # CMAKE_GENERATOR: "Visual Studio 15 2017 Win64" + # MSVCVERSION: v141 + # MSVCYEAR: "vs2017" + # MSVCABR: "15" + # VC_VER: 15.0 + # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + # platform: win32 + # ARCH: win32-msvc9 + # configuration: Release + # CMAKE_GENERATOR: "Visual Studio 9 2008" + # MSVCVERSION: v90 + # MSVCYEAR: "vs2008" + # MSVCABR: "9" + # VC_VER: 9.0 + # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + # platform: x64 + # ARCH: x64-msvc9 + # configuration: Release + # CMAKE_GENERATOR: "Visual Studio 9 2008 Win64" + # MSVCVERSION: v90 + # MSVCYEAR: "vs2008" + # MSVCABR: "9" + # VC_VER: 9.0 + # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + # platform: win32 + # ARCH: win32-msvc10 + # configuration: Release + # CMAKE_GENERATOR: "Visual Studio 10 2010" + # MSVCVERSION: v100 + # MSVCYEAR: "vs2010" + # MSVCABR: "10" + # VC_VER: 10.0 + # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + # platform: x64 + # ARCH: x64-msvc10 + # configuration: Release + # CMAKE_GENERATOR: "Visual Studio 10 2010 Win64" + # MSVCVERSION: v100 + # MSVCYEAR: "vs2010" + # MSVCABR: "10" + # VC_VER: 10.0 + # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + # platform: win32 + # ARCH: win32-msvc12 + # configuration: Release + # CMAKE_GENERATOR: "Visual Studio 12 2013" + # MSVCVERSION: v120 + # MSVCYEAR: "vs2013" + # MSVCABR: "13" + # VC_VER: 13.0 + # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + # platform: x64 + # ARCH: x64-msvc12 + # configuration: Release + # CMAKE_GENERATOR: "Visual Studio 12 2013 Win64" + # MSVCVERSION: v120 + # MSVCYEAR: "vs2013" + # MSVCABR: "13" + # VC_VER: 13.0 + # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + # platform: win32 + # ARCH: win32-msvc14 + # configuration: Release + # CMAKE_GENERATOR: "Visual Studio 14 2015" + # MSVCVERSION: v140 + # MSVCYEAR: "vs2015" + # MSVCABR: "14" + # VC_VER: 14.0 + # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + # platform: x64 + # ARCH: x64-msvc14 + # configuration: Release + # CMAKE_GENERATOR: "Visual Studio 14 2015 Win64" + # MSVCVERSION: v140 + # MSVCYEAR: "vs2015" + # MSVCABR: "14" + # VC_VER: 14.0 init: # Set variable if perform old msvc patch and remove xamarin - cmd: set OLD_VERSION_PATCH=0 @@ -158,6 +158,9 @@ init: - cmd: cd "C:\projects\Pthread_WIN32" install: + - cmd: echo "Check Microsoft Visual Studio versions" + - cmd: dir "C:\Program Files (x86)\Microsoft Visual Studio" + - cmd: dir "C:\Program Files\Microsoft Visual Studio" - cmd: cd "C:\projects\Pthread_WIN32" - cmd: md bin - cmd: md lib From 01516b535c3304d6fa97e3eaa8b0dadd7fcdd103 Mon Sep 17 00:00:00 2001 From: Mateusz Nabywaniec Date: Mon, 17 Apr 2023 13:51:39 +0200 Subject: [PATCH 09/14] Modify path to 2022 visual studio --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 4d02435..c969f73 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -183,7 +183,7 @@ install: - cmd: if %ARCH%==win32-msvc16 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars32.bat" - cmd: if %ARCH%==x64-msvc16 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" - cmd: if %ARCH%==win32-msvc17 call "C:\Program Files (x86)\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars32.bat" - - cmd: if %ARCH%==x64-msvc17 call "C:\Program Files (x86)\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat" + - cmd: if %ARCH%==x64-msvc17 call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat" - cmd: echo "Generator='%CMAKE_GENERATOR%'" - cmd: echo "Platform='%Platform%'" From 54e1b8ec7f4dfc6fecf1d5069f29ef827743f469 Mon Sep 17 00:00:00 2001 From: Mateusz Nabywaniec Date: Mon, 17 Apr 2023 14:19:50 +0200 Subject: [PATCH 10/14] Add move makefile command --- appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index c969f73..5eb6d53 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -204,6 +204,8 @@ build_script: - cmd: if %ARCH%==win32-msvc15 move /Y C:\projects\Pthread_WIN32\Makefile C:\projects\pthreads-win32-src\pthreads.2\Makefile - cmd: if %ARCH%==x64-msvc16 move /Y C:\projects\Pthread_WIN32\Makefile C:\projects\pthreads-win32-src\pthreads.2\Makefile - cmd: if %ARCH%==win32-msvc16 move /Y C:\projects\Pthread_WIN32\Makefile C:\projects\pthreads-win32-src\pthreads.2\Makefile + - cmd: if %ARCH%==x64-msvc17 move /Y C:\projects\Pthread_WIN32\Makefile C:\projects\pthreads-win32-src\pthreads.2\Makefile + - cmd: if %ARCH%==win32-msvc17 move /Y C:\projects\Pthread_WIN32\Makefile C:\projects\pthreads-win32-src\pthreads.2\Makefile - cmd: type "C:\projects\pthreads-win32-src\pthreads.2\Makefile" - cmd: cd C:/projects/pthreads-win32-src/pthreads.2 From a1e39251dc44b8eaddc80e7e4e643f7a0ea2b49a Mon Sep 17 00:00:00 2001 From: Mateusz Nabywaniec Date: Mon, 17 Apr 2023 14:25:24 +0200 Subject: [PATCH 11/14] Uncomment msvc 2022 x32 env --- appveyor.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 5eb6d53..4cb573a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,15 +5,15 @@ version: 1.0.{build} environment: matrix: - # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 - # platform: win32 - # ARCH: win32-msvc17 - # configuration: Release - # CMAKE_GENERATOR: "Visual Studio 17 2022" - # MSVCVERSION: v143 - # MSVCYEAR: "vs2022" - # MSVCABR: "17" - # VC_VER: 17.0 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 + platform: win32 + ARCH: win32-msvc17 + configuration: Release + CMAKE_GENERATOR: "Visual Studio 17 2022" + MSVCVERSION: v143 + MSVCYEAR: "vs2022" + MSVCABR: "17" + VC_VER: 17.0 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 platform: x64 ARCH: x64-msvc17 From 5dba7ef0ec8d2cda024dd08e3e76d2f4bd8d62d9 Mon Sep 17 00:00:00 2001 From: Mateusz Nabywaniec Date: Mon, 17 Apr 2023 14:32:28 +0200 Subject: [PATCH 12/14] Fix path to vcvars --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 4cb573a..32ff57e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -182,7 +182,7 @@ install: - cmd: if %ARCH%==x64-msvc15 call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" - cmd: if %ARCH%==win32-msvc16 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars32.bat" - cmd: if %ARCH%==x64-msvc16 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" - - cmd: if %ARCH%==win32-msvc17 call "C:\Program Files (x86)\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars32.bat" + - cmd: if %ARCH%==win32-msvc17 call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars32.bat" - cmd: if %ARCH%==x64-msvc17 call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat" - cmd: echo "Generator='%CMAKE_GENERATOR%'" From a3450cc22075839d0f58467fd7d917fe3eb33a88 Mon Sep 17 00:00:00 2001 From: Mateusz Nabywaniec Date: Mon, 17 Apr 2023 14:38:11 +0200 Subject: [PATCH 13/14] Remove commented envs --- appveyor.yml | 220 +++++++++++++++++++++++++-------------------------- 1 file changed, 108 insertions(+), 112 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 32ff57e..f4fde93 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -23,114 +23,114 @@ environment: MSVCYEAR: "vs2022" MSVCABR: "17" VC_VER: 17.0 - # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - # platform: win32 - # ARCH: win32-msvc16 - # configuration: Release - # CMAKE_GENERATOR: "Visual Studio 16 2019" - # MSVCVERSION: v142 - # MSVCYEAR: "vs2019" - # MSVCABR: "16" - # VC_VER: 16.0 - # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - # platform: x64 - # ARCH: x64-msvc16 - # configuration: Release - # CMAKE_GENERATOR: "Visual Studio 16 2019 Win64" - # MSVCVERSION: v142 - # MSVCYEAR: "vs2019" - # MSVCABR: "16" - # VC_VER: 16.0 - # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - # platform: win32 - # ARCH: win32-msvc15 - # configuration: Release - # CMAKE_GENERATOR: "Visual Studio 15 2017" - # MSVCVERSION: v141 - # MSVCYEAR: "vs2017" - # MSVCABR: "15" - # VC_VER: 15.0 - # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - # platform: x64 - # ARCH: x64-msvc15 - # configuration: Release - # CMAKE_GENERATOR: "Visual Studio 15 2017 Win64" - # MSVCVERSION: v141 - # MSVCYEAR: "vs2017" - # MSVCABR: "15" - # VC_VER: 15.0 - # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - # platform: win32 - # ARCH: win32-msvc9 - # configuration: Release - # CMAKE_GENERATOR: "Visual Studio 9 2008" - # MSVCVERSION: v90 - # MSVCYEAR: "vs2008" - # MSVCABR: "9" - # VC_VER: 9.0 - # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - # platform: x64 - # ARCH: x64-msvc9 - # configuration: Release - # CMAKE_GENERATOR: "Visual Studio 9 2008 Win64" - # MSVCVERSION: v90 - # MSVCYEAR: "vs2008" - # MSVCABR: "9" - # VC_VER: 9.0 - # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - # platform: win32 - # ARCH: win32-msvc10 - # configuration: Release - # CMAKE_GENERATOR: "Visual Studio 10 2010" - # MSVCVERSION: v100 - # MSVCYEAR: "vs2010" - # MSVCABR: "10" - # VC_VER: 10.0 - # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - # platform: x64 - # ARCH: x64-msvc10 - # configuration: Release - # CMAKE_GENERATOR: "Visual Studio 10 2010 Win64" - # MSVCVERSION: v100 - # MSVCYEAR: "vs2010" - # MSVCABR: "10" - # VC_VER: 10.0 - # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - # platform: win32 - # ARCH: win32-msvc12 - # configuration: Release - # CMAKE_GENERATOR: "Visual Studio 12 2013" - # MSVCVERSION: v120 - # MSVCYEAR: "vs2013" - # MSVCABR: "13" - # VC_VER: 13.0 - # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - # platform: x64 - # ARCH: x64-msvc12 - # configuration: Release - # CMAKE_GENERATOR: "Visual Studio 12 2013 Win64" - # MSVCVERSION: v120 - # MSVCYEAR: "vs2013" - # MSVCABR: "13" - # VC_VER: 13.0 - # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - # platform: win32 - # ARCH: win32-msvc14 - # configuration: Release - # CMAKE_GENERATOR: "Visual Studio 14 2015" - # MSVCVERSION: v140 - # MSVCYEAR: "vs2015" - # MSVCABR: "14" - # VC_VER: 14.0 - # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - # platform: x64 - # ARCH: x64-msvc14 - # configuration: Release - # CMAKE_GENERATOR: "Visual Studio 14 2015 Win64" - # MSVCVERSION: v140 - # MSVCYEAR: "vs2015" - # MSVCABR: "14" - # VC_VER: 14.0 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + platform: win32 + ARCH: win32-msvc16 + configuration: Release + CMAKE_GENERATOR: "Visual Studio 16 2019" + MSVCVERSION: v142 + MSVCYEAR: "vs2019" + MSVCABR: "16" + VC_VER: 16.0 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + platform: x64 + ARCH: x64-msvc16 + configuration: Release + CMAKE_GENERATOR: "Visual Studio 16 2019 Win64" + MSVCVERSION: v142 + MSVCYEAR: "vs2019" + MSVCABR: "16" + VC_VER: 16.0 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + platform: win32 + ARCH: win32-msvc15 + configuration: Release + CMAKE_GENERATOR: "Visual Studio 15 2017" + MSVCVERSION: v141 + MSVCYEAR: "vs2017" + MSVCABR: "15" + VC_VER: 15.0 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + platform: x64 + ARCH: x64-msvc15 + configuration: Release + CMAKE_GENERATOR: "Visual Studio 15 2017 Win64" + MSVCVERSION: v141 + MSVCYEAR: "vs2017" + MSVCABR: "15" + VC_VER: 15.0 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + platform: win32 + ARCH: win32-msvc9 + configuration: Release + CMAKE_GENERATOR: "Visual Studio 9 2008" + MSVCVERSION: v90 + MSVCYEAR: "vs2008" + MSVCABR: "9" + VC_VER: 9.0 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + platform: x64 + ARCH: x64-msvc9 + configuration: Release + CMAKE_GENERATOR: "Visual Studio 9 2008 Win64" + MSVCVERSION: v90 + MSVCYEAR: "vs2008" + MSVCABR: "9" + VC_VER: 9.0 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + platform: win32 + ARCH: win32-msvc10 + configuration: Release + CMAKE_GENERATOR: "Visual Studio 10 2010" + MSVCVERSION: v100 + MSVCYEAR: "vs2010" + MSVCABR: "10" + VC_VER: 10.0 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + platform: x64 + ARCH: x64-msvc10 + configuration: Release + CMAKE_GENERATOR: "Visual Studio 10 2010 Win64" + MSVCVERSION: v100 + MSVCYEAR: "vs2010" + MSVCABR: "10" + VC_VER: 10.0 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + platform: win32 + ARCH: win32-msvc12 + configuration: Release + CMAKE_GENERATOR: "Visual Studio 12 2013" + MSVCVERSION: v120 + MSVCYEAR: "vs2013" + MSVCABR: "13" + VC_VER: 13.0 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + platform: x64 + ARCH: x64-msvc12 + configuration: Release + CMAKE_GENERATOR: "Visual Studio 12 2013 Win64" + MSVCVERSION: v120 + MSVCYEAR: "vs2013" + MSVCABR: "13" + VC_VER: 13.0 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + platform: win32 + ARCH: win32-msvc14 + configuration: Release + CMAKE_GENERATOR: "Visual Studio 14 2015" + MSVCVERSION: v140 + MSVCYEAR: "vs2015" + MSVCABR: "14" + VC_VER: 14.0 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + platform: x64 + ARCH: x64-msvc14 + configuration: Release + CMAKE_GENERATOR: "Visual Studio 14 2015 Win64" + MSVCVERSION: v140 + MSVCYEAR: "vs2015" + MSVCABR: "14" + VC_VER: 14.0 init: # Set variable if perform old msvc patch and remove xamarin - cmd: set OLD_VERSION_PATCH=0 @@ -158,9 +158,6 @@ init: - cmd: cd "C:\projects\Pthread_WIN32" install: - - cmd: echo "Check Microsoft Visual Studio versions" - - cmd: dir "C:\Program Files (x86)\Microsoft Visual Studio" - - cmd: dir "C:\Program Files\Microsoft Visual Studio" - cmd: cd "C:\projects\Pthread_WIN32" - cmd: md bin - cmd: md lib @@ -187,7 +184,6 @@ install: - cmd: echo "Generator='%CMAKE_GENERATOR%'" - cmd: echo "Platform='%Platform%'" - # - cmd: set PYTHONPATH=%PYTHONPATH% - cmd: set ARCH=%ARCH% clone_folder: C:\projects\Pthread_WIN32 From edddc4fcd444dc9ace9158443ca1c0e5a646225e Mon Sep 17 00:00:00 2001 From: Mateusz Nabywaniec Date: Mon, 17 Apr 2023 15:14:48 +0200 Subject: [PATCH 14/14] Add tag variable --- appveyor.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f4fde93..07f6c69 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,6 +4,7 @@ version: 1.0.{build} # - master environment: + TAG: "2.9.2" matrix: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 platform: win32 @@ -233,9 +234,9 @@ build_script: after_build: - cmd: cd "C:/projects/Pthread_WIN32" # Generating zip - - cmd: 7z a pthreads-win32-2.9.1_%ARCH%.zip C:/projects/Pthread_WIN32\bin\ - - cmd: 7z a pthreads-win32-2.9.1_%ARCH%.zip C:/projects/Pthread_WIN32\lib\ - - cmd: 7z a pthreads-win32-2.9.1_%ARCH%.zip C:/projects/Pthread_WIN32\include\ + - cmd: 7z a pthreads-win32-%TAG%_%ARCH%.zip C:/projects/Pthread_WIN32\bin\ + - cmd: 7z a pthreads-win32-%TAG%_%ARCH%.zip C:/projects/Pthread_WIN32\lib\ + - cmd: 7z a pthreads-win32-%TAG%_%ARCH%.zip C:/projects/Pthread_WIN32\include\ on_finish: