appveyor: Revert commits adding Cygwin support.
authorJose Fonseca <jfonseca@vmware.com>
Fri, 25 Jan 2019 14:07:43 +0000 (14:07 +0000)
committerJose Fonseca <jfonseca@vmware.com>
Fri, 25 Jan 2019 14:13:26 +0000 (14:13 +0000)
This reverts commits 00ad77b9f683e561b1ac45fbb89eb2bafe45c8c6 and
5334dafee265d78abdfcf30e2c693e0791bfecf5.

This avoids Appveyor build breakage due to Cygwin, but more importantly,
there are several problems with these patches, as highlighted to my
recent mesa-dev mail.  So better to revert for now, and pursue Cygwin
support after these have been address.

appveyor.yml
scripts/appveyor_cygwin.bat [deleted file]
scripts/appveyor_msvc.bat [deleted file]

index 9c6e5acd37037df6d7a63af94dfc7fa28c3ec281..ccb84fd3403fea683c9dc23a752701c7d8000a30 100644 (file)
@@ -38,9 +38,6 @@ cache:
 - '%LOCALAPPDATA%\pip\Cache -> appveyor.yml'
 - win_flex_bison-2.5.15.zip
 - llvm-5.0.1-msvc2017-mtd.7z
 - '%LOCALAPPDATA%\pip\Cache -> appveyor.yml'
 - win_flex_bison-2.5.15.zip
 - llvm-5.0.1-msvc2017-mtd.7z
-- C:\pkgcache
-- 'C:\cygwin64\home\%USERNAME%\.ccache'
-- 'C:\cygwin\home\%USERNAME%\.ccache'
 
 os: Visual Studio 2017
 
 
 os: Visual Studio 2017
 
@@ -50,23 +47,43 @@ init:
 - git config --global core.autocrlf true
 
 environment:
 - git config --global core.autocrlf true
 
 environment:
-  matrix:
-  - compiler: msvc
-    WINFLEXBISON_VERSION: 2.5.15
-    LLVM_ARCHIVE: llvm-5.0.1-msvc2017-mtd.7z
-  - compiler: cygwin
-    arch: x64
+  WINFLEXBISON_VERSION: 2.5.15
+  LLVM_ARCHIVE: llvm-5.0.1-msvc2017-mtd.7z
 
 install:
 
 install:
-- call scripts\appveyor_%compiler%.bat install
+# Check git config
+- git config core.autocrlf
+# Check pip
+- python --version
+- python -m pip --version
+# Install Mako
+- python -m pip install Mako==1.0.7
+# Install pywin32 extensions, needed by SCons
+- python -m pip install pypiwin32
+# Install python wheels, necessary to install SCons via pip
+- python -m pip install wheel
+# Install SCons
+- python -m pip install scons==3.0.1
+- scons --version
+# 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
+# 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
+- mkdir llvm\bin
+- set LLVM=%CD%\llvm
 
 build_script:
 
 build_script:
-- call scripts\appveyor_%compiler%.bat build_script
+- scons -j%NUMBER_OF_PROCESSORS% MSVC_VERSION=14.1 llvm=1
 
 after_build:
 
 after_build:
-- call scripts\appveyor_%compiler%.bat after_build
+- scons -j%NUMBER_OF_PROCESSORS% MSVC_VERSION=14.1 llvm=1 check
 
 
-test: off
 
 # It's possible to setup notification here, as described in
 # http://www.appveyor.com/docs/notifications#appveyor-yml-configuration , but
 
 # 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_cygwin.bat b/scripts/appveyor_cygwin.bat
deleted file mode 100644 (file)
index 831270b..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-set PKGCACHE=C:\pkgcache
-set CYGWIN_MIRROR=http://cygwin.mirror.constant.com
-
-if _%arch%_ == _x64_ set SETUP=setup-x86_64.exe && set CYGWIN_ROOT=C:\cygwin64
-if _%arch%_ == _x86_ set SETUP=setup-x86.exe && set CYGWIN_ROOT=C:\cygwin
-
-set PATH=%CYGWIN_ROOT%\bin;%SYSTEMROOT%\system32
-
-goto %1
-
-:install
-echo Updating Cygwin and installing build prerequsites
-%CYGWIN_ROOT%\%SETUP% -qnNdO -R "%CYGWIN_ROOT%" -s "%CYGWIN_MIRROR%" -l "%PKGCACHE%" -g -P ^
-bison,^
-ccache,^
-flex,^
-glproto,^
-libX11-devel,^
-libX11-xcb-devel,^
-libXdamage-devel,^
-libXext-devel,^
-libXfixes-devel,^
-libexpat-devel,^
-libllvm-devel,^
-libxcb-dri2-devel,^
-libxcb-glx-devel,^
-libxcb-xfixes-devel,^
-meson,^
-ninja,^
-python3-mako,^
-zlib-devel
-goto :eof
-
-:build_script
-bash -lc "cd $APPVEYOR_BUILD_FOLDER; meson _build -Degl=false --wrap-mode=nofallback && ninja -C _build"
-goto :eof
-
-:after_build
-bash -lc "cd $APPVEYOR_BUILD_FOLDER; ninja -C _build test"
-goto :eof
diff --git a/scripts/appveyor_msvc.bat b/scripts/appveyor_msvc.bat
deleted file mode 100644 (file)
index 6a85e83..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-goto %1
-
-:install
-rem Check git config
-git config core.autocrlf
-rem Check pip
-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
-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
-mkdir llvm\bin
-set LLVM=%CD%\llvm
-goto :eof
-
-:build_script
-call scons -j%NUMBER_OF_PROCESSORS% MSVC_VERSION=14.1 llvm=1
-goto :eof
-
-:after_build
-call scons -j%NUMBER_OF_PROCESSORS% MSVC_VERSION=14.1 llvm=1 check
-goto :eof