From 16d546f46124984c505ff5807cdad63fc64e0615 Mon Sep 17 00:00:00 2001 From: wowario Date: Fri, 3 Apr 2020 11:55:25 +0300 Subject: [PATCH] rename to wownero --- .github/workflows/build.yml | 6 ++--- CMakeLists.txt | 2 +- installers/windows/Monero.iss | 24 ++++++++++---------- src/CMakeLists.txt | 42 +++++++++++++++++------------------ src/main/main.cpp | 2 +- src/qt/ipc.cpp | 2 +- 6 files changed, 39 insertions(+), 39 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1888c0cd..87c5a9ff 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ jobs: - name: build run: export PATH=$PATH:/usr/local/opt/qt/bin && ./build.sh - name: test qml - run: build/release/bin/monero-wallet-gui.app/Contents/MacOS/monero-wallet-gui --test-qml + run: build/release/bin/wownero-app.app/Contents/MacOS/wownero-app --test-qml build-ubuntu: @@ -38,7 +38,7 @@ jobs: - name: build run: ./build.sh - name: test qml - run: xvfb-run -a build/release/bin/monero-wallet-gui --test-qml + run: xvfb-run -a build/release/bin/wownero-app --test-qml build-windows: @@ -54,4 +54,4 @@ jobs: - name: build run: msys2do ./build.sh release - name: test qml - run: msys2do build/release/bin/monero-wallet-gui --test-qml + run: msys2do build/release/bin/wownero-app --test-qml diff --git a/CMakeLists.txt b/CMakeLists.txt index dd0e4fcf..98634e1a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -439,5 +439,5 @@ endif() add_subdirectory(src) # Required to make wallet_merged build before the gui -add_dependencies(monero-wallet-gui wallet_merged) +add_dependencies(wownero-app wallet_merged) diff --git a/installers/windows/Monero.iss b/installers/windows/Monero.iss index afb7324d..a5f3d88d 100644 --- a/installers/windows/Monero.iss +++ b/installers/windows/Monero.iss @@ -1,7 +1,7 @@ ; Monero Nitrogen Nebula GUI Wallet Installer for Windows ; Copyright (c) 2017-2020, The Monero Project ; See LICENSE -#define GuiVersion GetFileVersion("bin\monero-wallet-gui.exe") +#define GuiVersion GetFileVersion("bin\wownero-app.exe") [Setup] AppName=Monero GUI Wallet @@ -13,7 +13,7 @@ AppVersion={#GuiVersion} VersionInfoVersion={#GuiVersion} DefaultDirName={commonpf}\Monero GUI Wallet DefaultGroupName=Monero GUI Wallet -UninstallDisplayIcon={app}\monero-wallet-gui.exe +UninstallDisplayIcon={app}\wownero-app.exe PrivilegesRequired=admin ArchitecturesInstallIn64BitMode=x64 ArchitecturesAllowed=x64 @@ -73,7 +73,7 @@ Source: "FinishImage.bmp"; Flags: dontcopy Source: "LICENSE"; DestDir: "{app}"; Flags: ignoreversion ; Monero GUI wallet exe and guide -Source: "bin\monero-wallet-gui.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "bin\wownero-app.exe"; DestDir: "{app}"; Flags: ignoreversion Source: "bin\monero-gui-wallet-guide.pdf"; DestDir: "{app}"; Flags: ignoreversion ; Monero CLI wallet @@ -178,7 +178,7 @@ Name: desktopicon; Description: "Create a &desktop icon"; GroupDescription: "Add Filename: "{app}\ReadMe.htm"; Description: "Show ReadMe"; Flags: postinstall shellexec skipifsilent ; DON'T offer to run the wallet right away, let the people read about initial blockchain download first in the ReadMe -; Filename: "{app}\monero-wallet-gui.exe"; Description: "Run GUI Wallet now"; Flags: postinstall nowait skipifsilent +; Filename: "{app}\wownero-app.exe"; Description: "Run GUI Wallet now"; Flags: postinstall nowait skipifsilent [Code] @@ -318,8 +318,8 @@ end; [Icons] ; Icons in the "Monero GUI Wallet" program group ; Windows will almost always display icons in alphabetical order, per level, so specify the text accordingly -Name: "{group}\GUI Wallet"; Filename: "{app}\monero-wallet-gui.exe"; -Name: "{group}\GUI Wallet Guide"; Filename: "{app}\monero-gui-wallet-guide.pdf"; IconFilename: "{app}\monero-wallet-gui.exe" +Name: "{group}\GUI Wallet"; Filename: "{app}\wownero-app.exe"; +Name: "{group}\GUI Wallet Guide"; Filename: "{app}\monero-gui-wallet-guide.pdf"; IconFilename: "{app}\wownero-app.exe" Name: "{group}\Uninstall GUI Wallet"; Filename: "{uninstallexe}" ; Sub-folder "Utilities"; @@ -338,13 +338,13 @@ Name: "{group}\Utilities\Textual (CLI) Wallet"; Filename: "{app}\monero-wallet-c Name: "{group}\Utilities\x (Check Default Blockchain Folder)"; Filename: "{win}\Explorer.exe"; Parameters: {code:BlockChainDir} Name: "{group}\Utilities\x (Check Daemon Log)"; Filename: "Notepad"; Parameters: {code:DaemonLog} Name: "{group}\Utilities\x (Check Default Wallet Folder)"; Filename: "{win}\Explorer.exe"; Parameters: """{userdocs}\Monero\wallets""" -Name: "{group}\Utilities\x (Check GUI Wallet Log)"; Filename: "Notepad"; Parameters: """{userappdata}\monero-wallet-gui\monero-wallet-gui.log""" +Name: "{group}\Utilities\x (Check GUI Wallet Log)"; Filename: "Notepad"; Parameters: """{userappdata}\wownero-app\wownero-app.log""" Name: "{group}\Utilities\x (Try Daemon, Exit Confirm)"; Filename: "{app}\monero-daemon.bat" Name: "{group}\Utilities\x (Try GUI Wallet Low Graphics Mode)"; Filename: "{app}\start-low-graphics-mode.bat" Name: "{group}\Utilities\x (Try Kill Daemon)"; Filename: "Taskkill.exe"; Parameters: "/IM monerod.exe /T /F" ; Desktop icons, optional with the help of the "Task" section -Name: "{commondesktop}\GUI Wallet"; Filename: "{app}\monero-wallet-gui.exe"; Tasks: desktopicon +Name: "{commondesktop}\GUI Wallet"; Filename: "{app}\wownero-app.exe"; Tasks: desktopicon [Registry] @@ -359,12 +359,12 @@ Root: HKCU; Subkey: "Software\monero-project\monero-core"; ValueType: string; Va ; Used to easily start payments; example URI: "monero://
?tx_amount=5.0" Root: HKCR; Subkey: "monero"; ValueType: "string"; ValueData: "URL:Monero Payment Protocol"; Flags: uninsdeletekey Root: HKCR; Subkey: "monero"; ValueType: "string"; ValueName: "URL Protocol"; ValueData: "" -Root: HKCR; Subkey: "monero\DefaultIcon"; ValueType: "string"; ValueData: "{app}\monero-wallet-gui.exe,0" -Root: HKCR; Subkey: "monero\shell\open\command"; ValueType: "string"; ValueData: """{app}\monero-wallet-gui.exe"" ""%1""" +Root: HKCR; Subkey: "monero\DefaultIcon"; ValueType: "string"; ValueData: "{app}\wownero-app.exe,0" +Root: HKCR; Subkey: "monero\shell\open\command"; ValueType: "string"; ValueData: """{app}\wownero-app.exe"" ""%1""" ; Configure a custom URI scheme: Links starting with "moneroseed:" will start the GUI wallet exe with the URI as command-line parameter ; Used to easily hand over custom seed node info to the wallet, with an URI of the form "moneroseed://a.b.c.d:port" Root: HKCR; Subkey: "moneroseed"; ValueType: "string"; ValueData: "URL:Monero Seed Node Protocol"; Flags: uninsdeletekey Root: HKCR; Subkey: "moneroseed"; ValueType: "string"; ValueName: "URL Protocol"; ValueData: "" -Root: HKCR; Subkey: "moneroseed\DefaultIcon"; ValueType: "string"; ValueData: "{app}\monero-wallet-gui.exe,0" -Root: HKCR; Subkey: "moneroseed\shell\open\command"; ValueType: "string"; ValueData: """{app}\monero-wallet-gui.exe"" ""%1""" \ No newline at end of file +Root: HKCR; Subkey: "moneroseed\DefaultIcon"; ValueType: "string"; ValueData: "{app}\wownero-app.exe,0" +Root: HKCR; Subkey: "moneroseed\shell\open\command"; ValueType: "string"; ValueData: """{app}\wownero-app.exe"" ""%1""" \ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c55aaefd..46f64007 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -80,29 +80,29 @@ if(MINGW) list(APPEND RESOURCES ${ICON_RES}) endif() -add_executable(monero-wallet-gui ${EXECUTABLE_FLAG} main/main.cpp +add_executable(wownero-app ${EXECUTABLE_FLAG} main/main.cpp ${SOURCE_FILES} ${PASS_STRENGTH_FILES} ${QR_CODE_FILES} ${RESOURCES} ) -set_property(TARGET monero-wallet-gui PROPERTY RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") +set_property(TARGET wownero-app PROPERTY RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") # OpenGL -target_include_directories(monero-wallet-gui PUBLIC ${OPENGL_INCLUDE_DIR}) +target_include_directories(wownero-app PUBLIC ${OPENGL_INCLUDE_DIR}) message(STATUS "OpenGL: include dir at ${OPENGL_INCLUDE_DIR}") message(STATUS "OpenGL: libraries at ${OPENGL_LIBRARIES}") -target_include_directories(monero-wallet-gui PUBLIC ${Qt5Gui_PRIVATE_INCLUDE_DIRS}) +target_include_directories(wownero-app PUBLIC ${Qt5Gui_PRIVATE_INCLUDE_DIRS}) file(GLOB_RECURSE SRC_SOURCES *.cpp) file(GLOB_RECURSE SRC_HEADERS *.h) -target_include_directories(monero-wallet-gui PUBLIC - ${CMAKE_SOURCE_DIR}/monero/include - ${CMAKE_SOURCE_DIR}/monero/src - ${CMAKE_SOURCE_DIR}/monero/external/easylogging++ - ${CMAKE_SOURCE_DIR}/monero/contrib/epee/include +target_include_directories(wownero-app PUBLIC + ${CMAKE_SOURCE_DIR}/wownero/include + ${CMAKE_SOURCE_DIR}/wownero/src + ${CMAKE_SOURCE_DIR}/wownero/external/easylogging++ + ${CMAKE_SOURCE_DIR}/wownero/contrib/epee/include ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/daemon ${CMAKE_CURRENT_SOURCE_DIR}/libwalletqt @@ -118,7 +118,7 @@ target_include_directories(monero-wallet-gui PUBLIC ${ZBAR_INCLUDE_DIR} ) -target_compile_definitions(monero-wallet-gui +target_compile_definitions(wowneor-wallet-gui PUBLIC ${Qt5Widgets_DEFINITIONS} ${Qt5Qml_DEFINITIONS} @@ -127,23 +127,23 @@ target_compile_definitions(monero-wallet-gui set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}") if(X11_FOUND) - target_link_libraries(monero-wallet-gui ${X11_LIBRARIES} pthread dl Xt xcb X11) + target_link_libraries(wownero-app ${X11_LIBRARIES} pthread dl Xt xcb X11) endif() if(DEVICE_TREZOR_READY) - target_link_libraries(monero-wallet-gui ${TREZOR_DEP_LIBS}) + target_link_libraries(wownero-app ${TREZOR_DEP_LIBS}) endif() -target_link_libraries(monero-wallet-gui +target_link_libraries(wownero-app ${CMAKE_BINARY_DIR}/lib/libwallet_merged.a ${LMDB_LIBRARY} - ${CMAKE_BINARY_DIR}/monero/contrib/epee/src/libepee.a - ${CMAKE_BINARY_DIR}/monero/external/unbound/libunbound.a + ${CMAKE_BINARY_DIR}/wownero/contrib/epee/src/libepee.a + ${CMAKE_BINARY_DIR}/wownero/external/unbound/libunbound.a ${SODIUM_LIBRARY} - ${CMAKE_BINARY_DIR}/monero/external/easylogging++/libeasylogging.a - ${CMAKE_BINARY_DIR}/monero/src/blockchain_db/libblockchain_db.a - ${CMAKE_BINARY_DIR}/monero/external/randomx/librandomx.a - ${CMAKE_BINARY_DIR}/monero/src/hardforks/libhardforks.a + ${CMAKE_BINARY_DIR}/wownero/external/easylogging++/libeasylogging.a + ${CMAKE_BINARY_DIR}/wownero/src/blockchain_db/libblockchain_db.a + ${CMAKE_BINARY_DIR}/wownero/external/RandomWOW/librandomx.a + ${CMAKE_BINARY_DIR}/wownero/src/hardforks/libhardforks.a ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${CMAKE_DL_LIBS} @@ -156,7 +156,7 @@ target_link_libraries(monero-wallet-gui ) if(WITH_SCANNER) - target_link_libraries(monero-wallet-gui + target_link_libraries(wownero-app ${ZBAR_LIBRARIES} jpeg v4l2 @@ -165,6 +165,6 @@ if(WITH_SCANNER) ) endif() -install(TARGETS monero-wallet-gui +install(TARGETS wownero-app DESTINATION ${CMAKE_INSTALL_PREFIX} ) diff --git a/src/main/main.cpp b/src/main/main.cpp index a64e647e..20e000f9 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -245,7 +245,7 @@ Verify update binary using 'shasum'-compatible (SHA256 algo) output signed by tw // Log settings const QString logPath = QDir::toNativeSeparators(getLogPath(parser.value(logPathOption))); - Monero::Wallet::init(argv[0], "wownero-wallet-gui", logPath.toStdString().c_str(), true); + Monero::Wallet::init(argv[0], "wownero-app", logPath.toStdString().c_str(), true); qInstallMessageHandler(messageHandler); // loglevel is configured in main.qml. Anything lower than diff --git a/src/qt/ipc.cpp b/src/qt/ipc.cpp index ae6b061d..267854d5 100644 --- a/src/qt/ipc.cpp +++ b/src/qt/ipc.cpp @@ -66,7 +66,7 @@ void IPC::bind(){ connect(this->m_server, &QLocalServer::newConnection, this, &IPC::handleConnection); } -// Process incoming IPC command. First check if monero-wallet-gui is +// Process incoming IPC command. First check if wownero-app is // already running. If it is, send it to that instance instead, if not, // queue the command for later use inside our QML engine. Returns true // when queued, false if sent to another instance, at which point we can