From db85d35b199caea5225cf85418932d1a1f40b5d9 Mon Sep 17 00:00:00 2001 From: Eric Frias Date: Mon, 22 Jun 2015 14:57:43 -0400 Subject: [PATCH] Fix out-of-source builds, make field_reflector report errors finding template file --- libraries/chain/CMakeLists.txt | 10 +++++----- libraries/chain/field_reflector.cpp | 8 +++++++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/libraries/chain/CMakeLists.txt b/libraries/chain/CMakeLists.txt index 2ec25bf7..0dbaa8c5 100644 --- a/libraries/chain/CMakeLists.txt +++ b/libraries/chain/CMakeLists.txt @@ -13,10 +13,10 @@ target_include_directories( field_reflector target_link_libraries( field_reflector fc graphene_db ) -add_custom_command( OUTPUT db_reflect_cmp.cpp - COMMAND field_reflector db_reflect_cmp.tmpl db_reflect_cmp.cpp.new - COMMAND ${CMAKE_COMMAND} -E copy_if_different db_reflect_cmp.cpp.new db_reflect_cmp.cpp - COMMAND ${CMAKE_COMMAND} -E remove db_reflect_cmp.cpp.new +add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/db_reflect_cmp.cpp + COMMAND field_reflector ${CMAKE_CURRENT_SOURCE_DIR}/db_reflect_cmp.tmpl ${CMAKE_CURRENT_BINARY_DIR}/db_reflect_cmp.cpp.new + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/db_reflect_cmp.cpp.new ${CMAKE_CURRENT_BINARY_DIR}/db_reflect_cmp.cpp + COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_CURRENT_BINARY_DIR}/db_reflect_cmp.cpp.new DEPENDS field_reflector db_reflect_cmp.tmpl ) @@ -25,7 +25,7 @@ add_library( graphene_chain types.cpp type_id.cpp - db_reflect_cmp.cpp + ${CMAKE_CURRENT_BINARY_DIR}/db_reflect_cmp.cpp address.cpp asset.cpp diff --git a/libraries/chain/field_reflector.cpp b/libraries/chain/field_reflector.cpp index ee4b2799..ead68f4e 100644 --- a/libraries/chain/field_reflector.cpp +++ b/libraries/chain/field_reflector.cpp @@ -222,12 +222,18 @@ int main( int argc, char** argv ) tmpl_params["cmp_attr_impl_body"] = generate_cmp_attr_impl( switch_table ); std::ifstream template_file( argv[1] ); + if (!template_file) + FC_THROW("Error opening template file ${template_file}", ("template_file", argv[1])); std::stringstream ss; ss << template_file.rdbuf(); std::string result = fc::format_string( ss.str(), tmpl_params ); std::ofstream result_file( argv[2] ); result_file << result; } - catch ( const fc::exception& e ){ edump((e.to_detail_string())); } + catch ( const fc::exception& e ) + { + edump((e.to_detail_string())); + return 1; + } return 0; }