Merge pull request EOSIO#109 from enumivo/staging

remove hyphens in program names
bithacks-tech · May 16, 2018 · e82a2b7 · e82a2b7
2 parents 524db6d + 4c8e9b5
commit e82a2b7
Show file tree

Hide file tree

Showing 20 changed files with 29 additions and 29 deletions.
diff --git a/.gitignore b/.gitignore
@@ -46,11 +46,11 @@ libraries/wasm-jit/Source/Programs/wavm
 programs/enucli/enucli
 programs/js_operation_serializer/js_operation_serializer
 programs/data-dir
-programs/enu-abigen/enu-abigen
+programs/enugenabi/enugenabi
 programs/enucli/config.hpp
-programs/enu-applesedemo/enu-applesedemo
-programs/enu-launcher/config.hpp
-programs/enu-launcher/enu-launcher
+programs/enuapplesedemo/enuapplesedemo
+programs/enulauncher/config.hpp
+programs/enulauncher/enulauncher
 programs/enuwallet/enuwallet
 programs/enunode/config.hpp
 programs/enunode/enunode

diff --git a/contracts/dice/dice.abi b/contracts/dice/dice.abi
@@ -1,5 +1,5 @@
 {
-  "____comment": "This file was generated by enu-abigen. DO NOT EDIT - 2018-03-29T02:09:11",
+  "____comment": "This file was generated by enugenabi. DO NOT EDIT - 2018-03-29T02:09:11",
   "types": [],
   "structs": [{
       "name": "offer",

diff --git a/contracts/hello/hello.abi b/contracts/hello/hello.abi
@@ -1,5 +1,5 @@
 {
-  "____comment": "This file was generated by enu-abigen. DO NOT EDIT - 2018-04-16T13:37:55",
+  "____comment": "This file was generated by enugenabi. DO NOT EDIT - 2018-04-16T13:37:55",
   "types": [],
   "structs": [{
       "name": "hi",

diff --git a/contracts/payloadless/payloadless.abi b/contracts/payloadless/payloadless.abi
@@ -1,5 +1,5 @@
 {
-  "____comment": "This file was generated by enu-abigen. DO NOT EDIT - 2018-04-19T09:07:16",
+  "____comment": "This file was generated by enugenabi. DO NOT EDIT - 2018-04-19T09:07:16",
   "types": [],
   "structs": [{
       "name": "doit",

diff --git a/programs/CMakeLists.txt b/programs/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_subdirectory( enunode )
 add_subdirectory( enucli )
 add_subdirectory( enuwallet )
-add_subdirectory( enu-launcher )
-add_subdirectory( enu-applesedemo )
-add_subdirectory( enu-abigen )
+add_subdirectory( enulauncher )
+add_subdirectory( enuapplesedemo )
+add_subdirectory( enugenabi )
diff --git a/programs/enu-applesedemo/CMakeLists.txt → programs/enuapplesedemo/CMakeLists.txt b/programs/enu-applesedemo/CMakeLists.txt → programs/enuapplesedemo/CMakeLists.txt
@@ -1,24 +1,24 @@
 if(APPLE)
-add_executable( enu-applesedemo main.cpp r1_signature_compactor.cpp )
+add_executable( enuapplesedemo main.cpp r1_signature_compactor.cpp )
 
 
-target_link_libraries( enu-applesedemo
+target_link_libraries( enuapplesedemo
         PRIVATE fc ${PLATFORM_SPECIFIC_LIBS} 
         )
 
-set_target_properties(enu-applesedemo PROPERTIES LINK_FLAGS "-framework security -framework corefoundation")
+set_target_properties(enuapplesedemo 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 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
+add_custom_command(TARGET enuapplesedemo POST_BUILD
+                   COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/sign.sh C5139C2C4D7FA071EFBFD86CE44B652631C9376A 5A4683969Z.one.block.enuapplesedemo /Users/spoon/Library/MobileDevice/Provisioning\ Profiles/95813ad5-e880-432f-85c6-ade3b3298392.provisionprofile
                    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
                    VERBATIM
                   )
 ]]
 
 install( TARGETS
-   enu-applesedemo
+   enuapplesedemo
 
    RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
    LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}

diff --git a/programs/enu-applesedemo/README.md → programs/enuapplesedemo/README.md b/programs/enu-applesedemo/README.md → programs/enuapplesedemo/README.md
diff --git a/programs/enu-applesedemo/main.cpp → programs/enuapplesedemo/main.cpp b/programs/enu-applesedemo/main.cpp → programs/enuapplesedemo/main.cpp
diff --git a/...nu-applesedemo/r1_signature_compactor.cpp → ...enuapplesedemo/r1_signature_compactor.cpp b/...nu-applesedemo/r1_signature_compactor.cpp → ...enuapplesedemo/r1_signature_compactor.cpp
diff --git a/...nu-applesedemo/r1_signature_compactor.hpp → ...enuapplesedemo/r1_signature_compactor.hpp b/...nu-applesedemo/r1_signature_compactor.hpp → ...enuapplesedemo/r1_signature_compactor.hpp
diff --git a/programs/enu-applesedemo/sign.sh → programs/enuapplesedemo/sign.sh b/programs/enu-applesedemo/sign.sh → programs/enuapplesedemo/sign.sh
diff --git a/programs/enu-abigen/CMakeLists.txt → programs/enugenabi/CMakeLists.txt b/programs/enu-abigen/CMakeLists.txt → programs/enugenabi/CMakeLists.txt
@@ -3,7 +3,7 @@ find_package(LLVM 4.0 REQUIRED CONFIG)
 
 link_directories(${LLVM_LIBRARY_DIR})
 
-add_executable(enu-abigen ${SOURCES})
+add_executable(enugenabi ${SOURCES})
 
 set( CMAKE_CXX_STANDARD 14 )
 
@@ -17,11 +17,11 @@ if( GPERFTOOLS_FOUND )
     list( APPEND PLATFORM_SPECIFIC_LIBS tcmalloc )
 endif()
 
-target_link_libraries(enu-abigen abi_generator)
+target_link_libraries(enugenabi abi_generator)
 
 
 install( TARGETS
-   enu-abigen
+   enugenabi
    RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
    LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
    ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}

diff --git a/programs/enu-abigen/main.cpp → programs/enugenabi/main.cpp b/programs/enu-abigen/main.cpp → programs/enugenabi/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 enu-abigen. DO NOT EDIT - ${ts}",
+           "This file was generated by enugenabi. 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/enu-launcher/CMakeLists.txt → programs/enulauncher/CMakeLists.txt b/programs/enu-launcher/CMakeLists.txt → programs/enulauncher/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_executable( enu-launcher main.cpp )
+add_executable( enulauncher 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(enu-launcher PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
+target_include_directories(enulauncher PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
 
-target_link_libraries(enu-launcher
+target_link_libraries(enulauncher
                       PRIVATE eosio_chain fc ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} )
 
 install( TARGETS
-   enu-launcher
+   enulauncher
 
    RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
    LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}

diff --git a/programs/enu-launcher/config.hpp.in → programs/enulauncher/config.hpp.in b/programs/enu-launcher/config.hpp.in → programs/enulauncher/config.hpp.in
diff --git a/programs/enu-launcher/main.cpp → programs/enulauncher/main.cpp b/programs/enu-launcher/main.cpp → programs/enulauncher/main.cpp
diff --git 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/enu-launcher/enu-launcher"
+launcherPath="programs/enulauncher/enulauncher"
 clientPath="programs/enucli/enucli"
 
 rm -rf etc/eosio/node_* var/lib/* stage

diff --git a/tests/testUtils.py b/tests/testUtils.py
@@ -30,7 +30,7 @@ class Utils:
     EosServerName="enunode"
     EosServerPath="programs/enunode/"+ EosServerName
 
-    EosLauncherPath="programs/enu-launcher/enu-launcher"
+    EosLauncherPath="programs/enulauncher/enulauncher"
     MongoPath="mongo"
 
     @staticmethod

diff --git 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/enu-launcher/enu-launcher -k 15
+  programs/enulauncher/enulauncher -k 15
 }
 
 cleanup()
@@ -114,7 +114,7 @@ cleanup
 # stand up enunode cluster
 launcherOpts="-p $pnodes -n $total_nodes -s $topo -d $delay"
 echo Launcher options: --enunode \"--plugin eosio::wallet_api_plugin\" $launcherOpts
-programs/enu-launcher/enu-launcher --enunode "--plugin eosio::wallet_api_plugin" $launcherOpts
+programs/enulauncher/enulauncher --enunode "--plugin eosio::wallet_api_plugin" $launcherOpts
 sleep 7
 
 startPort=8888

diff --git 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/enu-abigen
+ABIGEN=${ENUMIVO_INSTALL_DIR}/bin/enugenabi
 BOOST_INCLUDE_DIR=@Boost_INCLUDE_DIR@
 function copy_skeleton {
     set -e