appveyor: Move appveyor script into .appveyor directory

This clears out the scripts directory completely

Reviewed-by: Adam Jackson <ajax@redhat.com>

diff --git a/.appveyor/appveyor_msvc.bat b/.appveyor/appveyor_msvc.bat
new file mode 100644 (file)
index 0000000..0f0e1e1
--- /dev/null
+++ b/.appveyor/appveyor_msvc.bat
@@ -0,0 +1,66 @@
+goto %1
+
+:install
+rem Check pip
+if "%buildsystem%" == "scons" (
+    python --version
+    python -m pip --version
+    rem Install Mako
+    python -m pip install Mako==1.0.7
+    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.0.1
+    call scons --version
+) else (
+    python --version
+    python -m pip install Mako==1.0.7 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.1 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
+    pushd builddir
+    call msbuild mesa.sln /m
+    popd
+)
+goto :eof
+
+:test_script
+if "%buildsystem%" == "scons" (
+    call scons -j%NUMBER_OF_PROCESSORS% MSVC_VERSION=14.1 llvm=1 check
+) else (
+    call meson test -C builddir
+)
+goto :eof

diff --git a/appveyor.yml b/appveyor.yml
index 3a2468890d3ff732804334effd88f2f11a6e8685..c31c2630f5547363787eb810183af09052cfcaf0 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -58,13 +58,13 @@ environment:
     path: C:\Python37-x64;C:\Python37-x64\Scripts;%path%
 
 install:
-- cmd: scripts\appveyor_msvc.bat install
+- cmd: .appveyor\appveyor_msvc.bat install
 
 build_script:
-- cmd: scripts\appveyor_msvc.bat build_script
+- cmd: .appveyor\appveyor_msvc.bat build_script
 
 test_script:
-- cmd: scripts\appveyor_msvc.bat 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

diff --git a/scripts/appveyor_msvc.bat b/scripts/appveyor_msvc.bat
deleted file mode 100644 (file)
index 0f0e1e1..0000000
--- a/scripts/appveyor_msvc.bat
+++ /dev/null
@@ -1,66 +0,0 @@
-goto %1
-
-:install
-rem Check pip
-if "%buildsystem%" == "scons" (
-    python --version
-    python -m pip --version
-    rem Install Mako
-    python -m pip install Mako==1.0.7
-    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.0.1
-    call scons --version
-) else (
-    python --version
-    python -m pip install Mako==1.0.7 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.1 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
-    pushd builddir
-    call msbuild mesa.sln /m
-    popd
-)
-goto :eof
-
-:test_script
-if "%buildsystem%" == "scons" (
-    call scons -j%NUMBER_OF_PROCESSORS% MSVC_VERSION=14.1 llvm=1 check
-) else (
-    call meson test -C builddir
-)
-goto :eof