Skip to content
This repository has been archived by the owner on Jul 16, 2020. It is now read-only.

Commit

Permalink
Update conventions
Browse files Browse the repository at this point in the history
  • Loading branch information
Croydon committed Nov 8, 2019
1 parent 6704963 commit 42ebcf0
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 27 deletions.
19 changes: 11 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
linux: &linux
os: linux
dist: xenial
dist: bionic
language: python
python: "3.7"
services:
Expand All @@ -20,6 +20,8 @@ matrix:
env: CONAN_GCC_VERSIONS=7 CONAN_DOCKER_IMAGE=conanio/gcc7
- <<: *linux
env: CONAN_GCC_VERSIONS=8 CONAN_DOCKER_IMAGE=conanio/gcc8
- <<: *linux
env: CONAN_GCC_VERSIONS=9 CONAN_DOCKER_IMAGE=conanio/gcc9
- <<: *linux
env: CONAN_CLANG_VERSIONS=3.9 CONAN_DOCKER_IMAGE=conanio/clang39
- <<: *linux
Expand All @@ -30,18 +32,19 @@ matrix:
env: CONAN_CLANG_VERSIONS=6.0 CONAN_DOCKER_IMAGE=conanio/clang60
- <<: *linux
env: CONAN_CLANG_VERSIONS=7.0 CONAN_DOCKER_IMAGE=conanio/clang7
- <<: *osx
osx_image: xcode8.3
env: CONAN_APPLE_CLANG_VERSIONS=8.1
- <<: *osx
osx_image: xcode9
env: CONAN_APPLE_CLANG_VERSIONS=9.0
- <<: *linux
env: CONAN_CLANG_VERSIONS=8 CONAN_DOCKER_IMAGE=conanio/clang7
- <<: *linux
env: CONAN_CLANG_VERSIONS=9 CONAN_DOCKER_IMAGE=conanio/clang7
- <<: *osx
osx_image: xcode9.4
env: CONAN_APPLE_CLANG_VERSIONS=9.1
- <<: *osx
osx_image: xcode10.1
osx_image: xcode10.3
env: CONAN_APPLE_CLANG_VERSIONS=10.0
- <<: *osx
osx_image: xcode11.2
env: CONAN_APPLE_CLANG_VERSIONS=11.0

install:
- chmod +x .ci/install.sh
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

| Bintray | Windows | Linux & macOS |
|:--------:|:---------:|:-----------------:|
|[![Download](https://api.bintray.com/packages/bincrafters/public-conan/glib%3Abincrafters/images/download.svg)](https://bintray.com/bincrafters/public-conan/glib%3Abincrafters/_latestVersion)|[![Build status](https://ci.appveyor.com/api/projects/status/github/bincrafters/conan-glib?svg=true)](https://ci.appveyor.com/project/BinCrafters/conan-glib)|[![Build Status](https://travis-ci.org/bincrafters/conan-glib.svg)](https://travis-ci.org/bincrafters/conan-glib)|
|[![Download](https://api.bintray.com/packages/bincrafters/public-conan/glib%3Abincrafters/images/download.svg)](https://bintray.com/bincrafters/public-conan/glib%3Abincrafters/_latestVersion)|[![Build status](https://ci.appveyor.com/api/projects/status/github/bincrafters/conan-glib?svg=true)](https://ci.appveyor.com/project/BinCrafters/conan-glib)|[![Build Status](https://travis-ci.com/bincrafters/conan-glib.svg)](https://travis-ci.com/bincrafters/conan-glib)|


## Conan.io Information
Expand Down
10 changes: 5 additions & 5 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
build: false

environment:
PYTHON: "C:\\Python37"
PYTHON_HOME: "C:\\Python37"

matrix:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
CONAN_VISUAL_VERSIONS: 12
CONAN_EXCLUDE_VCVARS_PRECOMMAND: 1
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
CONAN_VISUAL_VERSIONS: 14
CONAN_EXCLUDE_VCVARS_PRECOMMAND: 1
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
CONAN_VISUAL_VERSIONS: 15
CONAN_EXCLUDE_VCVARS_PRECOMMAND: 1
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
CONAN_VISUAL_VERSIONS: 16
CONAN_EXCLUDE_VCVARS_PRECOMMAND: 1

install:
- set PATH=%PYTHON%;%PYTHON%/Scripts/;%PATH%
- set PATH=%PYTHON_HOME%;%PYTHON_HOME%/Scripts/;%PATH%
- pip.exe install conan --upgrade
- pip.exe install conan_package_tools bincrafters_package_tools
- conan user # It creates the conan data directory
Expand Down
14 changes: 5 additions & 9 deletions conanfile.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-

from conans import ConanFile, tools, Meson
import os
import shutil
Expand All @@ -12,7 +9,6 @@ class GLibConan(ConanFile):
description = "GLib provides the core application building blocks for libraries and applications written in C"
url = "https://github.com/bincrafters/conan-glib"
homepage = "https://github.com/GNOME/glib"
author = "BinCrafters <bincrafters@gmail.com>"
license = "LGPL-2.1"
exports = ["LICENSE.md"]
settings = "os", "arch", "compiler", "build_type"
Expand All @@ -33,7 +29,7 @@ class GLibConan(ConanFile):
autotools = None
short_paths = True
generators = "pkg_config"
requires = "zlib/1.2.11", "libffi/3.2.1@bincrafters/stable"
requires = "zlib/1.2.11", "libffi/3.2.1"

def configure(self):
del self.settings.compiler.libcxx
Expand All @@ -48,12 +44,12 @@ def config_options(self):

def requirements(self):
if self.options.with_pcre:
self.requires.add("pcre/8.41@bincrafters/stable")
self.requires.add("pcre/8.41")
if self.options.with_elf:
self.requires.add("libelf/0.8.13@bincrafters/stable")
self.requires.add("libelf/0.8.13")
if self.settings.os == "Linux":
if self.options.with_mount:
self.requires.add("libmount/2.33.1@bincrafters/stable")
self.requires.add("libmount/2.33.1")
if self.options.with_selinux:
self.requires.add("libselinux/2.8@bincrafters/stable")

Expand All @@ -64,7 +60,7 @@ def source(self):

def build_requirements(self):
if not tools.which("meson"):
self.build_requires("meson_installer/0.49.0@bincrafters/stable")
self.build_requires("meson/0.52.0")
if not tools.which("pkg-config"):
self.build_requires("pkg-config_installer/0.29.2@bincrafters/stable")

Expand Down
4 changes: 0 additions & 4 deletions test_package/conanfile.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

from conans import ConanFile, CMake, tools, RunEnvironment
import os

Expand Down

0 comments on commit 42ebcf0

Please sign in to comment.