Merge branch 'develop'

2025-06-25 03:51:36 +02:00 · 2019-12-17 12:33:09 -05:00
parent 5c499073c1 00b2270c66
commit c07058003c
7 changed files with 18 additions and 130 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@ -39,18 +39,20 @@ install:
  - cd ..
  - git clone -b %BOOST_BRANCH% https://github.com/boostorg/boost.git boost
  - cd boost
-  - git submodule update --init tools/build
-  - git submodule update --init libs/config
-  - git submodule update --init tools/boostdep
+  - git submodule init libs/assert
+  - git submodule init libs/config
+  - git submodule init libs/core
+  - git submodule init libs/headers
+  - git submodule init tools/build
+  - git submodule init tools/boost_install
+  - git submodule update
  - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\io\
-  - python tools/boostdep/depinst/depinst.py io
  - cmd /c bootstrap
  - b2 headers

 build: off

 test_script:
-  - PATH=%ADDPATH%%PATH%
  - if not "%CXXSTD%" == "" set CXXSTD=cxxstd=%CXXSTD%
  - if not "%ADDRMD%" == "" set ADDRMD=address-model=%ADDRMD%
  - b2 libs/io/test toolset=%TOOLSET% %CXXSTD% %ADDRMD%
--- a/.gitattributes
+++ b/.gitattributes
@ -1,96 +0,0 @@
-* text=auto !eol svneol=native#text/plain
-*.gitattributes text svneol=native#text/plain
-
-# Scriptish formats
-*.bat        text svneol=native#text/plain
-*.bsh        text svneol=native#text/x-beanshell
-*.cgi        text svneol=native#text/plain
-*.cmd        text svneol=native#text/plain
-*.js         text svneol=native#text/javascript
-*.php        text svneol=native#text/x-php
-*.pl         text svneol=native#text/x-perl
-*.pm         text svneol=native#text/x-perl
-*.py         text svneol=native#text/x-python
-*.sh         eol=lf svneol=LF#text/x-sh
-configure    eol=lf svneol=LF#text/x-sh
-
-# Image formats
-*.bmp        binary svneol=unset#image/bmp
-*.gif        binary svneol=unset#image/gif
-*.ico        binary svneol=unset#image/ico
-*.jpeg       binary svneol=unset#image/jpeg
-*.jpg        binary svneol=unset#image/jpeg
-*.png        binary svneol=unset#image/png
-*.tif        binary svneol=unset#image/tiff
-*.tiff       binary svneol=unset#image/tiff
-*.svg        text svneol=native#image/svg%2Bxml
-
-# Data formats
-*.pdf        binary svneol=unset#application/pdf
-*.avi        binary svneol=unset#video/avi
-*.doc        binary svneol=unset#application/msword
-*.dsp        text svneol=crlf#text/plain
-*.dsw        text svneol=crlf#text/plain
-*.eps        binary svneol=unset#application/postscript
-*.gz         binary svneol=unset#application/gzip
-*.mov        binary svneol=unset#video/quicktime
-*.mp3        binary svneol=unset#audio/mpeg
-*.ppt        binary svneol=unset#application/vnd.ms-powerpoint
-*.ps         binary svneol=unset#application/postscript
-*.psd        binary svneol=unset#application/photoshop
-*.rdf        binary svneol=unset#text/rdf
-*.rss        text svneol=unset#text/xml
-*.rtf        binary svneol=unset#text/rtf
-*.sln        text svneol=native#text/plain
-*.swf        binary svneol=unset#application/x-shockwave-flash
-*.tgz        binary svneol=unset#application/gzip
-*.vcproj     text svneol=native#text/xml
-*.vcxproj    text svneol=native#text/xml
-*.vsprops    text svneol=native#text/xml
-*.wav        binary svneol=unset#audio/wav
-*.xls        binary svneol=unset#application/vnd.ms-excel
-*.zip        binary svneol=unset#application/zip
-
-# Text formats
-.htaccess    text svneol=native#text/plain
-*.bbk        text svneol=native#text/xml
-*.cmake      text svneol=native#text/plain
-*.css        text svneol=native#text/css
-*.dtd        text svneol=native#text/xml
-*.htm        text svneol=native#text/html
-*.html       text svneol=native#text/html
-*.ini        text svneol=native#text/plain
-*.log        text svneol=native#text/plain
-*.mak        text svneol=native#text/plain
-*.qbk        text svneol=native#text/plain
-*.rst        text svneol=native#text/plain
-*.sql        text svneol=native#text/x-sql
-*.txt        text svneol=native#text/plain
-*.xhtml      text svneol=native#text/xhtml%2Bxml
-*.xml        text svneol=native#text/xml
-*.xsd        text svneol=native#text/xml
-*.xsl        text svneol=native#text/xml
-*.xslt       text svneol=native#text/xml
-*.xul        text svneol=native#text/xul
-*.yml        text svneol=native#text/plain
-boost-no-inspect text svneol=native#text/plain
-CHANGES      text svneol=native#text/plain
-COPYING      text svneol=native#text/plain
-INSTALL      text svneol=native#text/plain
-Jamfile      text svneol=native#text/plain
-Jamroot      text svneol=native#text/plain
-Jamfile.v2   text svneol=native#text/plain
-Jamrules     text svneol=native#text/plain
-Makefile*    text svneol=native#text/plain
-README       text svneol=native#text/plain
-TODO         text svneol=native#text/plain
-
-# Code formats
-*.c          text svneol=native#text/plain
-*.cpp        text svneol=native#text/plain
-*.h          text svneol=native#text/plain
-*.hpp        text svneol=native#text/plain
-*.ipp        text svneol=native#text/plain
-*.tpp        text svneol=native#text/plain
-*.jam        text svneol=native#text/plain
-*.java       text svneol=native#text/plain
--- a/.travis.yml
+++ b/.travis.yml
@ -279,12 +279,15 @@ install:
  - cd ..
  - git clone -b $BOOST_BRANCH https://github.com/boostorg/boost.git boost
  - cd boost
-  - git submodule update --init tools/build
-  - git submodule update --init libs/config
-  - git submodule update --init tools/boostdep
+  - git submodule init libs/assert
+  - git submodule init libs/config
+  - git submodule init libs/core
+  - git submodule init libs/headers
+  - git submodule init tools/build
+  - git submodule init tools/boost_install
+  - git submodule update
  - mkdir -p libs/io
  - cp -r $TRAVIS_BUILD_DIR/* libs/io
-  - python tools/boostdep/depinst/depinst.py io
  - ./bootstrap.sh
  - ./b2 headers

--- a/include/boost/io/detail/quoted_manip.hpp
+++ b/include/boost/io/detail/quoted_manip.hpp
@ -10,9 +10,10 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_IO_DETAIL_QUOTED_MANIP_HPP
 #define BOOST_IO_DETAIL_QUOTED_MANIP_HPP

-/*
-The new implemenation is public in <boost/io/quoted.hpp>
-*/
+#include <boost/config/header_deprecated.hpp>
+
+BOOST_HEADER_DEPRECATED("<boost/io/quoted.hpp>")
+
 #include <boost/io/quoted.hpp>

 #endif
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
--- a/test/test_cmake/CMakeLists.txt
+++ b/test/test_cmake/CMakeLists.txt
@ -1,17 +0,0 @@
-# Copyright 2018 Mike Dev
-# 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
-#
-# NOTE: This does NOT run the unit tests for Boost.IO.
-#       It only tests, if the CMakeLists.txt file in the
-#       Boost.IO root directory works as expected.
-
-cmake_minimum_required( VERSION 3.5 )
-
-project( BoostIoCMakeSelfTest )
-
-add_subdirectory( ../../../config ${CMAKE_CURRENT_BINARY_DIR}/libs/config )
-add_subdirectory( ../.. ${CMAKE_CURRENT_BINARY_DIR}/libs/io )
-
-add_executable( boost_io_cmake_self_test main.cpp )
-target_link_libraries( boost_io_cmake_self_test Boost::io )
--- a/test/test_cmake/main.cpp
+++ b/test/test_cmake/main.cpp
@ -1,5 +0,0 @@
-#include <boost/io/ios_state.hpp>
-#include <boost/io_fwd.hpp>
-
-int main() {
-}