Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

fix egenesis build by removing it until theretical can fix it

Browse source
This commit is contained in:
Daniel Larimer 2015-08-06 14:46:56 -04:00
parent 23f485e66f
commit 274682d431
7 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/CMakeLists.txt
View file

@ -2,7 +2,7 @@ add_subdirectory( fc )
add_subdirectory( db ) add_subdirectory( db )
add_subdirectory( deterministic_openssl_rand ) add_subdirectory( deterministic_openssl_rand )
add_subdirectory( chain ) add_subdirectory( chain )
add_subdirectory( egenesis ) #add_subdirectory( egenesis )
add_subdirectory( net ) add_subdirectory( net )
add_subdirectory( time ) add_subdirectory( time )
add_subdirectory( utilities ) add_subdirectory( utilities )

1
programs/CMakeLists.txt
View file

@ -1,5 +1,4 @@
add_subdirectory( cli_wallet ) add_subdirectory( cli_wallet )
add_subdirectory( cli_full_wallet )
add_subdirectory( witness_node ) add_subdirectory( witness_node )
add_subdirectory( js_operation_serializer ) add_subdirectory( js_operation_serializer )
add_subdirectory( size_checker ) add_subdirectory( size_checker )

2
programs/cli_wallet/CMakeLists.txt
View file

@ -10,7 +10,7 @@ if( GPERFTOOLS_FOUND )
endif() endif()
target_link_libraries( cli_wallet target_link_libraries( cli_wallet
PRIVATE graphene_app graphene_net graphene_chain graphene_egenesis_brief graphene_utilities graphene_wallet fc ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} ) PRIVATE graphene_app graphene_net graphene_chain graphene_utilities graphene_wallet fc ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} )
if(MSVC) if(MSVC)
set_source_files_properties( main.cpp PROPERTIES COMPILE_FLAGS "/bigobj" ) set_source_files_properties( main.cpp PROPERTIES COMPILE_FLAGS "/bigobj" )

5
programs/cli_wallet/main.cpp
View file

@ -32,7 +32,7 @@
#include <graphene/app/api.hpp> #include <graphene/app/api.hpp>
#include <graphene/chain/protocol/protocol.hpp> #include <graphene/chain/protocol/protocol.hpp>
#include <graphene/egenesis/egenesis.hpp> //#include <graphene/egenesis/egenesis.hpp>
#include <graphene/utilities/key_conversion.hpp> #include <graphene/utilities/key_conversion.hpp>
#include <graphene/wallet/wallet.hpp> #include <graphene/wallet/wallet.hpp>
@ -146,8 +146,10 @@ int main( int argc, char** argv )
} }
else else
{ {
/*
wdata.chain_id = graphene::egenesis::get_egenesis_chain_id(); wdata.chain_id = graphene::egenesis::get_egenesis_chain_id();
std::cout << "Starting a new wallet with chain ID " << wdata.chain_id << " (from egenesis)\n"; std::cout << "Starting a new wallet with chain ID " << wdata.chain_id << " (from egenesis)\n";
*/
} }
} }
@ -169,6 +171,7 @@ int main( int argc, char** argv )
// TODO: Error message here // TODO: Error message here
FC_ASSERT( remote_api->login( wdata.ws_user, wdata.ws_password ) ); FC_ASSERT( remote_api->login( wdata.ws_user, wdata.ws_password ) );
wdata.chain_id = remote_api->database()->get_chain_id();
auto wapiptr = std::make_shared<wallet_api>( wdata.chain_id, remote_api ); auto wapiptr = std::make_shared<wallet_api>( wdata.chain_id, remote_api );
wapiptr->set_wallet_filename( wallet_file.generic_string() ); wapiptr->set_wallet_filename( wallet_file.generic_string() );
wapiptr->load_wallet_file(); wapiptr->load_wallet_file();

2
programs/js_operation_serializer/CMakeLists.txt
View file

@ -4,7 +4,7 @@ if( UNIX AND NOT APPLE )
endif() endif()
target_link_libraries( js_operation_serializer target_link_libraries( js_operation_serializer
PRIVATE graphene_app graphene_net graphene_chain graphene_egenesis_none graphene_utilities graphene_wallet fc ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} ) PRIVATE graphene_app graphene_net graphene_chain graphene_utilities graphene_wallet fc ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} )
install( TARGETS install( TARGETS
js_operation_serializer js_operation_serializer

2
programs/size_checker/CMakeLists.txt
View file

@ -4,7 +4,7 @@ if( UNIX AND NOT APPLE )
endif() endif()
target_link_libraries( size_checker target_link_libraries( size_checker
PRIVATE graphene_chain graphene_egenesis_none fc ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} ) PRIVATE graphene_chain fc ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} )
install( TARGETS install( TARGETS
size_checker size_checker

2
programs/witness_node/CMakeLists.txt
View file

@ -10,7 +10,7 @@ if( GPERFTOOLS_FOUND )
endif() endif()
target_link_libraries( witness_node target_link_libraries( witness_node
PRIVATE graphene_app graphene_account_history graphene_market_history graphene_witness graphene_chain graphene_egenesis_full fc ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} ) PRIVATE graphene_app graphene_account_history graphene_market_history graphene_witness graphene_chain fc ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} )
install( TARGETS install( TARGETS
witness_node witness_node