interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into remodel

This commit is contained in:
Pietro Gagliardi 2020-06-07 21:06:50 -04:00
parent 6f4610f82a 4ee9c47ddc
commit 5ca4ccb30b
8 changed files with 56 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
azure-pipelines.yml
View File

@ -23,8 +23,8 @@ jobs:
clean: all clean: all
steps: steps:
- template: azure-pipelines/setup-python3.yml - template: azure-pipelines/setup-python3.yml
- template: azure-pipelines/install-latest-meson.yml - template: azure-pipelines/install-latest-meson-ninja.yml
- template: azure-pipelines/linux-386-install-gtk-dev-ninja.yml - template: azure-pipelines/linux-386-install-gtk-dev.yml
- template: azure-pipelines/configure.yml - template: azure-pipelines/configure.yml
parameters: parameters:
beforeConfigure: export CFLAGS=-m32 CXXFLAGS=-m32 PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig beforeConfigure: export CFLAGS=-m32 CXXFLAGS=-m32 PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig
@ -46,8 +46,8 @@ jobs:
clean: all clean: all
steps: steps:
- template: azure-pipelines/setup-python3.yml - template: azure-pipelines/setup-python3.yml
- template: azure-pipelines/install-latest-meson.yml - template: azure-pipelines/install-latest-meson-ninja.yml
- template: azure-pipelines/linux-386-install-gtk-dev-ninja.yml - template: azure-pipelines/linux-386-install-gtk-dev.yml
- template: azure-pipelines/configure.yml - template: azure-pipelines/configure.yml
parameters: parameters:
beforeConfigure: export CFLAGS=-m32 CXXFLAGS=-m32 PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig beforeConfigure: export CFLAGS=-m32 CXXFLAGS=-m32 PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig
@ -69,8 +69,8 @@ jobs:
clean: all clean: all
steps: steps:
- template: azure-pipelines/setup-python3.yml - template: azure-pipelines/setup-python3.yml
- template: azure-pipelines/install-latest-meson.yml - template: azure-pipelines/install-latest-meson-ninja.yml
- template: azure-pipelines/linux-install-gtk-dev-ninja.yml - template: azure-pipelines/linux-install-gtk-dev.yml
- template: azure-pipelines/configure.yml - template: azure-pipelines/configure.yml
parameters: parameters:
defaultLibrary: shared defaultLibrary: shared
@ -91,8 +91,8 @@ jobs:
clean: all clean: all
steps: steps:
- template: azure-pipelines/setup-python3.yml - template: azure-pipelines/setup-python3.yml
- template: azure-pipelines/install-latest-meson.yml - template: azure-pipelines/install-latest-meson-ninja.yml
- template: azure-pipelines/linux-install-gtk-dev-ninja.yml - template: azure-pipelines/linux-install-gtk-dev.yml
- template: azure-pipelines/configure.yml - template: azure-pipelines/configure.yml
parameters: parameters:
defaultLibrary: static defaultLibrary: static
@ -117,7 +117,7 @@ jobs:
clean: all clean: all
steps: steps:
- template: azure-pipelines/vs2015-install-python3.yml - template: azure-pipelines/vs2015-install-python3.yml
- template: azure-pipelines/install-latest-meson.yml - template: azure-pipelines/install-latest-meson-ninja.yml
- template: azure-pipelines/windows-install-ninja.yml - template: azure-pipelines/windows-install-ninja.yml
- template: azure-pipelines/configure.yml - template: azure-pipelines/configure.yml
parameters: parameters:
@ -143,7 +143,7 @@ jobs:
clean: all clean: all
steps: steps:
- template: azure-pipelines/vs2015-install-python3.yml - template: azure-pipelines/vs2015-install-python3.yml
- template: azure-pipelines/install-latest-meson.yml - template: azure-pipelines/install-latest-meson-ninja.yml
- template: azure-pipelines/windows-install-ninja.yml - template: azure-pipelines/windows-install-ninja.yml
- template: azure-pipelines/configure.yml - template: azure-pipelines/configure.yml
parameters: parameters:
@ -170,7 +170,7 @@ jobs:
clean: all clean: all
steps: steps:
- template: azure-pipelines/vs2015-install-python3.yml - template: azure-pipelines/vs2015-install-python3.yml
- template: azure-pipelines/install-latest-meson.yml - template: azure-pipelines/install-latest-meson-ninja.yml
- template: azure-pipelines/windows-install-ninja.yml - template: azure-pipelines/windows-install-ninja.yml
- template: azure-pipelines/configure.yml - template: azure-pipelines/configure.yml
parameters: parameters:
@ -196,7 +196,7 @@ jobs:
clean: all clean: all
steps: steps:
- template: azure-pipelines/vs2015-install-python3.yml - template: azure-pipelines/vs2015-install-python3.yml
- template: azure-pipelines/install-latest-meson.yml - template: azure-pipelines/install-latest-meson-ninja.yml
- template: azure-pipelines/windows-install-ninja.yml - template: azure-pipelines/windows-install-ninja.yml
- template: azure-pipelines/configure.yml - template: azure-pipelines/configure.yml
parameters: parameters:
@ -227,7 +227,7 @@ jobs:
clean: all clean: all
steps: steps:
- template: azure-pipelines/setup-python3.yml - template: azure-pipelines/setup-python3.yml
- template: azure-pipelines/install-latest-meson.yml - template: azure-pipelines/install-latest-meson-ninja.yml
- template: azure-pipelines/windows-install-ninja.yml - template: azure-pipelines/windows-install-ninja.yml
- template: azure-pipelines/configure.yml - template: azure-pipelines/configure.yml
parameters: parameters:
@ -253,7 +253,7 @@ jobs:
clean: all clean: all
steps: steps:
- template: azure-pipelines/setup-python3.yml - template: azure-pipelines/setup-python3.yml
- template: azure-pipelines/install-latest-meson.yml - template: azure-pipelines/install-latest-meson-ninja.yml
- template: azure-pipelines/windows-install-ninja.yml - template: azure-pipelines/windows-install-ninja.yml
- template: azure-pipelines/configure.yml - template: azure-pipelines/configure.yml
parameters: parameters:
@ -280,7 +280,7 @@ jobs:
clean: all clean: all
steps: steps:
- template: azure-pipelines/setup-python3.yml - template: azure-pipelines/setup-python3.yml
- template: azure-pipelines/install-latest-meson.yml - template: azure-pipelines/install-latest-meson-ninja.yml
- template: azure-pipelines/windows-install-ninja.yml - template: azure-pipelines/windows-install-ninja.yml
- template: azure-pipelines/configure.yml - template: azure-pipelines/configure.yml
parameters: parameters:
@ -306,7 +306,7 @@ jobs:
clean: all clean: all
steps: steps:
- template: azure-pipelines/setup-python3.yml - template: azure-pipelines/setup-python3.yml
- template: azure-pipelines/install-latest-meson.yml - template: azure-pipelines/install-latest-meson-ninja.yml
- template: azure-pipelines/windows-install-ninja.yml - template: azure-pipelines/windows-install-ninja.yml
- template: azure-pipelines/configure.yml - template: azure-pipelines/configure.yml
parameters: parameters:
@ -339,7 +339,7 @@ jobs:
clean: all clean: all
steps: steps:
- template: azure-pipelines/setup-python3.yml - template: azure-pipelines/setup-python3.yml
- template: azure-pipelines/install-latest-meson.yml - template: azure-pipelines/install-latest-meson-ninja.yml
- template: azure-pipelines/darwin-install-ninja.yml - template: azure-pipelines/darwin-install-ninja.yml
- template: azure-pipelines/configure.yml - template: azure-pipelines/configure.yml
parameters: parameters:
@ -361,7 +361,7 @@ jobs:
clean: all clean: all
steps: steps:
- template: azure-pipelines/setup-python3.yml - template: azure-pipelines/setup-python3.yml
- template: azure-pipelines/install-latest-meson.yml - template: azure-pipelines/install-latest-meson-ninja.yml
- template: azure-pipelines/darwin-install-ninja.yml - template: azure-pipelines/darwin-install-ninja.yml
- template: azure-pipelines/configure.yml - template: azure-pipelines/configure.yml
parameters: parameters:

36
azure-pipelines/TODOMatrix
View File

@ -25,7 +25,7 @@ strategy:
libtype: 'shared' libtype: 'shared'
vmImage: 'ubuntu-16.04' vmImage: 'ubuntu-16.04'
python3Template: 'azure-pipelines/setup-python3.yml' python3Template: 'azure-pipelines/setup-python3.yml'
depsAndNinjaTemplate: 'azure-pipelines/linux-386-install-gtk-dev-ninja.yml' depsAndNinjaTemplate: 'azure-pipelines/linux-386-install-gtk-dev.yml'
beforeConfigure: 'export CFLAGS=-m32 CXXFLAGS=-m32 PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig' beforeConfigure: 'export CFLAGS=-m32 CXXFLAGS=-m32 PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig'
artifactTemplate: 'azure-pipelines/artifacts.yml' artifactTemplate: 'azure-pipelines/artifacts.yml'
libfiles: 'libui.so.0' libfiles: 'libui.so.0'
@ -39,7 +39,7 @@ workspace:
steps: steps:
- template: $(variables.python3Template) - template: $(variables.python3Template)
- template: azure-pipelines/install-latest-meson.yml - template: azure-pipelines/install-latest-meson-ninja.yml
- template: $(variables.depsAndNinjaTemplate) - template: $(variables.depsAndNinjaTemplate)
- template: azure-pipelines/configure.yml - template: azure-pipelines/configure.yml
parameters: parameters:
@ -67,8 +67,8 @@ steps:
# clean: all # clean: all
# steps: # steps:
# - template: azure-pipelines/setup-python3.yml # - template: azure-pipelines/setup-python3.yml
# - template: azure-pipelines/install-latest-meson.yml # - template: azure-pipelines/install-latest-meson-ninja.yml
# - template: azure-pipelines/linux-386-install-gtk-dev-ninja.yml # - template: azure-pipelines/linux-386-install-gtk-dev.yml
# - template: azure-pipelines/configure.yml # - template: azure-pipelines/configure.yml
# parameters: # parameters:
# beforeConfigure: export CFLAGS=-m32 CXXFLAGS=-m32 PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig # beforeConfigure: export CFLAGS=-m32 CXXFLAGS=-m32 PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig
@ -90,8 +90,8 @@ steps:
# clean: all # clean: all
# steps: # steps:
# - template: azure-pipelines/setup-python3.yml # - template: azure-pipelines/setup-python3.yml
# - template: azure-pipelines/install-latest-meson.yml # - template: azure-pipelines/install-latest-meson-ninja.yml
# - template: azure-pipelines/linux-install-gtk-dev-ninja.yml # - template: azure-pipelines/linux-install-gtk-dev.yml
# - template: azure-pipelines/configure.yml # - template: azure-pipelines/configure.yml
# parameters: # parameters:
# defaultLibrary: shared # defaultLibrary: shared
@ -112,8 +112,8 @@ steps:
# clean: all # clean: all
# steps: # steps:
# - template: azure-pipelines/setup-python3.yml # - template: azure-pipelines/setup-python3.yml
# - template: azure-pipelines/install-latest-meson.yml # - template: azure-pipelines/install-latest-meson-ninja.yml
# - template: azure-pipelines/linux-install-gtk-dev-ninja.yml # - template: azure-pipelines/linux-install-gtk-dev.yml
# - template: azure-pipelines/configure.yml # - template: azure-pipelines/configure.yml
# parameters: # parameters:
# defaultLibrary: static # defaultLibrary: static
@ -138,7 +138,7 @@ steps:
# clean: all # clean: all
# steps: # steps:
# - template: azure-pipelines/vs2015-install-python3.yml # - template: azure-pipelines/vs2015-install-python3.yml
# - template: azure-pipelines/install-latest-meson.yml # - template: azure-pipelines/install-latest-meson-ninja.yml
# - template: azure-pipelines/windows-install-ninja.yml # - template: azure-pipelines/windows-install-ninja.yml
# - template: azure-pipelines/configure.yml # - template: azure-pipelines/configure.yml
# parameters: # parameters:
@ -164,7 +164,7 @@ steps:
# clean: all # clean: all
# steps: # steps:
# - template: azure-pipelines/vs2015-install-python3.yml # - template: azure-pipelines/vs2015-install-python3.yml
# - template: azure-pipelines/install-latest-meson.yml # - template: azure-pipelines/install-latest-meson-ninja.yml
# - template: azure-pipelines/windows-install-ninja.yml # - template: azure-pipelines/windows-install-ninja.yml
# - template: azure-pipelines/configure.yml # - template: azure-pipelines/configure.yml
# parameters: # parameters:
@ -191,7 +191,7 @@ steps:
# clean: all # clean: all
# steps: # steps:
# - template: azure-pipelines/vs2015-install-python3.yml # - template: azure-pipelines/vs2015-install-python3.yml
# - template: azure-pipelines/install-latest-meson.yml # - template: azure-pipelines/install-latest-meson-ninja.yml
# - template: azure-pipelines/windows-install-ninja.yml # - template: azure-pipelines/windows-install-ninja.yml
# - template: azure-pipelines/configure.yml # - template: azure-pipelines/configure.yml
# parameters: # parameters:
@ -217,7 +217,7 @@ steps:
# clean: all # clean: all
# steps: # steps:
# - template: azure-pipelines/vs2015-install-python3.yml # - template: azure-pipelines/vs2015-install-python3.yml
# - template: azure-pipelines/install-latest-meson.yml # - template: azure-pipelines/install-latest-meson-ninja.yml
# - template: azure-pipelines/windows-install-ninja.yml # - template: azure-pipelines/windows-install-ninja.yml
# - template: azure-pipelines/configure.yml # - template: azure-pipelines/configure.yml
# parameters: # parameters:
@ -248,7 +248,7 @@ steps:
# clean: all # clean: all
# steps: # steps:
# - template: azure-pipelines/setup-python3.yml # - template: azure-pipelines/setup-python3.yml
# - template: azure-pipelines/install-latest-meson.yml # - template: azure-pipelines/install-latest-meson-ninja.yml
# - template: azure-pipelines/windows-install-ninja.yml # - template: azure-pipelines/windows-install-ninja.yml
# - template: azure-pipelines/configure.yml # - template: azure-pipelines/configure.yml
# parameters: # parameters:
@ -274,7 +274,7 @@ steps:
# clean: all # clean: all
# steps: # steps:
# - template: azure-pipelines/setup-python3.yml # - template: azure-pipelines/setup-python3.yml
# - template: azure-pipelines/install-latest-meson.yml # - template: azure-pipelines/install-latest-meson-ninja.yml
# - template: azure-pipelines/windows-install-ninja.yml # - template: azure-pipelines/windows-install-ninja.yml
# - template: azure-pipelines/configure.yml # - template: azure-pipelines/configure.yml
# parameters: # parameters:
@ -301,7 +301,7 @@ steps:
# clean: all # clean: all
# steps: # steps:
# - template: azure-pipelines/setup-python3.yml # - template: azure-pipelines/setup-python3.yml
# - template: azure-pipelines/install-latest-meson.yml # - template: azure-pipelines/install-latest-meson-ninja.yml
# - template: azure-pipelines/windows-install-ninja.yml # - template: azure-pipelines/windows-install-ninja.yml
# - template: azure-pipelines/configure.yml # - template: azure-pipelines/configure.yml
# parameters: # parameters:
@ -327,7 +327,7 @@ steps:
# clean: all # clean: all
# steps: # steps:
# - template: azure-pipelines/setup-python3.yml # - template: azure-pipelines/setup-python3.yml
# - template: azure-pipelines/install-latest-meson.yml # - template: azure-pipelines/install-latest-meson-ninja.yml
# - template: azure-pipelines/windows-install-ninja.yml # - template: azure-pipelines/windows-install-ninja.yml
# - template: azure-pipelines/configure.yml # - template: azure-pipelines/configure.yml
# parameters: # parameters:
@ -360,7 +360,7 @@ steps:
# clean: all # clean: all
# steps: # steps:
# - template: azure-pipelines/setup-python3.yml # - template: azure-pipelines/setup-python3.yml
# - template: azure-pipelines/install-latest-meson.yml # - template: azure-pipelines/install-latest-meson-ninja.yml
# - template: azure-pipelines/darwin-install-ninja.yml # - template: azure-pipelines/darwin-install-ninja.yml
# - template: azure-pipelines/configure.yml # - template: azure-pipelines/configure.yml
# parameters: # parameters:
@ -382,7 +382,7 @@ steps:
# clean: all # clean: all
# steps: # steps:
# - template: azure-pipelines/setup-python3.yml # - template: azure-pipelines/setup-python3.yml
# - template: azure-pipelines/install-latest-meson.yml # - template: azure-pipelines/install-latest-meson-ninja.yml
# - template: azure-pipelines/darwin-install-ninja.yml # - template: azure-pipelines/darwin-install-ninja.yml
# - template: azure-pipelines/configure.yml # - template: azure-pipelines/configure.yml
# parameters: # parameters:

6
azure-pipelines/collapsed
View File

@ -102,10 +102,10 @@
- template: azure-pipelines/setup-python3.yml - template: azure-pipelines/setup-python3.yml
- template: azure-pipelines/vs2015-install-python3.yml - template: azure-pipelines/vs2015-install-python3.yml
} }
- template: azure-pipelines/install-latest-meson.yml - template: azure-pipelines/install-latest-meson-ninja.yml
{ {
- template: azure-pipelines/linux-386-install-gtk-dev-ninja.yml - template: azure-pipelines/linux-386-install-gtk-dev.yml
- template: azure-pipelines/linux-install-gtk-dev-ninja.yml - template: azure-pipelines/linux-install-gtk-dev.yml
- template: azure-pipelines/windows-install-ninja.yml - template: azure-pipelines/windows-install-ninja.yml
- template: azure-pipelines/darwin-install-ninja.yml - template: azure-pipelines/darwin-install-ninja.yml
} }

9
azure-pipelines/install-latest-meson-ninja.yml Normal file
View File

@ -0,0 +1,9 @@
# 4 april 2019
# TODO remove ninja installation from non-Linux OSs and make the same ninja via pip change in the AppVeyor script
steps:
- script: |
python -m pip install --upgrade pip setuptools wheel
pip install meson ninja
displayName: 'Install Latest Meson and Ninja'

7
azure-pipelines/install-latest-meson.yml
View File

@ -1,7 +0,0 @@
# 4 april 2019
steps:
- script: |
python -m pip install --upgrade pip setuptools wheel
pip install meson
displayName: 'Install Latest Meson'

4
azure-pipelines/linux-386-install-gtk-dev-ninja.yml → azure-pipelines/linux-386-install-gtk-dev.yml
View File

@ -13,5 +13,5 @@ steps:
sudo apt-get install --allow-downgrades \ sudo apt-get install --allow-downgrades \
gcc-multilib g++-multilib \ gcc-multilib g++-multilib \
$llvmPackages \ $llvmPackages \
libgtk-3-dev:i386 ninja-build libgtk-3-dev:i386
displayName: 'Install GTK+ Dev Files and Ninja' displayName: 'Install GTK+ Dev Files'

6
azure-pipelines/linux-install-gtk-dev-ninja.yml
View File

@ -1,6 +0,0 @@
# 7 april 2019
steps:
- script: |
sudo apt-get install libgtk-3-dev ninja-build
displayName: 'Install GTK+ Dev Files and Ninja'

6
azure-pipelines/linux-install-gtk-dev.yml Normal file
View File

@ -0,0 +1,6 @@
# 7 april 2019
steps:
- script: |
sudo apt-get install libgtk-3-dev
displayName: 'Install GTK+ Dev Files'