Merge pull request btccom#239 from btccom/3rdparty-deps

Move third party codes to a separate directory
tongxiaofeng · Feb 8, 2019 · 680e042 · 680e042
2 parents 9b4cb39 + 9d89af6
commit 680e042
Show file tree

Hide file tree

Showing 72 changed files with 23 additions and 2,750 deletions.
diff --git a/src/bytom/cutil/CMakeLists.txt → 3rdparty/bytom/cutil/CMakeLists.txt b/src/bytom/cutil/CMakeLists.txt → 3rdparty/bytom/cutil/CMakeLists.txt
diff --git a/src/bytom/cutil/src/BytomPoW.h → 3rdparty/bytom/cutil/src/BytomPoW.h b/src/bytom/cutil/src/BytomPoW.h → 3rdparty/bytom/cutil/src/BytomPoW.h
diff --git a/src/bytom/cutil/src/BytomPoWGpu.cu → 3rdparty/bytom/cutil/src/BytomPoWGpu.cu b/src/bytom/cutil/src/BytomPoWGpu.cu → 3rdparty/bytom/cutil/src/BytomPoWGpu.cu
diff --git a/src/bytom/cutil/src/GpuTs.cpp → 3rdparty/bytom/cutil/src/GpuTs.cpp b/src/bytom/cutil/src/GpuTs.cpp → 3rdparty/bytom/cutil/src/GpuTs.cpp
diff --git a/src/bytom/cutil/src/GpuTs.h → 3rdparty/bytom/cutil/src/GpuTs.h b/src/bytom/cutil/src/GpuTs.h → 3rdparty/bytom/cutil/src/GpuTs.h
diff --git a/src/bytom/cutil/src/byte_order-allInOne.h → ...rty/bytom/cutil/src/byte_order-allInOne.h b/src/bytom/cutil/src/byte_order-allInOne.h → ...rty/bytom/cutil/src/byte_order-allInOne.h
diff --git a/src/bytom/cutil/src/scrypt.h → 3rdparty/bytom/cutil/src/scrypt.h b/src/bytom/cutil/src/scrypt.h → 3rdparty/bytom/cutil/src/scrypt.h
diff --git a/src/bytom/cutil/src/seed.h → 3rdparty/bytom/cutil/src/seed.h b/src/bytom/cutil/src/seed.h → 3rdparty/bytom/cutil/src/seed.h
diff --git a/src/bytom/cutil/src/sha3-allInOne.h → 3rdparty/bytom/cutil/src/sha3-allInOne.h b/src/bytom/cutil/src/sha3-allInOne.h → 3rdparty/bytom/cutil/src/sha3-allInOne.h
diff --git a/src/bytom/cutil/src/ustd.h → 3rdparty/bytom/cutil/src/ustd.h b/src/bytom/cutil/src/ustd.h → 3rdparty/bytom/cutil/src/ustd.h
diff --git a/src/bytom/cutil/test/nonceutil.go → 3rdparty/bytom/cutil/test/nonceutil.go b/src/bytom/cutil/test/nonceutil.go → 3rdparty/bytom/cutil/test/nonceutil.go
diff --git a/src/bytom/cutil/test/nonceutil_test.go → 3rdparty/bytom/cutil/test/nonceutil_test.go b/src/bytom/cutil/test/nonceutil_test.go → 3rdparty/bytom/cutil/test/nonceutil_test.go
diff --git a/src/libblake2/CMakeLists.txt → 3rdparty/libblake2/CMakeLists.txt b/src/libblake2/CMakeLists.txt → 3rdparty/libblake2/CMakeLists.txt
diff --git a/src/libblake2/blake2-impl.h → 3rdparty/libblake2/blake2-impl.h b/src/libblake2/blake2-impl.h → 3rdparty/libblake2/blake2-impl.h
diff --git a/src/libblake2/blake2.h → 3rdparty/libblake2/blake2.h b/src/libblake2/blake2.h → 3rdparty/libblake2/blake2.h
diff --git a/src/libblake2/blake2b-ref.c → 3rdparty/libblake2/blake2b-ref.c b/src/libblake2/blake2b-ref.c → 3rdparty/libblake2/blake2b-ref.c
diff --git a/src/libblake2/blake2bp-ref.c → 3rdparty/libblake2/blake2bp-ref.c b/src/libblake2/blake2bp-ref.c → 3rdparty/libblake2/blake2bp-ref.c
diff --git a/src/libblake2/blake2s-ref.c → 3rdparty/libblake2/blake2s-ref.c b/src/libblake2/blake2s-ref.c → 3rdparty/libblake2/blake2s-ref.c
diff --git a/src/libblake2/blake2sp-ref.c → 3rdparty/libblake2/blake2sp-ref.c b/src/libblake2/blake2sp-ref.c → 3rdparty/libblake2/blake2sp-ref.c
diff --git a/src/libblake2/blake2xb-ref.c → 3rdparty/libblake2/blake2xb-ref.c b/src/libblake2/blake2xb-ref.c → 3rdparty/libblake2/blake2xb-ref.c
diff --git a/src/libblake2/blake2xs-ref.c → 3rdparty/libblake2/blake2xs-ref.c b/src/libblake2/blake2xs-ref.c → 3rdparty/libblake2/blake2xs-ref.c
diff --git a/src/libblake2/genkat-c.c → 3rdparty/libblake2/genkat-c.c b/src/libblake2/genkat-c.c → 3rdparty/libblake2/genkat-c.c
diff --git a/src/libblake2/genkat-json.c → 3rdparty/libblake2/genkat-json.c b/src/libblake2/genkat-json.c → 3rdparty/libblake2/genkat-json.c
diff --git a/src/libblake2/makefile → 3rdparty/libblake2/makefile b/src/libblake2/makefile → 3rdparty/libblake2/makefile
diff --git a/src/libethash/CMakeLists.txt → 3rdparty/libethash/CMakeLists.txt b/src/libethash/CMakeLists.txt → 3rdparty/libethash/CMakeLists.txt
diff --git a/src/libethash/compiler.h → 3rdparty/libethash/compiler.h b/src/libethash/compiler.h → 3rdparty/libethash/compiler.h
diff --git a/src/libethash/data_sizes.h → 3rdparty/libethash/data_sizes.h b/src/libethash/data_sizes.h → 3rdparty/libethash/data_sizes.h
diff --git a/src/libethash/endian.h → 3rdparty/libethash/endian.h b/src/libethash/endian.h → 3rdparty/libethash/endian.h
diff --git a/src/libethash/ethash.h → 3rdparty/libethash/ethash.h b/src/libethash/ethash.h → 3rdparty/libethash/ethash.h
diff --git a/src/libethash/fnv.h → 3rdparty/libethash/fnv.h b/src/libethash/fnv.h → 3rdparty/libethash/fnv.h
diff --git a/src/libethash/internal.c → 3rdparty/libethash/internal.c b/src/libethash/internal.c → 3rdparty/libethash/internal.c
diff --git a/src/libethash/internal.h → 3rdparty/libethash/internal.h b/src/libethash/internal.h → 3rdparty/libethash/internal.h
diff --git a/src/libethash/io.c → 3rdparty/libethash/io.c b/src/libethash/io.c → 3rdparty/libethash/io.c
diff --git a/src/libethash/io.h → 3rdparty/libethash/io.h b/src/libethash/io.h → 3rdparty/libethash/io.h
diff --git a/src/libethash/io_posix.c → 3rdparty/libethash/io_posix.c b/src/libethash/io_posix.c → 3rdparty/libethash/io_posix.c
diff --git a/src/libethash/io_win32.c → 3rdparty/libethash/io_win32.c b/src/libethash/io_win32.c → 3rdparty/libethash/io_win32.c
diff --git a/src/libethash/mmap.h → 3rdparty/libethash/mmap.h b/src/libethash/mmap.h → 3rdparty/libethash/mmap.h
diff --git a/src/libethash/mmap_win32.c → 3rdparty/libethash/mmap_win32.c b/src/libethash/mmap_win32.c → 3rdparty/libethash/mmap_win32.c
diff --git a/src/libethash/sha3.c → 3rdparty/libethash/sha3.c b/src/libethash/sha3.c → 3rdparty/libethash/sha3.c
diff --git a/src/libethash/sha3.h → 3rdparty/libethash/sha3.h b/src/libethash/sha3.h → 3rdparty/libethash/sha3.h
diff --git a/src/libethash/util.c → 3rdparty/libethash/util.c b/src/libethash/util.c → 3rdparty/libethash/util.c
diff --git a/src/libethash/util.h → 3rdparty/libethash/util.h b/src/libethash/util.h → 3rdparty/libethash/util.h
diff --git a/src/libethash/util_win32.c → 3rdparty/libethash/util_win32.c b/src/libethash/util_win32.c → 3rdparty/libethash/util_win32.c
diff --git a/src/libsph/CMakeLists.txt → 3rdparty/libsph/CMakeLists.txt b/src/libsph/CMakeLists.txt → 3rdparty/libsph/CMakeLists.txt
diff --git a/src/libsph/blake.c → 3rdparty/libsph/blake.c b/src/libsph/blake.c → 3rdparty/libsph/blake.c
diff --git a/src/libsph/sph_blake.h → 3rdparty/libsph/sph_blake.h b/src/libsph/sph_blake.h → 3rdparty/libsph/sph_blake.h
diff --git a/src/libsph/sph_types.h → 3rdparty/libsph/sph_types.h b/src/libsph/sph_types.h → 3rdparty/libsph/sph_types.h
diff --git a/src/utilities_js.hpp → 3rdparty/utilities_js.hpp b/src/utilities_js.hpp → 3rdparty/utilities_js.hpp
diff --git a/src/zlibstream/LICENSE → 3rdparty/zlibstream/LICENSE b/src/zlibstream/LICENSE → 3rdparty/zlibstream/LICENSE
diff --git a/src/zlibstream/README.org → 3rdparty/zlibstream/README.org b/src/zlibstream/README.org → 3rdparty/zlibstream/README.org
diff --git a/src/zlibstream/strict_fstream.hpp → 3rdparty/zlibstream/strict_fstream.hpp b/src/zlibstream/strict_fstream.hpp → 3rdparty/zlibstream/strict_fstream.hpp
diff --git a/src/zlibstream/zstr.hpp → 3rdparty/zlibstream/zstr.hpp b/src/zlibstream/zstr.hpp → 3rdparty/zlibstream/zstr.hpp
diff --git a/src/zmq.hpp → 3rdparty/zmq.hpp b/src/zmq.hpp → 3rdparty/zmq.hpp
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -179,7 +179,7 @@ endif()
 #   message("    Nvidia CUDA toolkit 9.1 or later required (https://developer.nvidia.com/cuda-downloads).")
 #   message("    https://github.com/Bytom/bytom need to be cloned to $GOPATH/src")
 #   message("    If you want to update the prebuild libGpuTs.a,")
-#   message("    you can copy it from ${CMAKE_BINARY_DIR}/src/bytom/cutil/src to ${PROJECT_SOURCE_DIR}/prebuild/bytom")
+#   message("    you can copy it from ${CMAKE_BINARY_DIR}/3rdparty/bytom/cutil/src to ${PROJECT_SOURCE_DIR}/prebuild/bytom")
 # 
 #   set(GPUTS_LIBRARY GpuTs)
 # else()
@@ -380,21 +380,36 @@ if (REBUILD_BH_SHARED)
   )
 endif()
 
-add_subdirectory(src/libethash)
-add_subdirectory(src/libblake2)
-add_subdirectory(src/libsph)
+add_subdirectory(3rdparty/libblake2)
+add_subdirectory(3rdparty/libethash)
+add_subdirectory(3rdparty/libsph)
 
 if(USE_CUDA)
   set(USE_CUDA_INCLUDE_DIRECTORY ${CUDA_INCLUDE_DIRECTORIES})
-  add_subdirectory(src/bytom/cutil)
+  add_subdirectory(3rdparty/bytom/cutil)
   set(USE_CUDA_LIBRARIES GpuTs ${CUDA_LIBRARIES} ${CUDA_CUBLAS_LIBRARIES})
 else()
   add_definitions(-DNO_CUDA)
 endif(USE_CUDA)
 
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/src src test ${CHAIN_SRC_ROOT}/src ${CHAIN_SRC_ROOT}/src/config ${CHAIN_SRC_ROOT}/src/secp256k1/include
-	${OPENSSL_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${LIBZMQ_INCLUDE_DIR} ${GLOG_INCLUDE_DIRS} ${KAFKA_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS}
-                    ${LIBEVENT_INCLUDE_DIR} ${USE_CUDA_INCLUDE_DIRECTORY} ${BH_SHARED_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR})
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}/src
+  3rdparty
+  src
+  test
+  ${CHAIN_SRC_ROOT}/src
+  ${CHAIN_SRC_ROOT}/src/config
+  ${CHAIN_SRC_ROOT}/src/secp256k1/include
+  ${OPENSSL_INCLUDE_DIR}
+  ${Boost_INCLUDE_DIRS}
+  ${LIBZMQ_INCLUDE_DIR}
+  ${GLOG_INCLUDE_DIRS}
+  ${KAFKA_INCLUDE_DIRS}
+  ${ZLIB_INCLUDE_DIRS}
+  ${LIBEVENT_INCLUDE_DIR}
+  ${USE_CUDA_INCLUDE_DIRECTORY}
+  ${BH_SHARED_INCLUDE_DIR}
+  ${MYSQL_INCLUDE_DIR})
 
 set(THIRD_LIBRARIES ethash blake2 sph ${BH_SHARED_LIBRARY} ${USE_CUDA_LIBRARIES}
                     ${BITCOIN_LIBRARIES} ${secp256k1_LIBRARIES} ${GLOG_LIBRARIES} ${KAFKA_LIBRARIES} ${ZLIB_LIBRARIES} ${ZOOKEEPER_LIBRARIES}

diff --git a/src/bytom/cutil/src/BytomPoWGpu.o b/src/bytom/cutil/src/BytomPoWGpu.o
diff --git a/src/bytom/cutil/src/GpuTs.o b/src/bytom/cutil/src/GpuTs.o
diff --git a/src/bytom/cutil/src/build/CMakeCache.txt b/src/bytom/cutil/src/build/CMakeCache.txt