diff --git a/.gitignore b/.gitignore index 315a8bb2feb..52a03636b97 100644 --- a/.gitignore +++ b/.gitignore @@ -46,11 +46,11 @@ libraries/wasm-jit/Source/Programs/wavm programs/cleos/cleos programs/js_operation_serializer/js_operation_serializer programs/data-dir -programs/eosio-abigen/eosio-abigen +programs/enu-abigen/enu-abigen programs/cleos/config.hpp -programs/eosio-applesedemo/eosio-applesedemo -programs/eosio-launcher/config.hpp -programs/eosio-launcher/eosio-launcher +programs/enu-applesedemo/enu-applesedemo +programs/enu-launcher/config.hpp +programs/enu-launcher/enu-launcher programs/keosd/keosd programs/nodeos/config.hpp programs/nodeos/nodeos diff --git a/CMakeModules/doxygen.cmake b/CMakeModules/doxygen.cmake index 35950e58df8..b9f69d4e4a3 100644 --- a/CMakeModules/doxygen.cmake +++ b/CMakeModules/doxygen.cmake @@ -1,4 +1,4 @@ -configure_file("eos.doxygen.in" "${CMAKE_BINARY_DIR}/eos.doxygen") +configure_file("enu.doxygen.in" "${CMAKE_BINARY_DIR}/enu.doxygen") include(FindDoxygen) @@ -20,7 +20,7 @@ else() # Doxygen has issues making destination directories more than one level deep, so do it for it. add_custom_target(make_doc_dir ALL COMMAND ${CMAKE_COMMAND} -E make_directory "${DOXY_DOC_DEST_DIR}") add_custom_target(contract_documentation ALL - COMMAND "${DOXYGEN_EXECUTABLE}" "${CMAKE_BINARY_DIR}/eos.doxygen" + COMMAND "${DOXYGEN_EXECUTABLE}" "${CMAKE_BINARY_DIR}/enu.doxygen" DEPENDS make_doc_dir WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" COMMENT "Building doxygen documentation into ${DOXY_DOC_DEST_DIR}..." diff --git a/contracts/dice/dice.abi b/contracts/dice/dice.abi index 58cdfeec7f3..734d0c48cfd 100644 --- a/contracts/dice/dice.abi +++ b/contracts/dice/dice.abi @@ -1,5 +1,5 @@ { - "____comment": "This file was generated by eosio-abigen. DO NOT EDIT - 2018-03-29T02:09:11", + "____comment": "This file was generated by enu-abigen. DO NOT EDIT - 2018-03-29T02:09:11", "types": [], "structs": [{ "name": "offer", diff --git a/contracts/hello/hello.abi b/contracts/hello/hello.abi index 6f1e02d7b78..42d6d43dc14 100644 --- a/contracts/hello/hello.abi +++ b/contracts/hello/hello.abi @@ -1,5 +1,5 @@ { - "____comment": "This file was generated by eosio-abigen. DO NOT EDIT - 2018-04-16T13:37:55", + "____comment": "This file was generated by enu-abigen. DO NOT EDIT - 2018-04-16T13:37:55", "types": [], "structs": [{ "name": "hi", diff --git a/contracts/payloadless/payloadless.abi b/contracts/payloadless/payloadless.abi index b2616e94c3c..8f3ce978600 100644 --- a/contracts/payloadless/payloadless.abi +++ b/contracts/payloadless/payloadless.abi @@ -1,5 +1,5 @@ { - "____comment": "This file was generated by eosio-abigen. DO NOT EDIT - 2018-04-19T09:07:16", + "____comment": "This file was generated by enu-abigen. DO NOT EDIT - 2018-04-19T09:07:16", "types": [], "structs": [{ "name": "doit", diff --git a/eos-logo.png b/enu-logo.png similarity index 100% rename from eos-logo.png rename to enu-logo.png diff --git a/eos.doxygen.in b/enu.doxygen.in similarity index 99% rename from eos.doxygen.in rename to enu.doxygen.in index 7018d9d48dc..29f5704cc12 100644 --- a/eos.doxygen.in +++ b/enu.doxygen.in @@ -7,7 +7,7 @@ DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = "Enumivo" PROJECT_NUMBER = "DAWN ${DOXY_ENU_VERSION}" PROJECT_BRIEF = -PROJECT_LOGO = eos-logo.png +PROJECT_LOGO = enu-logo.png OUTPUT_DIRECTORY = CREATE_SUBDIRS = NO ALLOW_UNICODE_NAMES = NO diff --git a/programs/CMakeLists.txt b/programs/CMakeLists.txt index f395cfe7e74..8bc716f974f 100644 --- a/programs/CMakeLists.txt +++ b/programs/CMakeLists.txt @@ -1,6 +1,6 @@ add_subdirectory( nodeos ) add_subdirectory( cleos ) add_subdirectory( keosd ) -add_subdirectory( eosio-launcher ) -add_subdirectory( eosio-applesedemo ) -add_subdirectory( eosio-abigen ) +add_subdirectory( enu-launcher ) +add_subdirectory( enu-applesedemo ) +add_subdirectory( enu-abigen ) diff --git a/programs/eosio-abigen/CMakeLists.txt b/programs/enu-abigen/CMakeLists.txt similarity index 83% rename from programs/eosio-abigen/CMakeLists.txt rename to programs/enu-abigen/CMakeLists.txt index 93df3c89ef4..23681c60607 100644 --- a/programs/eosio-abigen/CMakeLists.txt +++ b/programs/enu-abigen/CMakeLists.txt @@ -3,7 +3,7 @@ find_package(LLVM 4.0 REQUIRED CONFIG) link_directories(${LLVM_LIBRARY_DIR}) -add_executable(eosio-abigen ${SOURCES}) +add_executable(enu-abigen ${SOURCES}) set( CMAKE_CXX_STANDARD 14 ) @@ -17,11 +17,11 @@ if( GPERFTOOLS_FOUND ) list( APPEND PLATFORM_SPECIFIC_LIBS tcmalloc ) endif() -target_link_libraries(eosio-abigen abi_generator) +target_link_libraries(enu-abigen abi_generator) install( TARGETS - eosio-abigen + enu-abigen RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} diff --git a/programs/eosio-abigen/main.cpp b/programs/enu-abigen/main.cpp similarity index 97% rename from programs/eosio-abigen/main.cpp rename to programs/enu-abigen/main.cpp index a56a79c0b38..2a9912ee614 100644 --- a/programs/eosio-abigen/main.cpp +++ b/programs/enu-abigen/main.cpp @@ -93,7 +93,7 @@ int main(int argc, const char **argv) { abi_def output; try { to_variant(output, vabi); auto comment = fc::format_string( - "This file was generated by eosio-abigen. DO NOT EDIT - ${ts}", + "This file was generated by enu-abigen. DO NOT EDIT - ${ts}", mvo("ts",fc::time_point_sec(fc::time_point::now()).to_iso_string())); auto abi_with_comment = mvo("____comment", comment)(mvo(vabi)); diff --git a/programs/eosio-applesedemo/CMakeLists.txt b/programs/enu-applesedemo/CMakeLists.txt similarity index 53% rename from programs/eosio-applesedemo/CMakeLists.txt rename to programs/enu-applesedemo/CMakeLists.txt index 61c23274cf1..efe7417d73b 100644 --- a/programs/eosio-applesedemo/CMakeLists.txt +++ b/programs/enu-applesedemo/CMakeLists.txt @@ -1,24 +1,24 @@ if(APPLE) -add_executable( eosio-applesedemo main.cpp r1_signature_compactor.cpp ) +add_executable( enu-applesedemo main.cpp r1_signature_compactor.cpp ) -target_link_libraries( eosio-applesedemo +target_link_libraries( enu-applesedemo PRIVATE fc ${PLATFORM_SPECIFIC_LIBS} ) -set_target_properties(eosio-applesedemo PROPERTIES LINK_FLAGS "-framework security -framework corefoundation") +set_target_properties(enu-applesedemo PROPERTIES LINK_FLAGS "-framework security -framework corefoundation") #Demostration of signing automatically during build; you will need to change parameters for your signing credentials #[[ -add_custom_command(TARGET eosio-applesedemo POST_BUILD - COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/sign.sh C5139C2C4D7FA071EFBFD86CE44B652631C9376A 5A4683969Z.one.block.eosio-applesedemo /Users/spoon/Library/MobileDevice/Provisioning\ Profiles/95813ad5-e880-432f-85c6-ade3b3298392.provisionprofile +add_custom_command(TARGET enu-applesedemo POST_BUILD + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/sign.sh C5139C2C4D7FA071EFBFD86CE44B652631C9376A 5A4683969Z.one.block.enu-applesedemo /Users/spoon/Library/MobileDevice/Provisioning\ Profiles/95813ad5-e880-432f-85c6-ade3b3298392.provisionprofile WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} VERBATIM ) ]] install( TARGETS - eosio-applesedemo + enu-applesedemo RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} diff --git a/programs/eosio-applesedemo/README.md b/programs/enu-applesedemo/README.md similarity index 100% rename from programs/eosio-applesedemo/README.md rename to programs/enu-applesedemo/README.md diff --git a/programs/eosio-applesedemo/main.cpp b/programs/enu-applesedemo/main.cpp similarity index 100% rename from programs/eosio-applesedemo/main.cpp rename to programs/enu-applesedemo/main.cpp diff --git a/programs/eosio-applesedemo/r1_signature_compactor.cpp b/programs/enu-applesedemo/r1_signature_compactor.cpp similarity index 100% rename from programs/eosio-applesedemo/r1_signature_compactor.cpp rename to programs/enu-applesedemo/r1_signature_compactor.cpp diff --git a/programs/eosio-applesedemo/r1_signature_compactor.hpp b/programs/enu-applesedemo/r1_signature_compactor.hpp similarity index 100% rename from programs/eosio-applesedemo/r1_signature_compactor.hpp rename to programs/enu-applesedemo/r1_signature_compactor.hpp diff --git a/programs/eosio-applesedemo/sign.sh b/programs/enu-applesedemo/sign.sh old mode 100755 new mode 100644 similarity index 100% rename from programs/eosio-applesedemo/sign.sh rename to programs/enu-applesedemo/sign.sh diff --git a/programs/eosio-launcher/CMakeLists.txt b/programs/enu-launcher/CMakeLists.txt similarity index 85% rename from programs/eosio-launcher/CMakeLists.txt rename to programs/enu-launcher/CMakeLists.txt index c0c19262e09..c42756d8f13 100644 --- a/programs/eosio-launcher/CMakeLists.txt +++ b/programs/enu-launcher/CMakeLists.txt @@ -1,4 +1,4 @@ -add_executable( eosio-launcher main.cpp ) +add_executable( enu-launcher main.cpp ) if( UNIX AND NOT APPLE ) set(rt_library rt ) endif() @@ -26,13 +26,13 @@ endif() configure_file(config.hpp.in config.hpp ESCAPE_QUOTES) -target_include_directories(eosio-launcher PUBLIC ${CMAKE_CURRENT_BINARY_DIR}) +target_include_directories(enu-launcher PUBLIC ${CMAKE_CURRENT_BINARY_DIR}) -target_link_libraries(eosio-launcher +target_link_libraries(enu-launcher PRIVATE eosio_chain fc ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} ) install( TARGETS - eosio-launcher + enu-launcher RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} diff --git a/programs/eosio-launcher/config.hpp.in b/programs/enu-launcher/config.hpp.in similarity index 100% rename from programs/eosio-launcher/config.hpp.in rename to programs/enu-launcher/config.hpp.in diff --git a/programs/eosio-launcher/main.cpp b/programs/enu-launcher/main.cpp similarity index 100% rename from programs/eosio-launcher/main.cpp rename to programs/enu-launcher/main.cpp diff --git a/tests/p2p_tests/sync/test.sh b/tests/p2p_tests/sync/test.sh index e07198d03d8..350c595945f 100755 --- a/tests/p2p_tests/sync/test.sh +++ b/tests/p2p_tests/sync/test.sh @@ -53,7 +53,7 @@ else fi total_nodes="${total_nodes:-`echo $pnodes`}" -launcherPath="programs/eosio-launcher/eosio-launcher" +launcherPath="programs/enu-launcher/enu-launcher" clientPath="programs/cleos/cleos" rm -rf etc/eosio/node_* var/lib/* stage diff --git a/tests/testUtils.py b/tests/testUtils.py index dd918a567be..0b3aa1626ea 100755 --- a/tests/testUtils.py +++ b/tests/testUtils.py @@ -30,7 +30,7 @@ class Utils: EosServerName="nodeos" EosServerPath="programs/nodeos/"+ EosServerName - EosLauncherPath="programs/eosio-launcher/eosio-launcher" + EosLauncherPath="programs/enu-launcher/enu-launcher" MongoPath="mongo" @staticmethod diff --git a/tests/trans_sync_across_mixed_cluster_test.sh b/tests/trans_sync_across_mixed_cluster_test.sh index 1e63cfe5d39..df420b3c4ca 100755 --- a/tests/trans_sync_across_mixed_cluster_test.sh +++ b/tests/trans_sync_across_mixed_cluster_test.sh @@ -66,7 +66,7 @@ verifyErrorCode() killAll() { - programs/eosio-launcher/eosio-launcher -k 15 + programs/enu-launcher/enu-launcher -k 15 } cleanup() @@ -114,7 +114,7 @@ cleanup # stand up nodeos cluster launcherOpts="-p $pnodes -n $total_nodes -s $topo -d $delay" echo Launcher options: --nodeos \"--plugin eosio::wallet_api_plugin\" $launcherOpts -programs/eosio-launcher/eosio-launcher --nodeos "--plugin eosio::wallet_api_plugin" $launcherOpts +programs/enu-launcher/enu-launcher --nodeos "--plugin eosio::wallet_api_plugin" $launcherOpts sleep 7 startPort=8888 diff --git a/tools/eosiocpp.in b/tools/eosiocpp.in index 0142ebc555c..fc1d7467135 100755 --- a/tools/eosiocpp.in +++ b/tools/eosiocpp.in @@ -5,7 +5,7 @@ if [ "${ENUMIVO_BIN_INSTALL_DIR}" == "." ]; then ENUMIVO_BIN_INSTALL_DIR=`pwd` fi ENUMIVO_INSTALL_DIR=`dirname ${ENUMIVO_BIN_INSTALL_DIR}` -ABIGEN=${ENUMIVO_INSTALL_DIR}/bin/eosio-abigen +ABIGEN=${ENUMIVO_INSTALL_DIR}/bin/enu-abigen BOOST_INCLUDE_DIR=@Boost_INCLUDE_DIR@ function copy_skeleton { set -e