xserver: Branch 'master' - 5 commits

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Fri Apr 19 21:11:33 UTC 2019 

 .appveyor.yml |   63 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 57 insertions(+), 6 deletions(-)

New commits:
commit 9c7ebf259f49f5e63906f572a1101747ac023b72
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Sun Sep 17 14:55:04 2017 +0100

    appveyor: Use ccache
    
    Reduces i686 cygwin no-change build time from ~7 minutes to ~2.5 minutes

diff --git a/.appveyor.yml b/.appveyor.yml
index 2945a8edf..dd244b8db 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -5,18 +5,22 @@ version: '{build}'
 skip_tags: true
 clone_depth: 8
 environment:
+  APPVEYOR_SAVE_CACHE_ON_ERROR: true
   CYGWIN_MIRROR: http://cygwin.mirror.constant.com
   CACHE: C:\cache
   matrix:
   - BUILD: i686-pc-cygwin
+    CYGWIN_ROOT: C:\cygwin
+    SETUP: setup-x86.exe
   - BUILD: x86_64-pc-cygwin
+    CYGWIN_ROOT: C:\cygwin64
+    SETUP: setup-x86_64.exe
 install:
-- if "%BUILD%"=="x86_64-pc-cygwin" set SETUP=setup-x86_64.exe && set CYGWIN_ROOT=C:\cygwin64
-- if "%BUILD%"=="i686-pc-cygwin" set SETUP=setup-x86.exe && set CYGWIN_ROOT=C:\cygwin
 - echo Updating Cygwin and installing build prerequisites
 - "%CYGWIN_ROOT%\\%SETUP% -qnNdO -R %CYGWIN_ROOT% -s %CYGWIN_MIRROR% -l %CACHE% -g -P \
 binutils,\
 bison,\
+ccache,\
 flex,\
 gcc-core,\
 meson,\
@@ -66,11 +70,13 @@ xtrans"
 - echo Install done
 cache:
 - C:\cache
+- '%CYGWIN_ROOT%\home\%USERNAME%\.ccache'
 build_script:
 - SET PATH=%CYGWIN_ROOT%/bin
 - '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; meson setup --prefix=/usr -Dxv=false -Dxf86bigfont=true -Ddmx=true -Dxephyr=true -Dxnest=true -Dxvfb=true -Dxwin=true -Dxorg=true -Dhal=false -Dudev=false -Dpciaccess=false -Dint10=false build"'
 - '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; meson configure build"'
 - '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; ninja -C build"'
+- '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; ccache -s"'
 test_script:
 - '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; ninja -C build test"'
 after_test:
commit 16d851375994332844fd434ed91fc6c0c24f8983
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Thu Apr 18 12:44:40 2019 +0100

    appveyor: Drop cleaning of packaged libtool .la files
    
    Not needed as meson doesn't use libtool.  I think they've all been
    rebuilt now, in any case...

diff --git a/.appveyor.yml b/.appveyor.yml
index d39cd031d..2945a8edf 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -13,7 +13,6 @@ environment:
 install:
 - if "%BUILD%"=="x86_64-pc-cygwin" set SETUP=setup-x86_64.exe && set CYGWIN_ROOT=C:\cygwin64
 - if "%BUILD%"=="i686-pc-cygwin" set SETUP=setup-x86.exe && set CYGWIN_ROOT=C:\cygwin
-- curl -fsSL https://gist.githubusercontent.com/jon-turney/0338af595313f598bfab15a0ac0df847/raw/bd0eeca6be899e7846aa988fbcf15e4e12f5f842/zp_libtool_cleanlafiles.sh -o %CYGWIN_ROOT%\etc\postinstall\zp_libtool_cleanlafiles.sh
 - echo Updating Cygwin and installing build prerequisites
 - "%CYGWIN_ROOT%\\%SETUP% -qnNdO -R %CYGWIN_ROOT% -s %CYGWIN_MIRROR% -l %CACHE% -g -P \
 binutils,\
commit f3e6002d79aa51633ef06e34c2b13553ae008218
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Thu Apr 18 12:01:54 2019 +0100

    appveyor: Drop trying to preserve build artefacts
    
    We stopped staging them in 1519475a, so this did nothing.

diff --git a/.appveyor.yml b/.appveyor.yml
index 14b1a64a1..d39cd031d 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -76,6 +76,4 @@ test_script:
 - '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; ninja -C build test"'
 after_test:
 - '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; ninja -C build install"'
-artifacts:
-- path: staging
 deploy: off
commit 883530835d463124fcc9bc6143ef139819f6c981
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Thu Apr 18 12:07:34 2019 +0100

    appveyor: Drop installing unnecessary packages
    
    Drop installing packages which were used by the autotools build (or
    maybe even monolithic build!) but are no longer required by the meson
    build
    
    Also, alphabetically sort within tools, protocol headers, devel
    libraries, miscellaneous groups to match [1]
    
    [1] https://x.cygwin.com/docs/cg/prog-build-prerequisites.html
    
    Also, update to require xkbcomp-devel, split from xkbcomp

diff --git a/.appveyor.yml b/.appveyor.yml
index 450e4c27b..14b1a64a1 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -16,29 +16,24 @@ install:
 - curl -fsSL https://gist.githubusercontent.com/jon-turney/0338af595313f598bfab15a0ac0df847/raw/bd0eeca6be899e7846aa988fbcf15e4e12f5f842/zp_libtool_cleanlafiles.sh -o %CYGWIN_ROOT%\etc\postinstall\zp_libtool_cleanlafiles.sh
 - echo Updating Cygwin and installing build prerequisites
 - "%CYGWIN_ROOT%\\%SETUP% -qnNdO -R %CYGWIN_ROOT% -s %CYGWIN_MIRROR% -l %CACHE% -g -P \
-meson,\
 binutils,\
 bison,\
-bzip2,\
-diffutils,\
-fileutils,\
-findutils,\
 flex,\
-gawk,\
 gcc-core,\
-make,\
-patch,\
+meson,\
+ninja,\
 pkg-config,\
 python3,\
-sed,\
-tar,\
-xorgproto,\
 windowsdriproto,\
+xorgproto,\
 libdmx-devel,\
+libepoxy-devel,\
 libfontenc-devel,\
 libfreetype-devel,\
 libGL-devel,\
+libnettle-devel,\
 libpixman1-devel,\
+libtirpc-devel,\
 libX11-devel,\
 libXRes-devel,\
 libXau-devel,\
@@ -63,17 +58,12 @@ libxcb-shape-devel,\
 libxcb-util-devel,\
 libxcb-xkb-devel,\
 libxkbfile-devel,\
-zlib,\
 font-util,\
 khronos-opengl-registry,\
 python3-lxml,\
-xorg-util-macros,\
-xtrans,\
-xkbcomp,\
+xkbcomp-devel,\
 xkeyboard-config,\
-libnettle-devel,\
-libepoxy-devel,\
-libtirpc-devel"
+xtrans"
 - echo Install done
 cache:
 - C:\cache
commit 6370cf026ae0d752b0f28d4a25fd22c60fea26f0
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Wed Aug 8 17:29:55 2018 +0100

    appveyor: Reformat an absurdly long line in .appveyor.yml
    
    Using YAML line-folding doesn't seem possible, as setup doesn't tolerate
    spaces between package names, so instead drop some unneeded double quotes,
    double quote the whole thing and escape newlines

diff --git a/.appveyor.yml b/.appveyor.yml
index e81261038..450e4c27b 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -15,7 +15,65 @@ install:
 - if "%BUILD%"=="i686-pc-cygwin" set SETUP=setup-x86.exe && set CYGWIN_ROOT=C:\cygwin
 - curl -fsSL https://gist.githubusercontent.com/jon-turney/0338af595313f598bfab15a0ac0df847/raw/bd0eeca6be899e7846aa988fbcf15e4e12f5f842/zp_libtool_cleanlafiles.sh -o %CYGWIN_ROOT%\etc\postinstall\zp_libtool_cleanlafiles.sh
 - echo Updating Cygwin and installing build prerequisites
-- '%CYGWIN_ROOT%\%SETUP% -qnNdO -R "%CYGWIN_ROOT%" -s "%CYGWIN_MIRROR%" -l "%CACHE%" -g -P "meson,binutils,bison,bzip2,diffutils,fileutils,findutils,flex,gawk,gcc-core,make,patch,pkg-config,python3,sed,tar,xorgproto,windowsdriproto,libdmx-devel,libfontenc-devel,libfreetype-devel,libGL-devel,libpixman1-devel,libX11-devel,libXRes-devel,libXau-devel,libXaw-devel,libXdmcp-devel,libXext-devel,libXfont2-devel,libXi-devel,libXinerama-devel,libXmu-devel,libXpm-devel,libXrender-devel,libXtst-devel,libxcb-ewmh-devel,libxcb-icccm-devel,libxcb-image-devel,libxcb-keysyms-devel,libxcb-randr-devel,libxcb-render-devel,libxcb-render-util-devel,libxcb-shape-devel,libxcb-util-devel,libxcb-xkb-devel,libxkbfile-devel,zlib,font-util,khronos-opengl-registry,python3-lxml,xorg-util-macros,xtrans,xkbcomp,xkeyboard-config,libnettle-devel,libepoxy-devel,libtirpc-devel"'
+- "%CYGWIN_ROOT%\\%SETUP% -qnNdO -R %CYGWIN_ROOT% -s %CYGWIN_MIRROR% -l %CACHE% -g -P \
+meson,\
+binutils,\
+bison,\
+bzip2,\
+diffutils,\
+fileutils,\
+findutils,\
+flex,\
+gawk,\
+gcc-core,\
+make,\
+patch,\
+pkg-config,\
+python3,\
+sed,\
+tar,\
+xorgproto,\
+windowsdriproto,\
+libdmx-devel,\
+libfontenc-devel,\
+libfreetype-devel,\
+libGL-devel,\
+libpixman1-devel,\
+libX11-devel,\
+libXRes-devel,\
+libXau-devel,\
+libXaw-devel,\
+libXdmcp-devel,\
+libXext-devel,\
+libXfont2-devel,\
+libXi-devel,\
+libXinerama-devel,\
+libXmu-devel,\
+libXpm-devel,\
+libXrender-devel,\
+libXtst-devel,\
+libxcb-ewmh-devel,\
+libxcb-icccm-devel,\
+libxcb-image-devel,\
+libxcb-keysyms-devel,\
+libxcb-randr-devel,\
+libxcb-render-devel,\
+libxcb-render-util-devel,\
+libxcb-shape-devel,\
+libxcb-util-devel,\
+libxcb-xkb-devel,\
+libxkbfile-devel,\
+zlib,\
+font-util,\
+khronos-opengl-registry,\
+python3-lxml,\
+xorg-util-macros,\
+xtrans,\
+xkbcomp,\
+xkeyboard-config,\
+libnettle-devel,\
+libepoxy-devel,\
+libtirpc-devel"
 - echo Install done
 cache:
 - C:\cache

More information about the xorg-commit mailing list