move custom_appbase from under plugin to under libraries directory

libraries/CMakeLists.txt

@@ -7,6 +7,7 @@ set(BN256_INSTALL_COMPONENT "dev")
 
 add_subdirectory( libfc )
 add_subdirectory( builtins )
+add_subdirectory( custom_appbase )
 add_subdirectory( softfloat )
 add_subdirectory( wasm-jit )
 add_subdirectory( chainbase )

plugins/CMakeLists.txt

@@ -4,7 +4,6 @@ add_subdirectory(http_plugin)
 add_subdirectory(http_client_plugin)
 add_subdirectory(chain_plugin)
 add_subdirectory(chain_api_plugin)
-add_subdirectory(custom_appbase)
 add_subdirectory(producer_plugin)
 add_subdirectory(producer_api_plugin)
 add_subdirectory(state_history_plugin)

plugins/chain_plugin/chain_plugin.cpp

@@ -607,6 +607,8 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
       if( my->wasm_runtime )
          my->chain_config->wasm_runtime = *my->wasm_runtime;
 
+      ilog("!!!! wasm_runtime ${w}", ("w", my->chain_config->wasm_runtime));
+
       my->chain_config->force_all_checks = options.at( "force-all-checks" ).as<bool>();
       my->chain_config->disable_replay_opts = options.at( "disable-replay-opts" ).as<bool>();
       my->chain_config->contracts_console = options.at( "contracts-console" ).as<bool>();

plugins/http_client_plugin/CMakeLists.txt

@@ -4,4 +4,4 @@ add_library( http_client_plugin
              ${HEADERS} )
 
 target_link_libraries( http_client_plugin appbase eosio_chain fc )
-target_include_directories( http_client_plugin PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_SOURCE_DIR}/../custom_appbase/include" )
+target_include_directories( http_client_plugin PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/custom_appbase/include" )

plugins/http_plugin/CMakeLists.txt

@@ -4,4 +4,4 @@ add_library( http_plugin
              ${HEADERS} )
 
 target_link_libraries( http_plugin eosio_chain appbase fc )
-target_include_directories( http_plugin PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_SOURCE_DIR}/../custom_appbase/include" )
+target_include_directories( http_plugin PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/custom_appbase/include" )

plugins/signature_provider_plugin/CMakeLists.txt

@@ -4,4 +4,4 @@ add_library( signature_provider_plugin
              ${HEADERS} )
 
 target_link_libraries( signature_provider_plugin appbase fc http_client_plugin )
-target_include_directories( signature_provider_plugin PUBLIC include "${CMAKE_CURRENT_SOURCE_DIR}/../custom_appbase/include" )
+target_include_directories( signature_provider_plugin PUBLIC include "${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/custom_appbase/include" )

plugins/wallet_plugin/CMakeLists.txt

@@ -22,4 +22,4 @@ add_library( wallet_plugin
              ${HEADERS} )
 
 target_link_libraries( wallet_plugin eosio_chain appbase ${security_framework} ${corefoundation_framework} ${localauthentication_framework} ${cocoa_framework})
-target_include_directories( wallet_plugin PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_SOURCE_DIR}/../custom_appbase/include" )
+target_include_directories( wallet_plugin PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/custom_appbase/include" )

unittests/CMakeLists.txt

@@ -81,7 +81,7 @@ target_include_directories( unit_test PUBLIC
                             ${CMAKE_CURRENT_SOURCE_DIR}/contracts
                             ${CMAKE_CURRENT_BINARY_DIR}/contracts
                             ${CMAKE_CURRENT_BINARY_DIR}/include
-                            ${CMAKE_SOURCE_DIR}/plugins/custom_appbase/include
+                            ${CMAKE_SOURCE_DIR}/libraries/custom_appbase/include
                             ${CMAKE_SOURCE_DIR}/plugins/http_plugin/include )
 
 ### MARK TEST SUITES FOR EXECUTION ###