Skip to content

Commit

Permalink
rename eosio-launcher
Browse files Browse the repository at this point in the history
  • Loading branch information
aidenthefox committed May 15, 2018
1 parent 0b20c47 commit b8cbbe5
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ programs/data-dir
programs/enu-abigen/enu-abigen
programs/cleos/config.hpp
programs/enu-applesedemo/enu-applesedemo
programs/eosio-launcher/config.hpp
programs/eosio-launcher/eosio-launcher
programs/enu-launcher/config.hpp
programs/enu-launcher/enu-launcher
programs/keosd/keosd
programs/nodeos/config.hpp
programs/nodeos/nodeos
Expand Down
2 changes: 1 addition & 1 deletion programs/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
add_subdirectory( nodeos )
add_subdirectory( cleos )
add_subdirectory( keosd )
add_subdirectory( eosio-launcher )
add_subdirectory( enu-launcher )
add_subdirectory( enu-applesedemo )
add_subdirectory( enu-abigen )
8 changes: 4 additions & 4 deletions programs/enu-launcher/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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()
Expand Down Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion tests/p2p_tests/sync/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/testUtils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/trans_sync_across_mixed_cluster_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ verifyErrorCode()

killAll()
{
programs/eosio-launcher/eosio-launcher -k 15
programs/enu-launcher/enu-launcher -k 15
}

cleanup()
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit b8cbbe5

Please sign in to comment.