Skip to content
Permalink
Browse files

Remove legacy Zedwallet and promote Zedwallet++ out of beta

  • Loading branch information
brandonlehmann committed Nov 16, 2019
1 parent 7183230 commit 0016077f4fb459d2ab12ba7fbd0ed8cff49a2b7f
@@ -89,7 +89,7 @@ script:
before_deploy:
- if [[ "${TRAVIS_TAG}" == "" ]]; then export TRAVIS_TAG=${TRAVIS_COMMIT} ; fi
- cd src
- TARGETS="TurtleCoind miner zedwallet turtle-service zedwallet-beta cryptotest wallet-api wallet-upgrader"
- TARGETS="TurtleCoind miner zedwallet turtle-service cryptotest wallet-api wallet-upgrader"
- ${STRIP} ${TARGETS}
- rm -rf turtlecoin-${TRAVIS_TAG}
- mkdir turtlecoin-${TRAVIS_TAG}
File renamed without changes.
@@ -44,7 +44,6 @@ file(GLOB_RECURSE WalletApi walletapi/*)
file(GLOB_RECURSE WalletBackend walletbackend/*)
file(GLOB_RECURSE WalletService walletservice/*)
file(GLOB_RECURSE WalletUpgrader walletupgrader/*)
file(GLOB_RECURSE zedwallet zedwallet/*)
file(GLOB_RECURSE zedwallet++ zedwallet++/*)

if (MSVC)
@@ -56,7 +55,7 @@ else ()
endif ()

# Group the files together in IDEs
source_group("" FILES $${Common} ${Config} ${Crypto} ${CryptoNoteCore} ${CryptoNoteProtocol} ${TurtleCoind} ${JsonRpcServer} ${Http} ${Logging} ${Logger} ${miner} ${Mnemonics} ${Nigel} ${NodeRpcProxy} ${P2p} ${Rpc} ${Serialization} ${System} ${Transfers} ${Wallet} ${WalletApi} ${WalletBackend} ${WalletService} ${zedwallet} ${zedwallet++} ${CryptoTest} ${Errors} ${Utilities} ${WalletUpgrader} ${SubWallets})
source_group("" FILES $${Common} ${Config} ${Crypto} ${CryptoNoteCore} ${CryptoNoteProtocol} ${TurtleCoind} ${JsonRpcServer} ${Http} ${Logging} ${Logger} ${miner} ${Mnemonics} ${Nigel} ${NodeRpcProxy} ${P2p} ${Rpc} ${Serialization} ${System} ${Transfers} ${Wallet} ${WalletApi} ${WalletBackend} ${WalletService} ${zedwallet++} ${CryptoTest} ${Errors} ${Utilities} ${WalletUpgrader} ${SubWallets})

# Define a group of files as a library to link against
add_library(BlockchainExplorer STATIC ${BlockchainExplorer})
@@ -112,7 +111,6 @@ add_executable(WalletService ${WalletService} ${PG_SOURCES_OS})
add_executable(TurtleCoind ${TurtleCoind} ${DAEMON_SOURCES_OS})
add_executable(WalletApi ${WalletApi} ${WALLET_API_SOURCES_OS})
add_executable(WalletUpgrader ${WalletUpgrader} ${WALLET_UPGRADER_SOURCES_OS})
add_executable(zedwallet ${zedwallet} ${ZED_WALLET_SOURCES_OS})
add_executable(zedwallet++ ${zedwallet++} ${ZED_WALLET_SOURCES_OS})

if (MSVC)
@@ -122,7 +120,6 @@ if (MSVC)
target_link_libraries(zedwallet++ ws2_32 advapi32 crypt32 gdi32 user32)
target_link_libraries(WalletApi ws2_32 advapi32 crypt32 gdi32 user32)
target_link_libraries(miner ws2_32 advapi32 crypt32 gdi32 user32)
target_link_libraries(zedwallet ws2_32 advapi32 crypt32 gdi32 user32)
target_link_libraries(WalletUpgrader ws2_32 advapi32 crypt32 gdi32 user32)
endif ()

@@ -164,7 +161,6 @@ target_link_libraries(WalletApi WalletBackend)
target_link_libraries(WalletBackend Serialization Mnemonics Nigel cryptopp-static __filesystem Utilities SubWallets Logger Config Wallet)
target_link_libraries(WalletService JsonRpcServer Wallet Mnemonics Errors)
target_link_libraries(WalletUpgrader Utilities WalletBackend Common)
target_link_libraries(zedwallet Mnemonics Wallet Utilities Errors)
target_link_libraries(zedwallet++ WalletBackend)

if (OPENSSL_FOUND)
@@ -187,12 +183,11 @@ add_dependencies(TurtleCoind version)
add_dependencies(WalletUpgrader version)
add_dependencies(WalletApi version)
add_dependencies(WalletService version)
add_dependencies(zedwallet version)
add_dependencies(zedwallet++ version)

# Finally build the binaries
set_property(TARGET TurtleCoind PROPERTY OUTPUT_NAME "TurtleCoind")
set_property(TARGET zedwallet PROPERTY OUTPUT_NAME "zedwallet")
set_property(TARGET zedwallet++ PROPERTY OUTPUT_NAME "zedwallet-beta")
set_property(TARGET zedwallet++ PROPERTY OUTPUT_NAME "zedwallet")
set_property(TARGET WalletService PROPERTY OUTPUT_NAME "turtle-service")
set_property(TARGET miner PROPERTY OUTPUT_NAME "miner")
set_property(TARGET cryptotest PROPERTY OUTPUT_NAME "cryptotest")
@@ -202,5 +197,6 @@ set_property(TARGET WalletUpgrader PROPERTY OUTPUT_NAME "wallet-upgrader")
# Additional make targets, can be used to build a subset of the targets
# e.g. make pool will build only TurtleCoind and service
add_custom_target(pool DEPENDS TurtleCoind WalletService)
add_custom_target(solominer DEPENDS TurtleCoind zedwallet miner)
add_custom_target(cli DEPENDS TurtleCoind zedwallet)
add_custom_target(solominer DEPENDS TurtleCoind zedwallet++ miner)
add_custom_target(cli DEPENDS TurtleCoind zedwallet++)
add_custom_target(zedwallet DEPENDS zedwallet++)
@@ -18,7 +18,7 @@
#include <serialization/BinaryOutputStreamSerializer.h>
#include <serialization/CryptoNoteSerialization.h>
#include <vector>
#include <zedwallet/Types.h>
#include <ZedwalletTypes.h>

namespace Common
{

0 comments on commit 0016077

Please sign in to comment.
You can’t perform that action at this time.