Split out libethcore from libethereum.

CMakeLists.txt

@@ -2,8 +2,8 @@ cmake_policy(SET CMP0015 NEW)
 
 aux_source_directory(. SRC_LIST)
 
-include_directories(../secp256k1)
-include_directories(../libethereum)
+include_directories(..)
+link_directories(../libethcore)
 link_directories(../libethereum)
 
 add_executable(testeth ${SRC_LIST})

MemTrie.cpp

@@ -21,8 +21,8 @@
 
 #include "MemTrie.h"
 
-#include <CommonEth.h>
-#include <TrieCommon.h>
+#include <libethcore/TrieCommon.h>
+#include <libethereum/CommonEth.h>
 using namespace std;
 using namespace eth;
 

MemTrie.h

@@ -21,8 +21,8 @@
 
 #pragma once
 
-#include <Common.h>
-#include <FixedHash.h>
+#include <libethcore/Common.h>
+#include <libethcore/FixedHash.h>
 
 namespace eth
 {

TestHelper.cpp

@@ -21,7 +21,7 @@
 
 #include <thread>
 #include <chrono>
-#include <Client.h>
+#include <libethereum/Client.h>
 #include "TestHelper.h"
 
 namespace eth

TrieHash.cpp

@@ -21,8 +21,8 @@
 
 #include "TrieHash.h"
 
-#include <CommonEth.h>
-#include <TrieCommon.h>
+#include <libethcore/TrieCommon.h>
+#include <libethereum/CommonEth.h>
 using namespace std;
 using namespace eth;
 

TrieHash.h

@@ -21,8 +21,8 @@
 
 #pragma once
 
-#include <Common.h>
-#include <FixedHash.h>
+#include <libethcore/Common.h>
+#include <libethcore/FixedHash.h>
 
 namespace eth
 {

crypto.cpp

@@ -21,11 +21,11 @@
  */
 
 #include <random>
-#include <secp256k1.h>
-#include <Common.h>
-#include <RLP.h>
-#include <Log.h>
-#include <Transaction.h>
+#include <secp256k1/secp256k1.h>
+#include <libethcore/Common.h>
+#include <libethcore/RLP.h>
+#include <libethcore/Log.h>
+#include <libethereum/Transaction.h>
 #include <boost/test/unit_test.hpp>
 
 using namespace std;

dagger.cpp

@@ -21,8 +21,8 @@
  */
 
 #include <chrono>
-#include "Log.h"
-#include "Dagger.h"
+#include <libethcore/Log.h>
+#include <libethereum/Dagger.h>
 using namespace std;
 using namespace std::chrono;
 using namespace eth;

fork.cpp

@@ -22,9 +22,9 @@
 
 #include <boost/test/unit_test.hpp>
 #include <boost/filesystem/operations.hpp>
-#include <Client.h>
-#include <BlockChain.h>
-#include <PeerServer.h>
+#include <libethereum/Client.h>
+#include <libethereum/BlockChain.h>
+#include <libethereum/PeerServer.h>
 #include "TestHelper.h"
 using namespace std;
 using namespace eth;

hexPrefix.cpp

@@ -22,8 +22,8 @@
 
 #include <fstream>
 #include "JsonSpiritHeaders.h"
-#include "TrieCommon.h"
-#include "Log.h"
+#include <libethcore/TrieCommon.h>
+#include <libethcore/Log.h>
 #include <boost/test/unit_test.hpp>
 
 using namespace std;

main.cpp

@@ -33,7 +33,7 @@ int vmTest();
 int hexPrefixTest();
 int peerTest(int argc, char** argv);
 
-#include <BlockInfo.h>
+#include <libethereum/BlockInfo.h>
 using namespace eth;
 
 BOOST_AUTO_TEST_CASE(basic_tests)

network.cpp

@@ -22,9 +22,9 @@
 
 #include <boost/test/unit_test.hpp>
 #include <boost/filesystem/operations.hpp>
-#include <Client.h>
-#include <BlockChain.h>
-#include <PeerServer.h>
+#include <libethereum/Client.h>
+#include <libethereum/BlockChain.h>
+#include <libethereum/PeerServer.h>
 #include "TestHelper.h"
 using namespace std;
 using namespace eth;

peer.cpp

@@ -23,8 +23,8 @@
 #include <chrono>
 #include <thread>
 #include <boost/filesystem/operations.hpp>
-#include <BlockChain.h>
-#include <PeerServer.h>
+#include <libethereum/BlockChain.h>
+#include <libethereum/PeerServer.h>
 using namespace std;
 using namespace eth;
 using boost::asio::ip::tcp;

rlp.cpp

@@ -23,9 +23,9 @@
 #include <fstream>
 #include <sstream>
 #include "JsonSpiritHeaders.h"
-#include <Log.h>
-#include <RLP.h>
-#include <Common.h>
+#include <libethcore/Log.h>
+#include <libethcore/RLP.h>
+#include <libethcore/Common.h>
 #include <boost/test/unit_test.hpp>
 #include <algorithm>
 

state.cpp

@@ -21,10 +21,10 @@
  */
 
 #include <boost/filesystem/operations.hpp>
-#include <secp256k1.h>
-#include <BlockChain.h>
-#include <State.h>
-#include <Defaults.h>
+#include <secp256k1/secp256k1.h>
+#include <libethereum/BlockChain.h>
+#include <libethereum/State.h>
+#include <libethereum/Defaults.h>
 using namespace std;
 using namespace eth;
 

trie.cpp

@@ -23,7 +23,7 @@
 #include <fstream>
 #include <random>
 #include "JsonSpiritHeaders.h"
-#include <TrieDB.h>
+#include <libethcore/TrieDB.h>
 #include "TrieHash.h"
 #include "MemTrie.h"
 #include <boost/test/unit_test.hpp>

txTest.cpp

@@ -22,9 +22,9 @@
 
 #include <boost/test/unit_test.hpp>
 #include <boost/filesystem/operations.hpp>
-#include <Client.h>
-#include <BlockChain.h>
-#include <PeerServer.h>
+#include <libethereum/Client.h>
+#include <libethereum/BlockChain.h>
+#include <libethereum/PeerServer.h>
 #include "TestHelper.h"
 using namespace std;
 using namespace eth;

vm.cpp

@@ -21,11 +21,11 @@
  */
 
 #include <fstream>
-#include <ExtVMFace.h>
-#include <Transaction.h>
-#include <VM.h>
-#include <Log.h>
-#include <Instruction.h>
+#include <libethcore/Log.h>
+#include <libethereum/ExtVMFace.h>
+#include <libethereum/Transaction.h>
+#include <libethereum/VM.h>
+#include <libethereum/Instruction.h>
 #include "JsonSpiritHeaders.h"
 #include <boost/test/unit_test.hpp>