diff options
author | shadchin <shadchin@yandex-team.ru> | 2022-02-25 16:36:08 +0300 |
---|---|---|
committer | shadchin <shadchin@yandex-team.ru> | 2022-02-25 16:36:08 +0300 |
commit | 42757795514a0ad28c3a4046f1024469e6dd92b7 (patch) | |
tree | ef854cb57f5d30ba86775add15f9f55a8a6aa4c2 | |
parent | 797beae740bb6bafe9fe620409af9f8af30548c1 (diff) | |
download | ydb-42757795514a0ad28c3a4046f1024469e6dd92b7.tar.gz |
DTCC-822 Put double-conversion under yamaker
ref:50f8b947dedd3183d21db08bf8ab226bb09535d1
38 files changed, 213 insertions, 112 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1bc9ace0e79..0561fa3fae2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,6 +4,9 @@ project(YDB LANGUAGES C CXX ASM) set(BUILD_SHARED_LIBS Off) set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_EXTENSIONS Off) +set(YDB_MAX_LINK_JOBS 5 CACHE STRING "Maximum parallel link jobs for Ninja generator") +set_property(GLOBAL PROPERTY JOB_POOLS link_jobs=${YDB_MAX_LINK_JOBS}) +set(CMAKE_JOB_POOL_LINK link_jobs) set(CMAKE_C_FLAGS "\ -m64 \ -g \ diff --git a/cmake/bison.cmake b/cmake/bison.cmake index 440d86ffed4..df444f031e1 100644 --- a/cmake/bison.cmake +++ b/cmake/bison.cmake @@ -1,6 +1,6 @@ function(target_bison_parser Tgt Scope) foreach(arg ${ARGN}) - file(REAL_PATH ${arg} argPath) + get_filename_component(argPath ${arg} REALPATH) if (argPath MATCHES "${CMAKE_SOURCE_DIR}/.*") file(RELATIVE_PATH argRel ${CMAKE_CURRENT_SOURCE_DIR} ${argPath}) string(REPLACE ".." "__" ArgInBindir ${argRel}) @@ -12,6 +12,7 @@ function(target_bison_parser Tgt Scope) get_filename_component(OutputDir ${ArgInBindir} DIRECTORY) add_custom_command( OUTPUT ${OutputDir}/${OutputBase}.cpp ${OutputDir}/${OutputBase}.h + COMMAND ${CMAKE_COMMAND} -E make_directory ${OutputDir} COMMAND ${CMAKE_BINARY_DIR}/bin/bison/bin/bison ${BISON_FLAGS} -v --defines=${OutputDir}/${OutputBase}.h -o ${OutputDir}/${OutputBase}.cpp ${arg} DEPENDS ${arg} ) diff --git a/cmake/protobuf.cmake b/cmake/protobuf.cmake index ef3a9d4cfbf..fce76a3cc05 100644 --- a/cmake/protobuf.cmake +++ b/cmake/protobuf.cmake @@ -10,10 +10,10 @@ endfunction() function(target_proto_messages Tgt Scope) get_property(ProtocExtraOutsSuf TARGET ${Tgt} PROPERTY PROTOC_EXTRA_OUTS) foreach(proto ${ARGN}) - if (proto MATCHES ${CMAKE_SOURCE_DIR}) - file(RELATIVE_PATH protoRel ${CMAKE_SOURCE_DIR} ${proto}) - elseif(proto MATCHES ${CMAKE_BINARY_DIR}) + if(proto MATCHES ${CMAKE_BINARY_DIR}) file(RELATIVE_PATH protoRel ${CMAKE_BINARY_DIR} ${proto}) + elseif (proto MATCHES ${CMAKE_SOURCE_DIR}) + file(RELATIVE_PATH protoRel ${CMAKE_SOURCE_DIR} ${proto}) else() set(protoRel ${proto}) endif() @@ -29,9 +29,11 @@ function(target_proto_messages Tgt Scope) ${COMMON_PROTOC_FLAGS} -I=${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src --cpp_out=${CMAKE_BINARY_DIR} + --cpp_styleguide_out=${CMAKE_BINARY_DIR} + --plugin=protoc-gen-cpp_styleguide=${CMAKE_BINARY_DIR}/contrib/tools/protoc/plugins/cpp_styleguide/cpp_styleguide "$<JOIN:$<TARGET_GENEX_EVAL:${Tgt},$<TARGET_PROPERTY:${Tgt},PROTOC_OPTS>>,;>" ${protoRel} - DEPENDS ${proto} $<TARGET_PROPERTY:${Tgt},PROTOC_DEPS> + DEPENDS ${proto} $<TARGET_PROPERTY:${Tgt},PROTOC_DEPS> ${CMAKE_BINARY_DIR}/contrib/tools/protoc/plugins/cpp_styleguide/cpp_styleguide WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMAND_EXPAND_LISTS ) diff --git a/contrib/libs/apache/arrow/cpp/src/arrow/util/double_conversion.h b/contrib/libs/apache/arrow/cpp/src/arrow/util/double_conversion.h index bd99c0618db..fe995497be0 100644 --- a/contrib/libs/apache/arrow/cpp/src/arrow/util/double_conversion.h +++ b/contrib/libs/apache/arrow/cpp/src/arrow/util/double_conversion.h @@ -17,7 +17,7 @@ #pragma once -#include "contrib/libs/double-conversion/double-conversion.h" // IWYU pragma: export +#include "contrib/libs/double-conversion/double-conversion/double-conversion.h" // IWYU pragma: export namespace arrow { namespace util { diff --git a/contrib/libs/double-conversion/.yandex_meta/devtools.copyrights.report b/contrib/libs/double-conversion/.yandex_meta/devtools.copyrights.report index a7841c431f6..c7a25289d75 100644 --- a/contrib/libs/double-conversion/.yandex_meta/devtools.copyrights.report +++ b/contrib/libs/double-conversion/.yandex_meta/devtools.copyrights.report @@ -38,9 +38,9 @@ BELONGS ya.make Score : 100.00 Match type : COPYRIGHT Files with this license: - double-conversion.h [1:1] - fast-dtoa.cc [1:1] - ieee.h [1:1] + double-conversion/double-conversion.h [1:1] + double-conversion/fast-dtoa.cc [1:1] + double-conversion/ieee.h [1:1] KEEP COPYRIGHT_SERVICE_LABEL 16d77374d4f3ba25a3fdfa4958bf4c49 BELONGS ya.make @@ -51,6 +51,7 @@ BELONGS ya.make Score : 100.00 Match type : COPYRIGHT Files with this license: + COPYING [1:1] LICENSE [1:1] KEEP COPYRIGHT_SERVICE_LABEL 3666116ac4f173e889ce41ac8ed171ca @@ -62,7 +63,7 @@ BELONGS ya.make Score : 100.00 Match type : COPYRIGHT Files with this license: - cached-powers.cc [1:1] + double-conversion/cached-powers.cc [1:1] KEEP COPYRIGHT_SERVICE_LABEL 54a59bbade65e8a194ed76f4af30de25 BELONGS ya.make @@ -73,17 +74,17 @@ BELONGS ya.make Score : 100.00 Match type : COPYRIGHT Files with this license: - bignum-dtoa.cc [1:1] - bignum-dtoa.h [1:1] - bignum.cc [1:1] - bignum.h [1:1] - cached-powers.h [1:1] - diy-fp.cc [1:1] - diy-fp.h [1:1] - double-conversion.cc [1:1] - fast-dtoa.h [1:1] - fixed-dtoa.cc [1:1] - fixed-dtoa.h [1:1] - strtod.cc [1:1] - strtod.h [1:1] - utils.h [1:1] + double-conversion/bignum-dtoa.cc [1:1] + double-conversion/bignum-dtoa.h [1:1] + double-conversion/bignum.cc [1:1] + double-conversion/bignum.h [1:1] + double-conversion/cached-powers.h [1:1] + double-conversion/diy-fp.cc [1:1] + double-conversion/diy-fp.h [1:1] + double-conversion/double-conversion.cc [1:1] + double-conversion/fast-dtoa.h [1:1] + double-conversion/fixed-dtoa.cc [1:1] + double-conversion/fixed-dtoa.h [1:1] + double-conversion/strtod.cc [1:1] + double-conversion/strtod.h [1:1] + double-conversion/utils.h [1:1] diff --git a/contrib/libs/double-conversion/.yandex_meta/devtools.licenses.report b/contrib/libs/double-conversion/.yandex_meta/devtools.licenses.report index 3f14b16cda6..1d87f4d56d9 100644 --- a/contrib/libs/double-conversion/.yandex_meta/devtools.licenses.report +++ b/contrib/libs/double-conversion/.yandex_meta/devtools.licenses.report @@ -38,6 +38,7 @@ BELONGS ya.make Match type : TEXT Links : http://www.opensource.org/licenses/BSD-3-Clause, https://spdx.org/licenses/BSD-3-Clause Files with this license: + COPYING [2:26] LICENSE [2:26] KEEP BSD-3-Clause f903ceb778f6db21bac728e4622abbd4 @@ -49,21 +50,21 @@ BELONGS ya.make Match type : TEXT Links : http://www.opensource.org/licenses/BSD-3-Clause, https://spdx.org/licenses/BSD-3-Clause Files with this license: - bignum-dtoa.cc [2:26] - bignum-dtoa.h [2:26] - bignum.cc [2:26] - bignum.h [2:26] - cached-powers.cc [2:26] - cached-powers.h [2:26] - diy-fp.cc [2:26] - diy-fp.h [2:26] - double-conversion.cc [2:26] - double-conversion.h [2:26] - fast-dtoa.cc [2:26] - fast-dtoa.h [2:26] - fixed-dtoa.cc [2:26] - fixed-dtoa.h [2:26] - ieee.h [2:26] - strtod.cc [2:26] - strtod.h [2:26] - utils.h [2:26] + double-conversion/bignum-dtoa.cc [2:26] + double-conversion/bignum-dtoa.h [2:26] + double-conversion/bignum.cc [2:26] + double-conversion/bignum.h [2:26] + double-conversion/cached-powers.cc [2:26] + double-conversion/cached-powers.h [2:26] + double-conversion/diy-fp.cc [2:26] + double-conversion/diy-fp.h [2:26] + double-conversion/double-conversion.cc [2:26] + double-conversion/double-conversion.h [2:26] + double-conversion/fast-dtoa.cc [2:26] + double-conversion/fast-dtoa.h [2:26] + double-conversion/fixed-dtoa.cc [2:26] + double-conversion/fixed-dtoa.h [2:26] + double-conversion/ieee.h [2:26] + double-conversion/strtod.cc [2:26] + double-conversion/strtod.h [2:26] + double-conversion/utils.h [2:26] diff --git a/contrib/libs/double-conversion/AUTHORS b/contrib/libs/double-conversion/AUTHORS new file mode 100644 index 00000000000..88b38ae068f --- /dev/null +++ b/contrib/libs/double-conversion/AUTHORS @@ -0,0 +1,14 @@ +# Below is a list of people and organizations that have contributed +# to the double-conversion project. Names should be added to the +# list like so: +# +# Name/Organization <email address> + +Google Inc. +Mozilla Foundation + +Jeff Muizelaar <jmuizelaar@mozilla.com> +Mike Hommey <mhommey@mozilla.com> +Martin Olsson <mnemo@minimum.se> +Kent Williams <chaircrusher@gmail.com> +Elan Ruusamäe <glen@delfi.ee> diff --git a/contrib/libs/double-conversion/CMakeLists.txt b/contrib/libs/double-conversion/CMakeLists.txt index 65f09f29a8c..5ec06f2cd8a 100644 --- a/contrib/libs/double-conversion/CMakeLists.txt +++ b/contrib/libs/double-conversion/CMakeLists.txt @@ -1,20 +1,20 @@ add_library(contrib-libs-double-conversion) target_include_directories(contrib-libs-double-conversion PUBLIC - ${CMAKE_SOURCE_DIR}/contrib/libs/double-conversion/include + ${CMAKE_SOURCE_DIR}/contrib/libs/double-conversion ) target_include_directories(contrib-libs-double-conversion PRIVATE - ${CMAKE_SOURCE_DIR}/contrib/libs/double-conversion/include + ${CMAKE_SOURCE_DIR}/contrib/libs/double-conversion ) target_link_libraries(contrib-libs-double-conversion PUBLIC contrib-libs-cxxsupp ) target_sources(contrib-libs-double-conversion PRIVATE - ${CMAKE_SOURCE_DIR}/contrib/libs/double-conversion/cached-powers.cc - ${CMAKE_SOURCE_DIR}/contrib/libs/double-conversion/bignum-dtoa.cc - ${CMAKE_SOURCE_DIR}/contrib/libs/double-conversion/double-conversion.cc - ${CMAKE_SOURCE_DIR}/contrib/libs/double-conversion/diy-fp.cc - ${CMAKE_SOURCE_DIR}/contrib/libs/double-conversion/fixed-dtoa.cc - ${CMAKE_SOURCE_DIR}/contrib/libs/double-conversion/strtod.cc - ${CMAKE_SOURCE_DIR}/contrib/libs/double-conversion/bignum.cc - ${CMAKE_SOURCE_DIR}/contrib/libs/double-conversion/fast-dtoa.cc + ${CMAKE_SOURCE_DIR}/contrib/libs/double-conversion/double-conversion/bignum-dtoa.cc + ${CMAKE_SOURCE_DIR}/contrib/libs/double-conversion/double-conversion/bignum.cc + ${CMAKE_SOURCE_DIR}/contrib/libs/double-conversion/double-conversion/cached-powers.cc + ${CMAKE_SOURCE_DIR}/contrib/libs/double-conversion/double-conversion/diy-fp.cc + ${CMAKE_SOURCE_DIR}/contrib/libs/double-conversion/double-conversion/double-conversion.cc + ${CMAKE_SOURCE_DIR}/contrib/libs/double-conversion/double-conversion/fast-dtoa.cc + ${CMAKE_SOURCE_DIR}/contrib/libs/double-conversion/double-conversion/fixed-dtoa.cc + ${CMAKE_SOURCE_DIR}/contrib/libs/double-conversion/double-conversion/strtod.cc ) diff --git a/contrib/libs/double-conversion/COPYING b/contrib/libs/double-conversion/COPYING new file mode 100644 index 00000000000..933718a9ef9 --- /dev/null +++ b/contrib/libs/double-conversion/COPYING @@ -0,0 +1,26 @@ +Copyright 2006-2011, the V8 project authors. All rights reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of Google Inc. nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/contrib/libs/double-conversion/README.md b/contrib/libs/double-conversion/README.md new file mode 100644 index 00000000000..4ae9be5e9f1 --- /dev/null +++ b/contrib/libs/double-conversion/README.md @@ -0,0 +1,54 @@ +https://github.com/google/double-conversion + +This project (double-conversion) provides binary-decimal and decimal-binary +routines for IEEE doubles. + +The library consists of efficient conversion routines that have been extracted +from the V8 JavaScript engine. The code has been refactored and improved so that +it can be used more easily in other projects. + +There is extensive documentation in `double-conversion/double-conversion.h`. Other +examples can be found in `test/cctest/test-conversions.cc`. + + +Building +======== + +This library can be built with [scons][0] or [cmake][1]. +The checked-in Makefile simply forwards to scons, and provides a +shortcut to run all tests: + + make + make test + +Scons +----- + +The easiest way to install this library is to use `scons`. It builds +the static and shared library, and is set up to install those at the +correct locations: + + scons install + +Use the `DESTDIR` option to change the target directory: + + scons DESTDIR=alternative_directory install + +Cmake +----- + +To use cmake run `cmake .` in the root directory. This overwrites the +existing Makefile. + +Use `-DBUILD_SHARED_LIBS=ON` to enable the compilation of shared libraries. +Note that this disables static libraries. There is currently no way to +build both libraries at the same time with cmake. + +Use `-DBUILD_TESTING=ON` to build the test executable. + + cmake . -DBUILD_TESTING=ON + make + test/cctest/cctest --list | tr -d '<' | xargs test/cctest/cctest + +[0]: http://www.scons.org/ +[1]: https://cmake.org/ diff --git a/contrib/libs/double-conversion/bignum-dtoa.cc b/contrib/libs/double-conversion/double-conversion/bignum-dtoa.cc index d99ac2aaf9d..526f96edf54 100644 --- a/contrib/libs/double-conversion/bignum-dtoa.cc +++ b/contrib/libs/double-conversion/double-conversion/bignum-dtoa.cc @@ -27,10 +27,10 @@ #include <cmath> -#include "bignum-dtoa.h" +#include <double-conversion/bignum-dtoa.h> -#include "bignum.h" -#include "ieee.h" +#include <double-conversion/bignum.h> +#include <double-conversion/ieee.h> namespace double_conversion { diff --git a/contrib/libs/double-conversion/bignum-dtoa.h b/contrib/libs/double-conversion/double-conversion/bignum-dtoa.h index 34b961992d6..9d15ce3dce9 100644 --- a/contrib/libs/double-conversion/bignum-dtoa.h +++ b/contrib/libs/double-conversion/double-conversion/bignum-dtoa.h @@ -28,7 +28,7 @@ #ifndef DOUBLE_CONVERSION_BIGNUM_DTOA_H_ #define DOUBLE_CONVERSION_BIGNUM_DTOA_H_ -#include "utils.h" +#include <double-conversion/utils.h> namespace double_conversion { diff --git a/contrib/libs/double-conversion/bignum.cc b/contrib/libs/double-conversion/double-conversion/bignum.cc index d077eef3f55..a7bc86d0c0e 100644 --- a/contrib/libs/double-conversion/bignum.cc +++ b/contrib/libs/double-conversion/double-conversion/bignum.cc @@ -25,8 +25,8 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include "bignum.h" -#include "utils.h" +#include <double-conversion/bignum.h> +#include <double-conversion/utils.h> namespace double_conversion { diff --git a/contrib/libs/double-conversion/bignum.h b/contrib/libs/double-conversion/double-conversion/bignum.h index 7c289fa2f6b..238a351196e 100644 --- a/contrib/libs/double-conversion/bignum.h +++ b/contrib/libs/double-conversion/double-conversion/bignum.h @@ -28,7 +28,7 @@ #ifndef DOUBLE_CONVERSION_BIGNUM_H_ #define DOUBLE_CONVERSION_BIGNUM_H_ -#include "utils.h" +#include <double-conversion/utils.h> namespace double_conversion { diff --git a/contrib/libs/double-conversion/cached-powers.cc b/contrib/libs/double-conversion/double-conversion/cached-powers.cc index 8ab281a1ba0..6f771e9c73d 100644 --- a/contrib/libs/double-conversion/cached-powers.cc +++ b/contrib/libs/double-conversion/double-conversion/cached-powers.cc @@ -29,9 +29,9 @@ #include <cmath> #include <cstdarg> -#include "utils.h" +#include <double-conversion/utils.h> -#include "cached-powers.h" +#include <double-conversion/cached-powers.h> namespace double_conversion { diff --git a/contrib/libs/double-conversion/cached-powers.h b/contrib/libs/double-conversion/double-conversion/cached-powers.h index 61a50614cf1..eabff4a15af 100644 --- a/contrib/libs/double-conversion/cached-powers.h +++ b/contrib/libs/double-conversion/double-conversion/cached-powers.h @@ -28,7 +28,7 @@ #ifndef DOUBLE_CONVERSION_CACHED_POWERS_H_ #define DOUBLE_CONVERSION_CACHED_POWERS_H_ -#include "diy-fp.h" +#include <double-conversion/diy-fp.h> namespace double_conversion { diff --git a/contrib/libs/double-conversion/diy-fp.cc b/contrib/libs/double-conversion/double-conversion/diy-fp.cc index ddd1891b168..82b0d08af4e 100644 --- a/contrib/libs/double-conversion/diy-fp.cc +++ b/contrib/libs/double-conversion/double-conversion/diy-fp.cc @@ -26,8 +26,8 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include "diy-fp.h" -#include "utils.h" +#include <double-conversion/diy-fp.h> +#include <double-conversion/utils.h> namespace double_conversion { diff --git a/contrib/libs/double-conversion/diy-fp.h b/contrib/libs/double-conversion/double-conversion/diy-fp.h index 2edf34674ee..e2011d43e5a 100644 --- a/contrib/libs/double-conversion/diy-fp.h +++ b/contrib/libs/double-conversion/double-conversion/diy-fp.h @@ -28,7 +28,7 @@ #ifndef DOUBLE_CONVERSION_DIY_FP_H_ #define DOUBLE_CONVERSION_DIY_FP_H_ -#include "utils.h" +#include <double-conversion/utils.h> namespace double_conversion { diff --git a/contrib/libs/double-conversion/double-conversion.cc b/contrib/libs/double-conversion/double-conversion/double-conversion.cc index 6ee6feb09b0..ecd1a5ef3f1 100644 --- a/contrib/libs/double-conversion/double-conversion.cc +++ b/contrib/libs/double-conversion/double-conversion/double-conversion.cc @@ -29,14 +29,14 @@ #include <locale> #include <cmath> -#include "double-conversion.h" - -#include "bignum-dtoa.h" -#include "fast-dtoa.h" -#include "fixed-dtoa.h" -#include "ieee.h" -#include "strtod.h" -#include "utils.h" +#include <double-conversion/double-conversion.h> + +#include <double-conversion/bignum-dtoa.h> +#include <double-conversion/fast-dtoa.h> +#include <double-conversion/fixed-dtoa.h> +#include <double-conversion/ieee.h> +#include <double-conversion/strtod.h> +#include <double-conversion/utils.h> namespace double_conversion { diff --git a/contrib/libs/double-conversion/double-conversion.h b/contrib/libs/double-conversion/double-conversion/double-conversion.h index 6dbc0997c61..7495d17a1d5 100644 --- a/contrib/libs/double-conversion/double-conversion.h +++ b/contrib/libs/double-conversion/double-conversion/double-conversion.h @@ -28,7 +28,7 @@ #ifndef DOUBLE_CONVERSION_DOUBLE_CONVERSION_H_ #define DOUBLE_CONVERSION_DOUBLE_CONVERSION_H_ -#include "utils.h" +#include <double-conversion/utils.h> namespace double_conversion { diff --git a/contrib/libs/double-conversion/fast-dtoa.cc b/contrib/libs/double-conversion/double-conversion/fast-dtoa.cc index 61350383a95..e5c222291f5 100644 --- a/contrib/libs/double-conversion/fast-dtoa.cc +++ b/contrib/libs/double-conversion/double-conversion/fast-dtoa.cc @@ -25,11 +25,11 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include "fast-dtoa.h" +#include <double-conversion/fast-dtoa.h> -#include "cached-powers.h" -#include "diy-fp.h" -#include "ieee.h" +#include <double-conversion/cached-powers.h> +#include <double-conversion/diy-fp.h> +#include <double-conversion/ieee.h> namespace double_conversion { diff --git a/contrib/libs/double-conversion/fast-dtoa.h b/contrib/libs/double-conversion/double-conversion/fast-dtoa.h index 5f1e8eee5e5..ac4317c04dd 100644 --- a/contrib/libs/double-conversion/fast-dtoa.h +++ b/contrib/libs/double-conversion/double-conversion/fast-dtoa.h @@ -28,7 +28,7 @@ #ifndef DOUBLE_CONVERSION_FAST_DTOA_H_ #define DOUBLE_CONVERSION_FAST_DTOA_H_ -#include "utils.h" +#include <double-conversion/utils.h> namespace double_conversion { diff --git a/contrib/libs/double-conversion/fixed-dtoa.cc b/contrib/libs/double-conversion/double-conversion/fixed-dtoa.cc index 0f989bceaf2..8c111aca642 100644 --- a/contrib/libs/double-conversion/fixed-dtoa.cc +++ b/contrib/libs/double-conversion/double-conversion/fixed-dtoa.cc @@ -27,8 +27,8 @@ #include <cmath> -#include "fixed-dtoa.h" -#include "ieee.h" +#include <double-conversion/fixed-dtoa.h> +#include <double-conversion/ieee.h> namespace double_conversion { diff --git a/contrib/libs/double-conversion/fixed-dtoa.h b/contrib/libs/double-conversion/double-conversion/fixed-dtoa.h index 3bdd08e21f5..a9436fc9f61 100644 --- a/contrib/libs/double-conversion/fixed-dtoa.h +++ b/contrib/libs/double-conversion/double-conversion/fixed-dtoa.h @@ -28,7 +28,7 @@ #ifndef DOUBLE_CONVERSION_FIXED_DTOA_H_ #define DOUBLE_CONVERSION_FIXED_DTOA_H_ -#include "utils.h" +#include <double-conversion/utils.h> namespace double_conversion { diff --git a/contrib/libs/double-conversion/ieee.h b/contrib/libs/double-conversion/double-conversion/ieee.h index 4a5fe8f9c0a..baaeced31ce 100644 --- a/contrib/libs/double-conversion/ieee.h +++ b/contrib/libs/double-conversion/double-conversion/ieee.h @@ -28,7 +28,7 @@ #ifndef DOUBLE_CONVERSION_DOUBLE_H_ #define DOUBLE_CONVERSION_DOUBLE_H_ -#include "diy-fp.h" +#include <double-conversion/diy-fp.h> namespace double_conversion { diff --git a/contrib/libs/double-conversion/strtod.cc b/contrib/libs/double-conversion/double-conversion/strtod.cc index a75cf5d9f1b..e8cc13f2de9 100644 --- a/contrib/libs/double-conversion/strtod.cc +++ b/contrib/libs/double-conversion/double-conversion/strtod.cc @@ -28,10 +28,10 @@ #include <climits> #include <cstdarg> -#include "bignum.h" -#include "cached-powers.h" -#include "ieee.h" -#include "strtod.h" +#include <double-conversion/bignum.h> +#include <double-conversion/cached-powers.h> +#include <double-conversion/ieee.h> +#include <double-conversion/strtod.h> namespace double_conversion { diff --git a/contrib/libs/double-conversion/strtod.h b/contrib/libs/double-conversion/double-conversion/strtod.h index ed0293b8f54..322651621fb 100644 --- a/contrib/libs/double-conversion/strtod.h +++ b/contrib/libs/double-conversion/double-conversion/strtod.h @@ -28,7 +28,7 @@ #ifndef DOUBLE_CONVERSION_STRTOD_H_ #define DOUBLE_CONVERSION_STRTOD_H_ -#include "utils.h" +#include <double-conversion/utils.h> namespace double_conversion { diff --git a/contrib/libs/double-conversion/utils.h b/contrib/libs/double-conversion/double-conversion/utils.h index 41c5b02d2c1..41c5b02d2c1 100644 --- a/contrib/libs/double-conversion/utils.h +++ b/contrib/libs/double-conversion/double-conversion/utils.h diff --git a/contrib/libs/double-conversion/include/double-conversion/double-conversion.h b/contrib/libs/double-conversion/include/double-conversion/double-conversion.h deleted file mode 100644 index 2f932d03acb..00000000000 --- a/contrib/libs/double-conversion/include/double-conversion/double-conversion.h +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once -#include <contrib/libs/double-conversion/double-conversion.h> diff --git a/contrib/libs/double-conversion/include/double-conversion/ieee.h b/contrib/libs/double-conversion/include/double-conversion/ieee.h deleted file mode 100644 index 778ce36f43a..00000000000 --- a/contrib/libs/double-conversion/include/double-conversion/ieee.h +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once -#include <contrib/libs/double-conversion/ieee.h> diff --git a/contrib/libs/double-conversion/ya.make b/contrib/libs/double-conversion/ya.make index 52e59b09891..738dd104f56 100644 --- a/contrib/libs/double-conversion/ya.make +++ b/contrib/libs/double-conversion/ya.make @@ -1,32 +1,34 @@ +# Generated by devtools/yamaker from nixpkgs 21.11. + LIBRARY() +OWNER(g:cpp-contrib) + VERSION(3.1.0) +ORIGINAL_SOURCE(https://github.com/google/double-conversion/archive/v3.1.0.tar.gz) + LICENSE(BSD-3-Clause) LICENSE_TEXTS(.yandex_meta/licenses.list.txt) -OWNER( - pg - g:contrib - g:cpp-contrib +ADDINCL( + GLOBAL contrib/libs/double-conversion ) NO_COMPILER_WARNINGS() NO_UTIL() -ADDINCL(GLOBAL contrib/libs/double-conversion/include) - SRCS( - cached-powers.cc - bignum-dtoa.cc - double-conversion.cc - diy-fp.cc - fixed-dtoa.cc - strtod.cc - bignum.cc - fast-dtoa.cc + double-conversion/bignum-dtoa.cc + double-conversion/bignum.cc + double-conversion/cached-powers.cc + double-conversion/diy-fp.cc + double-conversion/double-conversion.cc + double-conversion/fast-dtoa.cc + double-conversion/fixed-dtoa.cc + double-conversion/strtod.cc ) END() diff --git a/contrib/libs/poco/Foundation/CMakeLists.txt b/contrib/libs/poco/Foundation/CMakeLists.txt index 6622570f2d2..ccd8ee2caec 100644 --- a/contrib/libs/poco/Foundation/CMakeLists.txt +++ b/contrib/libs/poco/Foundation/CMakeLists.txt @@ -6,7 +6,7 @@ target_include_directories(libs-poco-Foundation PUBLIC ) target_include_directories(libs-poco-Foundation PRIVATE ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Foundation/include - ${CMAKE_SOURCE_DIR}/contrib/libs/double-conversion/include + ${CMAKE_SOURCE_DIR}/contrib/libs/double-conversion ${CMAKE_SOURCE_DIR}/contrib/libs/pcre ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Foundation/src ) diff --git a/contrib/libs/poco/Foundation/ya.make b/contrib/libs/poco/Foundation/ya.make index 9b22a799791..a5e94d7f601 100644 --- a/contrib/libs/poco/Foundation/ya.make +++ b/contrib/libs/poco/Foundation/ya.make @@ -26,7 +26,7 @@ PEERDIR( ADDINCL( GLOBAL contrib/libs/poco/Foundation/include - contrib/libs/double-conversion/include + contrib/libs/double-conversion contrib/libs/pcre contrib/libs/poco/Foundation/src ) diff --git a/contrib/libs/ya.make b/contrib/libs/ya.make index d590077bfe9..62cff47c590 100644 --- a/contrib/libs/ya.make +++ b/contrib/libs/ya.make @@ -48,6 +48,7 @@ RECURSE( cxxsupp/libcxxabi-parts djvulibre dlib + double-conversion dpdk dr_wav dwarflib diff --git a/util/string/cast.cpp b/util/string/cast.cpp index aa1e65a8e90..939a3e7a922 100644 --- a/util/string/cast.cpp +++ b/util/string/cast.cpp @@ -12,7 +12,7 @@ #include <util/string/cast.h> #include <util/string/escape.h> -#include <contrib/libs/double-conversion/double-conversion.h> +#include <contrib/libs/double-conversion/double-conversion/double-conversion.h> #include <util/generic/string.h> #include <util/system/yassert.h> diff --git a/ydb/core/io_formats/csv_ydb_dump.cpp b/ydb/core/io_formats/csv_ydb_dump.cpp index 803c4eb531a..683a55a0856 100644 --- a/ydb/core/io_formats/csv_ydb_dump.cpp +++ b/ydb/core/io_formats/csv_ydb_dump.cpp @@ -1,6 +1,6 @@ #include "csv.h" -#include <contrib/libs/double-conversion/double-conversion.h> +#include <contrib/libs/double-conversion/double-conversion/double-conversion.h> #include <ydb/library/binary_json/write.h> #include <ydb/library/dynumber/dynumber.h> diff --git a/ydb/core/tx/schemeshard/ut_restore.cpp b/ydb/core/tx/schemeshard/ut_restore.cpp index a8b33dcbdce..49777286ed6 100644 --- a/ydb/core/tx/schemeshard/ut_restore.cpp +++ b/ydb/core/tx/schemeshard/ut_restore.cpp @@ -1,4 +1,4 @@ -#include <contrib/libs/double-conversion/ieee.h> +#include <contrib/libs/double-conversion/double-conversion/ieee.h> #include <ydb/core/kqp/ut/common/kqp_ut_common.h> #include <ydb/core/tablet/resource_broker.h> diff --git a/ydb/library/yql/minikql/jsonpath/parse_double.cpp b/ydb/library/yql/minikql/jsonpath/parse_double.cpp index ebf2ff48f7d..f20476bfe92 100644 --- a/ydb/library/yql/minikql/jsonpath/parse_double.cpp +++ b/ydb/library/yql/minikql/jsonpath/parse_double.cpp @@ -1,7 +1,7 @@ #include "parse_double.h" -#include <contrib/libs/double-conversion/double-conversion.h> +#include <contrib/libs/double-conversion/double-conversion/double-conversion.h> #include <cmath> |