From 6fa878de2fe791e7be0eefd313cf038c69cb161f Mon Sep 17 00:00:00 2001 From: Zach Laine Date: Fri, 3 Jun 2022 23:03:09 -0500 Subject: [PATCH] Update crufty bits of README, and remove Travis and Appveyor config files. --- .travis.yml | 147 --------------------------------------------------- README.md | 24 ++------- appveyor.yml | 35 ------------ 3 files changed, 4 insertions(+), 202 deletions(-) delete mode 100644 .travis.yml delete mode 100644 appveyor.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index fab74e8..0000000 --- a/.travis.yml +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright (C) 2019 T. Zachary Laine -# -# Distributed under the Boost Software License, Version 1.0. (See -# accompanying file LICENSE_1_0.txt or copy at -# http://www.boost.org/LICENSE_1_0.txt) -sudo: required -dist: trusty -language: cpp -script: cmake - -matrix: - include: - # OSX - - env: ASAN=on MAC_OSX=true - os: osx - osx_image: xcode8.3 - compiler: clang - - - env: ASAN=on MAC_OSX=true - os: osx - osx_image: xcode9.4 - compiler: clang - - - env: ASAN=on MAC_OSX=true - os: osx - osx_image: xcode10.3 - compiler: clang - - - env: ASAN=on MAC_OSX=true - os: osx - osx_image: xcode11.4 - compiler: clang - - - # Gcc - - env: GCC_VERSION=6 ASAN=off - os: linux - compiler: gcc-6 - addons: &gcc6 - apt: - packages: - - g++-6 - - valgrind - sources: - - ubuntu-toolchain-r-test - - - env: GCC_VERSION=7 ASAN=off - os: linux - compiler: gcc-7 - addons: &gcc7 - apt: - packages: - - g++-7 - - valgrind - sources: - - ubuntu-toolchain-r-test - - - env: GCC_VERSION=8 ASAN=off - os: linux - compiler: gcc-8 - addons: &gcc8 - apt: - packages: - - g++-8 - - valgrind - sources: - - ubuntu-toolchain-r-test - - - env: GCC_VERSION=9 ASAN=off - os: linux - compiler: gcc-9 - addons: &gcc9 - apt: - packages: - - g++-9 - - valgrind - sources: - - ubuntu-toolchain-r-test - - # - env: GCC_VERSION=10 ASAN=off - # os: linux - # compiler: gcc-10 - # addons: &gcc10 - # apt: - # packages: - # - g++-10 - # - valgrind - # sources: - # - ubuntu-toolchain-r-test - -install: - - export CHECKOUT_PATH=`pwd`; - - if [ -n "$GCC_VERSION" ]; then export CXX="g++-${GCC_VERSION}" CC="gcc-${GCC_VERSION}"; fi - - if [ -n "$CLANG_VERSION" ]; then export CXXFLAGS="${CXXFLAGS} -stdlib=libstdc++" CXX="clang++-${CLANG_VERSION}" CC="clang-${CLANG_VERSION}"; fi - # - if [[ "$CLANG_VERSION" == "3.4" ]]; then export CXX="/usr/local/clang-3.4/bin/clang++" CC="/usr/local/clang-3.4/bin/clang"; fi - - # Setup deps directory - - export DEPS_DIR="${TRAVIS_BUILD_DIR}/deps" - - mkdir ${DEPS_DIR} && cd ${DEPS_DIR} - - mkdir usr - - export PATH=${DEPS_DIR}/usr/bin:${PATH} - - # Install cmake - - | - if [[ "$MAC_OSX" == "true" ]]; then - export CMAKE_URL="http://www.cmake.org/files/v3.17/cmake-3.17.0-Darwin-x86_64.tar.gz" - else - export CMAKE_URL="http://www.cmake.org/files/v3.17/cmake-3.17.0-Linux-x86_64.tar.gz" - fi - travis_retry wget --no-check-certificate --quiet -O - ${CMAKE_URL} | tar --strip-components=3 -xz -C usr - - echo $PATH - - # Show compiler info - - $CXX --version - - which $CXX - - $CC --version - - which $CC - - which cmake - - cmake --version - - # Add warnings - - export CXXFLAGS="${CXXFLAGS} -Wall" - -script: - - cd $CHECKOUT_PATH - - export ASANVARIANT="false" - - if [[ "$ASAN" == "on" ]]; then export ASANVARIANT="true"; fi - - | - for build_type in Debug Release; do - for asan_type in $ASANVARIANT; do - build_dir="build-$build_type-asan-$asan_type" - mkdir $build_dir - cd $build_dir - if [[ "$asan_type" == "true" ]]; then - CXXFLAGS="$CXXFLAGS" cmake -DUSE_ASAN=true -DBOOST_BRANCH=$TRAVIS_BRANCH -DCMAKE_BUILD_TYPE=$build_type .. - else - cmake -DBOOST_BRANCH=$TRAVIS_BRANCH -DCMAKE_BUILD_TYPE=$build_type .. - fi - VERBOSE=1 make -j4 && CTEST_OUTPUT_ON_FAILURE=1 CTEST_PARALLEL_LEVEL=4 ASAN_OPTIONS=alloc_dealloc_mismatch=0 make check - if [ $? -ne 0 ] - then - exit 1 - fi - cd .. - rm -rf $build_dir - done - done diff --git a/README.md b/README.md index 340ea59..6d5262b 100644 --- a/README.md +++ b/README.md @@ -174,26 +174,10 @@ private: ``` The code size savings are even more dramatic for `view_interface` and -`container_interface`! If you don't ever write iterators, range views, or -containers, this is not for you. +`container_interface`! If you don't ever write iterators, views, containers, +or view adaptors, this is not for you. -Online docs: https://boostorg.github.io/stl_interfaces. +This library includes both C++20 concept constrained and SFINAE-constrained +versions. -This library includes a temporary implementation for those who wish to experiment with -a concept-constrained version before C++20 is widely implemented. Casey Carter's cmcstl2 -is an implementation of the `std::ranges` portion of the C++20 standard library. To use it: - -- check out the cmcstl2 branch of this library; then - -- put its headers in your include path, so that they can be included with - `#include `; and - -- build with GCC 8 or 9, including the `-fconcepts` and `-std=c++2a` flags. - -GCC 8 and 9 are the only compilers with an adequate concepts implementation at -the time of this writing. - - -[![Build Status](https://travis-ci.org/boostorg/stl_interfaces.svg?branch=develop)](https://travis-ci.org/boostorg/stl_interfaces) -[![Build Status](https://ci.appveyor.com/api/projects/status/github/tzlaine/stl-interfaces?branch=develop&svg=true)](https://ci.appveyor.com/project/tzlaine/stl-interfaces) [![License](https://img.shields.io/badge/license-boost-brightgreen.svg)](LICENSE_1_0.txt) diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 7076935..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright (C) 2019 T. Zachary Laine -# -# Distributed under the Boost Software License, Version 1.0. (See -# accompanying file LICENSE_1_0.txt or copy at -# http://www.boost.org/LICENSE_1_0.txt) -environment: - matrix: - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - GENERATOR: "Visual Studio 15 2017 Win64" - CONFIG: Debug - - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - GENERATOR: "Visual Studio 15 2017 Win64" - CONFIG: Release - - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - GENERATOR: "Visual Studio 15 2017" - CONFIG: Debug - - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - GENERATOR: "Visual Studio 15 2017" - CONFIG: Release - -matrix: - fast_finish: true - -build_script: - - cmd: set PATH=C:\Program Files (x86)\CMake\bin;%PATH% - - cmd: set CTEST_OUTPUT_ON_FAILURE=1 - - cmd: cmake --version - - cmd: mkdir build - - cmd: cd build - - cmd: cmake .. -DBOOST_ROOT=C:\Libraries\boost_1_68_0 -G"%GENERATOR%" - - cmd: cmake --build . --config %CONFIG% - - cmd: cmake --build . --config %CONFIG% --target check