From 85c1770044830fe2fcfb93c84df342706b7a8f38 Mon Sep 17 00:00:00 2001 From: Jose Fonseca Date: Fri, 19 Mar 2021 20:00:31 +0000 Subject: [PATCH] appveyor: Remove integration. It's only testing SCons w/ MSVC at this moment. Part-of: --- .appveyor/appveyor_msvc.bat | 66 ---------------------------------- .appveyor/llvm-wrap.meson | 36 ------------------- appveyor.yml | 71 ------------------------------------- 3 files changed, 173 deletions(-) delete mode 100644 .appveyor/appveyor_msvc.bat delete mode 100644 .appveyor/llvm-wrap.meson delete mode 100644 appveyor.yml diff --git a/.appveyor/appveyor_msvc.bat b/.appveyor/appveyor_msvc.bat deleted file mode 100644 index c24e980dbe4..00000000000 --- a/.appveyor/appveyor_msvc.bat +++ /dev/null @@ -1,66 +0,0 @@ -goto %1 - -:install -rem Check pip -python --version -python -m pip install --upgrade pip -python -m pip --version -if "%buildsystem%" == "scons" ( - rem Install Mako - python -m pip install Mako==1.1.3 - rem Install pywin32 extensions, needed by SCons - python -m pip install pypiwin32 - rem Install python wheels, necessary to install SCons via pip - python -m pip install wheel - rem Install SCons - python -m pip install scons==3.1.2 - call scons --version -) else ( - python -m pip install Mako meson - meson --version - - rem Install pkg-config, which meson requires even on windows - cinst -y pkgconfiglite -) - -rem Install flex/bison -set WINFLEXBISON_ARCHIVE=win_flex_bison-%WINFLEXBISON_VERSION%.zip -if not exist "%WINFLEXBISON_ARCHIVE%" appveyor DownloadFile "https://github.com/lexxmark/winflexbison/releases/download/v%WINFLEXBISON_VERSION%/%WINFLEXBISON_ARCHIVE%" -7z x -y -owinflexbison\ "%WINFLEXBISON_ARCHIVE%" > nul -set Path=%CD%\winflexbison;%Path% -win_flex --version -win_bison --version -rem Download and extract LLVM -if not exist "%LLVM_ARCHIVE%" appveyor DownloadFile "https://people.freedesktop.org/~jrfonseca/llvm/%LLVM_ARCHIVE%" -7z x -y "%LLVM_ARCHIVE%" > nul -if "%buildsystem%" == "scons" ( - mkdir llvm\bin - set LLVM=%CD%\llvm -) else ( - move llvm subprojects\ - copy .appveyor\llvm-wrap.meson subprojects\llvm\meson.build -) -goto :eof - -:build_script -if "%buildsystem%" == "scons" ( - call scons -j%NUMBER_OF_PROCESSORS% MSVC_VERSION=14.2 machine=x86 llvm=1 -) else ( - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat" -arch=x86 - rem We use default-library as static to affect any wraps (such as expat and zlib) - rem it would be better if we could set subprojects buildtype independently, - rem but I haven't written that patch yet :) - call meson builddir --backend=vs2017 --default-library=static -Dbuild-tests=true -Db_vscrt=mtd --buildtype=release -Dllvm=true -Dgallium-drivers=swrast -Dosmesa=gallium - pushd builddir - call msbuild mesa.sln /m - popd -) -goto :eof - -:test_script -if "%buildsystem%" == "scons" ( - call scons -j%NUMBER_OF_PROCESSORS% MSVC_VERSION=14.2 machine=x86 llvm=1 check -) else ( - call meson test -C builddir -) -goto :eof diff --git a/.appveyor/llvm-wrap.meson b/.appveyor/llvm-wrap.meson deleted file mode 100644 index 34b1e3200fd..00000000000 --- a/.appveyor/llvm-wrap.meson +++ /dev/null @@ -1,36 +0,0 @@ -# A meson.build file for binary wrapping the LLVM used in the appvyeor CI -project('llvm', ['cpp']) - -cpp = meson.get_compiler('cpp') - -_deps = [] -_search = join_paths(meson.current_source_dir(), 'lib') -foreach d : ['LLVMAnalysis', 'LLVMAsmParser', 'LLVMAsmPrinter', - 'LLVMBinaryFormat', 'LLVMBitReader', 'LLVMBitWriter', - 'LLVMCodeGen', 'LLVMCore', 'LLVMCoroutines', 'LLVMCoverage', - 'LLVMDebugInfoCodeView', 'LLVMDebugInfoDWARF', - 'LLVMDebugInfoMSF', 'LLVMDebugInfoPDB', 'LLVMDemangle', - 'LLVMDlltoolDriver', 'LLVMExecutionEngine', 'LLVMGlobalISel', - 'LLVMInstCombine', 'LLVMInstrumentation', 'LLVMInterpreter', - 'LLVMipo', 'LLVMIRReader', 'LLVMLibDriver', 'LLVMLineEditor', - 'LLVMLinker', 'LLVMLTO', 'LLVMMCDisassembler', 'LLVMMCJIT', - 'LLVMMC', 'LLVMMCParser', 'LLVMMIRParser', 'LLVMObjCARCOpts', - 'LLVMObject', 'LLVMObjectYAML', 'LLVMOption', 'LLVMOrcJIT', - 'LLVMPasses', 'LLVMProfileData', 'LLVMRuntimeDyld', - 'LLVMScalarOpts', 'LLVMSelectionDAG', 'LLVMSupport', - 'LLVMSymbolize', 'LLVMTableGen', 'LLVMTarget', - 'LLVMTransformUtils', 'LLVMVectorize', 'LLVMX86AsmParser', - 'LLVMX86AsmPrinter', 'LLVMX86CodeGen', 'LLVMX86Desc', - 'LLVMX86Disassembler', 'LLVMX86Info', 'LLVMX86Utils', - 'LLVMXRay'] - _deps += cpp.find_library(d, dirs : _search) -endforeach - -dep_llvm = declare_dependency( - include_directories : include_directories('include'), - dependencies : _deps, - version : '5.0.1', -) - -has_rtti = false -irbuilder_h = files('include/llvm/IR/IRBuilder.h') diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index f66689ea4bb..00000000000 --- a/appveyor.yml +++ /dev/null @@ -1,71 +0,0 @@ -# http://www.appveyor.com/docs/appveyor-yml -# -# To setup AppVeyor for your own personal repositories do the following: -# - Sign up -# - Add a new project -# - Select Git and fill in the Git clone URL -# - Setup a Git hook as explained in -# https://github.com/appveyor/webhooks#installing-git-hook -# - Check 'Settings > General > Skip branches without appveyor.yml' -# - Check 'Settings > General > Rolling builds' -# - Setup the global or project notifications to your liking -# -# Note that kicking (or restarting) a build via the web UI will not work, as it -# will fail to find appveyor.yml . The Git hook is the most practical way to -# kick a build. -# -# See also: -# - http://help.appveyor.com/discussions/problems/2209-node-grunt-build-specify-a-project-or-solution-file-the-directory-does-not-contain-a-project-or-solution-file -# - http://help.appveyor.com/discussions/questions/1184-build-config-vs-appveyoryaml - -version: '{build}' - -branches: - except: - - /^travis.*$/ - -# Don't download the full Mesa history to speed up cloning. However the clone -# depth must not be too small, otherwise builds might fail when lots of patches -# are committed in succession, because the desired commit is not found on the -# truncated history. -# -# See also: -# - https://www.appveyor.com/blog/2014/06/04/shallow-clone-for-git-repositories -clone_depth: 100 - -# https://www.appveyor.com/docs/build-cache/ -cache: -- '%LOCALAPPDATA%\pip\Cache -> appveyor.yml' -- win_flex_bison-2.5.15.zip -- llvm-5.0.1-msvc2017-mtd.7z -- subprojects\packagecache -> subprojects\*.wrap - -os: Visual Studio 2019 - -init: -# Appveyor defaults core.autocrlf to input instead of the default (true), but -# that can hide problems processing CRLF text on Windows -- git config --global core.autocrlf true - -environment: - Path: C:\Python38-x64;C:\Python38-x64\Scripts;%Path% - WINFLEXBISON_VERSION: 2.5.15 - LLVM_ARCHIVE: llvm-5.0.1-msvc2017-mtd.7z - matrix: - - compiler: msvc - buildsystem: scons - -install: -- cmd: .appveyor\appveyor_msvc.bat install - -build_script: -- cmd: .appveyor\appveyor_msvc.bat build_script - -test_script: -- cmd: .appveyor\appveyor_msvc.bat test_script - -# It's possible to setup notification here, as described in -# http://www.appveyor.com/docs/notifications#appveyor-yml-configuration , but -# doing so would cause the notification settings to be replicated across all -# repos, which is most likely undesired. So it's better to rely on the -# Appveyor global/project notification settings.