Reorganize project

citp · Apr 24, 2018 · 6842bec · 6842bec
1 parent 9a9901d
commit 6842bec
Show file tree

Hide file tree

Showing 266 changed files with 85 additions and 1,325 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,12 @@
 release
 xcode
 debug
+build
 *.DS_Store
-Notebooks/blocksci/pybind11
+Notebooks/blocksci
 *.so
+*.dylib
 *.pyc
-src/blocksci/include/blocksci/external
+include/blocksci/external
+python/blocksci/pybind11
+*.egg-info
diff --git a/.gitmodules b/.gitmodules
@@ -1,5 +1,5 @@
 [submodule "libs/pybind11"]
-	path = external/pybind11
+	path = python/blocksci/pybind11
 	url = https://github.com/pybind/pybind11/
 [submodule "libs/bitcoin-api-cpp"]
 	path = external/bitcoin-api-cpp
@@ -14,7 +14,7 @@
 	path = external/range-v3
 	url = https://github.com/ericniebler/range-v3.git
 [submodule "Notebooks/blocksci/Blockchain-Known-Pools"]
-	path = Notebooks/blocksci/Blockchain-Known-Pools
+	path = python/blocksci/Blockchain-Known-Pools
 	url = https://github.com/blockchain/Blockchain-Known-Pools
 [submodule "libs/clipp"]
 	path = external/clipp

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,15 +5,11 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
 
 set(BlockSci_VERSION 0.5.0)
 
-add_subdirectory(external)
+option(BLOCKSCI_PYTHON_BUILD "Install pybind11 header files?" OFF)
 
-add_subdirectory(src/blocksci)
-add_subdirectory(src/parser)
-add_subdirectory(src/mempool_recorder)
-add_subdirectory(src/python-interface)
-add_subdirectory(src/clusterer)
-add_subdirectory(src/benchmark)
-add_subdirectory(src/example)
+add_subdirectory(external)
 
-include( CMakePackageConfigHelpers )
-set(CONFIG_PACKAGE_INSTALL_DIR lib/cmake/blocksci)
+add_subdirectory(src)
+add_subdirectory(tools)
+add_subdirectory(benchmark)
+add_subdirectory(example)
diff --git a/src/benchmark/CMakeLists.txt → benchmark/CMakeLists.txt b/src/benchmark/CMakeLists.txt → benchmark/CMakeLists.txt
@@ -1,4 +1,9 @@
-add_executable(blocksci_benchmark main.cpp)
+cmake_minimum_required(VERSION 3.5)
+project(blocksci_benchmark)
+
+find_package(blocksci REQUIRED)
+
+add_executable(blocksci_benchmark EXCLUDE_FROM_ALL main.cpp)
 
 target_compile_options(blocksci_benchmark PRIVATE -Wall -Wextra -Wpedantic)
 

diff --git a/src/benchmark/main.cpp → benchmark/main.cpp b/src/benchmark/main.cpp → benchmark/main.cpp
diff --git a/blocksci/Blockchain-Known-Pools/README.md b/blocksci/Blockchain-Known-Pools/README.md