Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,8 @@ environment:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
GENERATOR: Visual Studio 16 2019

- GENERATOR: Visual Studio 15 2017
CONAN_VISUAL_VERSIONS: 15
PYTHON: "C:\\Python27"
PYTHON_VERSION: "2.7.8"
PYTHON_ARCH: "32"
CONAN: TRUE

init: []

install:
- if defined CONAN (pip.exe install -U conan conan-package-tools)
- if defined CONAN (conan profile new default --detect)

before_build:
- if defined BINDIR (set "PATH=%BINDIR%;%PATH:C:\Program Files\Git\usr\bin;=%")
- md build
Expand All @@ -40,5 +29,3 @@ build_script:

test_script:
- ctest -C "%CONFIGURATION%" --output-on-failure
- if defined CONAN (cd ..)
- if defined CONAN (python .conan/build.py)
80 changes: 0 additions & 80 deletions .conan/build.py

This file was deleted.

12 changes: 0 additions & 12 deletions .conan/test_package/CMakeLists.txt

This file was deleted.

24 changes: 0 additions & 24 deletions .conan/test_package/conanfile.py

This file was deleted.

16 changes: 0 additions & 16 deletions .conan/test_package/test_package.cpp

This file was deleted.

12 changes: 0 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,18 +133,6 @@ matrix:
- CXX=clang++-8
- CPPFLAGS=-fsanitize=address

- language: python
python:
- "3.6"
sudo: required
install:
- pip install conan conan-package-tools
env:
- CONAN_GCC_VERSIONS=7
- CONAN_DOCKER_IMAGE=lasote/conangcc7
script:
- python .conan/build.py

- compiler: gcc
addons:
apt:
Expand Down
10 changes: 9 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Welcome to taoJSON

[![Release](https://img.shields.io/github/release/taocpp/json.svg)](https://github.com/taocpp/json/releases/latest)
[![Download](https://api.bintray.com/packages/taocpp/public-conan/json%3Ataocpp/images/download.svg)](https://bintray.com/taocpp/public-conan/json%3Ataocpp/_latestVersion)
[![Download](https://api.bintray.com/packages/conan/conan-center/taocpp-json%3A_/images/download.svg)](https://bintray.com/conan/conan-center/taocpp-json%3A_/_latestVersion)
[![TravisCI](https://travis-ci.org/taocpp/json.svg)](https://travis-ci.org/taocpp/json)
[![AppVeyor](https://ci.appveyor.com/api/projects/status/github/taocpp/json?svg=true)](https://ci.appveyor.com/project/taocpp/json)
[![Coverage](https://img.shields.io/coveralls/taocpp/json.svg)](https://coveralls.io/github/taocpp/json)
Expand Down Expand Up @@ -58,6 +58,14 @@ The library is not stable as in "under construction"; some parts of the API are

This library also serves as a real-world example application of the [Parsing Expression Grammar Template Library (PEGTL)], which is used for parsing the JSON and JAXN representation formats.

## Package Managers

You can download and install taopq using the [Conan](https://github.com/conan-io/conan) package manager:

conan install taocpp-json/1.0.0-beta.11@

The taopq package in conan is kept up to date by Conan team members and community contributors. If the version is out-of-date, please [create an issue or pull request](https://github.com/conan-io/conan-center-index) on the Conan Center Index repository.

## Contact

taoJSON is part of [The Art of C++](https://taocpp.github.io/).
Expand Down
28 changes: 0 additions & 28 deletions conanfile.py

This file was deleted.