CMake: Add install step for headers

As a requirement, all headers are moved to a new include/ path.
filecoin-project · Mar 9, 2020 · bdf013a · bdf013a
1 parent 7805604
commit bdf013a
Show file tree

Hide file tree

Showing 407 changed files with 957 additions and 955 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -110,7 +110,7 @@ endif()
 
 include_directories(
     # project includes
-    ${PROJECT_SOURCE_DIR}/core
+    ${PROJECT_SOURCE_DIR}/include
 )
 
 if (BUILD_INTERNAL_DEPS)

diff --git a/cmake/install.cmake b/cmake/install.cmake
@@ -16,6 +16,11 @@ function (filecoin_install targets)
       )
 endfunction()
 
+install(
+    DIRECTORY ${CMAKE_SOURCE_DIR}/include/filecoin
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+)
+
 install(
     EXPORT filecoinConfig
     DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/filecoin

diff --git a/core/adt/impl/array.cpp b/core/adt/impl/array.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "adt/array.hpp"
+#include "filecoin/adt/array.hpp"
 
 namespace fc::adt {
 

diff --git a/core/adt/impl/balance_table_hamt.cpp b/core/adt/impl/balance_table_hamt.cpp
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "adt/balance_table_hamt.hpp"
-#include "primitives/address/address_codec.hpp"
+#include "filecoin/adt/balance_table_hamt.hpp"
+#include "filecoin/primitives/address/address_codec.hpp"
 
 using fc::adt::BalanceTableHamt;
 using fc::adt::TokenAmount;

diff --git a/core/adt/impl/multimap.cpp b/core/adt/impl/multimap.cpp
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "adt/multimap.hpp"
+#include "filecoin/adt/multimap.hpp"
 
-#include "adt/array.hpp"
+#include "filecoin/adt/array.hpp"
 
 namespace fc::adt {
 

diff --git a/core/blockchain/impl/block_validator_impl.cpp b/core/blockchain/impl/block_validator_impl.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "blockchain/impl/block_validator_impl.hpp"
+#include "filecoin/blockchain/impl/block_validator_impl.hpp"
 
 namespace fc::blockchain::block_validator {
   // TODO (yuraz): FIL-87 implement proper validation

diff --git a/core/blockchain/impl/weight_calculator_impl.cpp b/core/blockchain/impl/weight_calculator_impl.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "blockchain/impl/weight_calculator_impl.hpp"
+#include "filecoin/blockchain/impl/weight_calculator_impl.hpp"
 
 namespace fc::blockchain::weight {
   using primitives::BigInt;

diff --git a/core/blockchain/message_pool/impl/gas_price_scored_message_storage.cpp b/core/blockchain/message_pool/impl/gas_price_scored_message_storage.cpp
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "blockchain/message_pool/impl/gas_price_scored_message_storage.hpp"
+#include "filecoin/blockchain/message_pool/impl/gas_price_scored_message_storage.hpp"
 
-#include "blockchain/message_pool/message_pool_error.hpp"
+#include "filecoin/blockchain/message_pool/message_pool_error.hpp"
 
 using fc::blockchain::message_pool::GasPriceScoredMessageStorage;
 using fc::blockchain::message_pool::MessagePoolError;

diff --git a/core/blockchain/message_pool/impl/message_pool_error.cpp b/core/blockchain/message_pool/impl/message_pool_error.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "blockchain/message_pool/message_pool_error.hpp"
+#include "filecoin/blockchain/message_pool/message_pool_error.hpp"
 
 OUTCOME_CPP_DEFINE_CATEGORY(fc::blockchain::message_pool, MessagePoolError, e) {
   using fc::blockchain::message_pool::MessagePoolError;

diff --git a/core/blockchain/production/impl/block_producer_impl.cpp b/core/blockchain/production/impl/block_producer_impl.cpp
@@ -3,17 +3,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "blockchain/production/impl/block_producer_impl.hpp"
+#include "filecoin/blockchain/production/impl/block_producer_impl.hpp"
 
 #include <vector>
 
 #include <gsl/span>
-#include "clock/chain_epoch_clock.hpp"
-#include "codec/cbor/cbor.hpp"
-#include "common/visitor.hpp"
-#include "primitives/cid/cid_of_cbor.hpp"
-#include "storage/amt/amt.hpp"
-#include "storage/ipfs/impl/in_memory_datastore.hpp"
+#include "filecoin/clock/chain_epoch_clock.hpp"
+#include "filecoin/codec/cbor/cbor.hpp"
+#include "filecoin/common/visitor.hpp"
+#include "filecoin/primitives/cid/cid_of_cbor.hpp"
+#include "filecoin/storage/amt/amt.hpp"
+#include "filecoin/storage/ipfs/impl/in_memory_datastore.hpp"
 
 namespace fc::blockchain::production {
   using clock::Time;

diff --git a/core/clock/chain_epoch_clock.cpp b/core/clock/chain_epoch_clock.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "clock/chain_epoch_clock.hpp"
+#include "filecoin/clock/chain_epoch_clock.hpp"
 
 OUTCOME_CPP_DEFINE_CATEGORY(fc::clock, EpochAtTimeError, e) {
   using fc::clock::EpochAtTimeError;

diff --git a/core/clock/impl/chain_epoch_clock_impl.cpp b/core/clock/impl/chain_epoch_clock_impl.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "clock/impl/chain_epoch_clock_impl.hpp"
+#include "filecoin/clock/impl/chain_epoch_clock_impl.hpp"
 
 namespace fc::clock {
   ChainEpochClockImpl::ChainEpochClockImpl(const Time &genesis_time)

diff --git a/core/clock/impl/utc_clock_impl.cpp b/core/clock/impl/utc_clock_impl.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "clock/impl/utc_clock_impl.hpp"
+#include "filecoin/clock/impl/utc_clock_impl.hpp"
 
 namespace fc::clock {
   // TODO(turuslan): add NTP sync if necessary

diff --git a/core/clock/time.cpp b/core/clock/time.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "clock/time.hpp"
+#include "filecoin/clock/time.hpp"
 
 #include <boost/date_time/posix_time/posix_time.hpp>
 

diff --git a/core/codec/cbor/cbor_decode_stream.cpp b/core/codec/cbor/cbor_decode_stream.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "codec/cbor/cbor_decode_stream.hpp"
+#include "filecoin/codec/cbor/cbor_decode_stream.hpp"
 
 namespace fc::codec::cbor {
   CborDecodeStream::CborDecodeStream(gsl::span<const uint8_t> data)

diff --git a/core/codec/cbor/cbor_encode_stream.cpp b/core/codec/cbor/cbor_encode_stream.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "codec/cbor/cbor_encode_stream.hpp"
+#include "filecoin/codec/cbor/cbor_encode_stream.hpp"
 
 namespace fc::codec::cbor {
   CborEncodeStream &CborEncodeStream::operator<<(

diff --git a/core/codec/cbor/cbor_errors.cpp b/core/codec/cbor/cbor_errors.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "codec/cbor/cbor_errors.hpp"
+#include "filecoin/codec/cbor/cbor_errors.hpp"
 
 OUTCOME_CPP_DEFINE_CATEGORY(fc::codec::cbor, CborEncodeError, e) {
   using fc::codec::cbor::CborEncodeError;

diff --git a/core/codec/cbor/cbor_resolve.cpp b/core/codec/cbor/cbor_resolve.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "codec/cbor/cbor_resolve.hpp"
+#include "filecoin/codec/cbor/cbor_resolve.hpp"
 
 OUTCOME_CPP_DEFINE_CATEGORY(fc::codec::cbor, CborResolveError, e) {
   using fc::codec::cbor::CborResolveError;

diff --git a/core/codec/rle/rle_plus_encoding_stream.cpp b/core/codec/rle/rle_plus_encoding_stream.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "codec/rle/rle_plus_encoding_stream.hpp"
+#include "filecoin/codec/rle/rle_plus_encoding_stream.hpp"
 
 namespace fc::codec::rle {
   void RLEPlusEncodingStream::initContent() {

diff --git a/core/codec/rle/rle_plus_errors.cpp b/core/codec/rle/rle_plus_errors.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "codec/rle/rle_plus_errors.hpp"
+#include "filecoin/codec/rle/rle_plus_errors.hpp"
 
 OUTCOME_CPP_DEFINE_CATEGORY(fc::codec::rle, RLEPlusDecodeError, e) {
   using fc::codec::rle::RLEPlusDecodeError;

diff --git a/core/common/CMakeLists.txt b/core/common/CMakeLists.txt
@@ -4,7 +4,6 @@
 #
 
 filecoin_add_library(filecoin_hexutil
-    hexutil.hpp
     hexutil.cpp
     )
 target_link_libraries(filecoin_hexutil
@@ -13,7 +12,6 @@ target_link_libraries(filecoin_hexutil
     )
 
 filecoin_add_library(filecoin_blob
-    blob.hpp
     blob.cpp
     )
 target_link_libraries(filecoin_blob
@@ -27,7 +25,6 @@ target_link_libraries(filecoin_outcome INTERFACE
     )
 
 filecoin_add_library(filecoin_buffer
-    buffer.hpp
     buffer.cpp
     buffer_back_insert_iterator.cpp
     )

diff --git a/core/common/blob.cpp b/core/common/blob.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "common/blob.hpp"
+#include "filecoin/common/blob.hpp"
 
 OUTCOME_CPP_DEFINE_CATEGORY(fc::common, BlobError, e) {
   using fc::common::BlobError;

diff --git a/core/common/buffer.cpp b/core/common/buffer.cpp
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "common/buffer.hpp"
+#include "filecoin/common/buffer.hpp"
 
-#include "common/hexutil.hpp"
+#include "filecoin/common/hexutil.hpp"
 
 namespace fc::common {
 

diff --git a/core/common/buffer_back_insert_iterator.cpp b/core/common/buffer_back_insert_iterator.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "common/buffer.hpp"
+#include "filecoin/common/buffer.hpp"
 
 using fc::common::Buffer;
 

diff --git a/core/common/hexutil.cpp b/core/common/hexutil.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "common/hexutil.hpp"
+#include "filecoin/common/hexutil.hpp"
 
 #include <boost/algorithm/hex.hpp>
 #include <boost/format.hpp>

diff --git a/core/common/logger.cpp b/core/common/logger.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "common/logger.hpp"
+#include "filecoin/common/logger.hpp"
 
 #include <spdlog/sinks/stdout_color_sinks.h>
 

diff --git a/core/crypto/blake2/blake2b.c b/core/crypto/blake2/blake2b.c
@@ -6,7 +6,7 @@
 // blake2b.c
 // A simple BLAKE2b Reference Implementation.
 
-#include "blake2b.h"
+#include "filecoin/crypto/blake2/blake2b.h"
 
 // Cyclic right rotation.
 

diff --git a/core/crypto/blake2/blake2b160.cpp b/core/crypto/blake2/blake2b160.cpp
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "crypto/blake2/blake2b160.hpp"
+#include "filecoin/crypto/blake2/blake2b160.hpp"
 
 #include <iostream>
-#include "crypto/blake2/blake2b.h"
+#include "filecoin/crypto/blake2/blake2b.h"
 
 namespace fc::crypto::blake2b {
 

diff --git a/core/crypto/blake2/blake2s.c b/core/crypto/blake2/blake2s.c
@@ -6,7 +6,7 @@
 // blake2s.c
 // A simple blake2s Reference Implementation.
 
-#include "blake2s.h"
+#include "filecoin/crypto/blake2/blake2s.h"
 
 #include <stdint.h>
 
@@ -210,4 +210,4 @@ void blake2s_256_init(blake2s_ctx *ctx_opaque) {
 
 void blake2s_256(void *out, const void *in, size_t inlen) {
   blake2s(out, _256_bits, NULL, 0, in, inlen);
-}
+}
diff --git a/core/crypto/bls/impl/bls_provider_impl.cpp b/core/crypto/bls/impl/bls_provider_impl.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "crypto/bls/impl/bls_provider_impl.hpp"
+#include "filecoin/crypto/bls/impl/bls_provider_impl.hpp"
 
 #include <gsl/gsl_util>
 

diff --git a/core/crypto/hasher/hasher.cpp b/core/crypto/hasher/hasher.cpp
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "hasher.hpp"
+#include "filecoin/crypto/hasher/hasher.hpp"
 
 #include <libp2p/crypto/sha/sha256.hpp>
-#include "crypto/blake2/blake2b160.hpp"
+#include "filecoin/crypto/blake2/blake2b160.hpp"
 
 namespace fc::crypto {
   std::map<Hasher::HashType, Hasher::HashMethod> Hasher::methods_{

diff --git a/core/crypto/murmur/murmur.cpp b/core/crypto/murmur/murmur.cpp
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "crypto/murmur/murmur.hpp"
+#include "filecoin/crypto/murmur/murmur.hpp"
 
-#include <common/buffer.hpp>
+#include "filecoin/common/buffer.hpp"
 
 namespace fc::crypto::murmur {
   uint64_t getUint64LE(gsl::span<const uint8_t> bytes) {

diff --git a/core/crypto/randomness/impl/chain_randomness_provider_impl.cpp b/core/crypto/randomness/impl/chain_randomness_provider_impl.cpp
@@ -3,14 +3,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "crypto/randomness/impl/chain_randomness_provider_impl.hpp"
+#include "filecoin/crypto/randomness/impl/chain_randomness_provider_impl.hpp"
 
 #include <boost/assert.hpp>
 #include <libp2p/crypto/sha/sha256.hpp>
-#include "common/le_encoder.hpp"
-#include "primitives/ticket/ticket.hpp"
-#include "primitives/tipset/tipset_key.hpp"
-#include "storage/chain/chain_store.hpp"
+#include "filecoin/common/le_encoder.hpp"
+#include "filecoin/primitives/ticket/ticket.hpp"
+#include "filecoin/primitives/tipset/tipset_key.hpp"
+#include "filecoin/storage/chain/chain_store.hpp"
 
 namespace fc::crypto::randomness {
 

diff --git a/core/crypto/randomness/impl/randomness_provider_impl.cpp b/core/crypto/randomness/impl/randomness_provider_impl.cpp
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "crypto/randomness/impl/randomness_provider_impl.hpp"
+#include "filecoin/crypto/randomness/impl/randomness_provider_impl.hpp"
 
 #include <libp2p/crypto/sha/sha256.hpp>
-#include "common/le_encoder.hpp"
+#include "filecoin/common/le_encoder.hpp"
 
 namespace fc::crypto::randomness {
 

diff --git a/core/crypto/signature/signature.cpp b/core/crypto/signature/signature.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "crypto/signature/signature.hpp"
+#include "filecoin/crypto/signature/signature.hpp"
 
 OUTCOME_CPP_DEFINE_CATEGORY(fc::crypto::signature, SignatureError, e) {
   using fc::crypto::signature::SignatureError;