change name

remotes/1691844314220217825/master
wowario 3 years ago
parent 1b89370c1c
commit 0131476a5d
No known key found for this signature in database
GPG Key ID: 24DCBE762DE9C111

@ -29,19 +29,19 @@ steps:
- name: files_linux_appimage
path: /linux-release-appimage
commands:
- export FN="feather-wow-`echo $DRONE_COMMIT_AFTER | cut -c 1-7`.zip"
- export FN="wowllet-`echo $DRONE_COMMIT_AFTER | cut -c 1-7`.zip"
- export TARGET_DIR="/linux-release/$DRONE_SOURCE_BRANCH"
- mkdir -p "$TARGET_DIR"
- echo "writing to $TARGET_DIR/$FN"
- strip -s build/bin/feather-wow
- zip -j "$TARGET_DIR/$FN" build/feather.log build/bin/feather-wow
- strip -s build/bin/wowllet
- zip -j "$TARGET_DIR/$FN" build/feather.log build/bin/wowllet
- echo "[*] written to https://build.featherwallet.org/files/linux-release/$DRONE_SOURCE_BRANCH/$FN"
- # AppImage
- export FN="feather-wow-`git rev-parse --short HEAD`.AppImage"
- export FN="wowllet-`git rev-parse --short HEAD`.AppImage"
- export TARGET_DIR="/linux-release-appimage/$DRONE_SOURCE_BRANCH"
- mkdir -p "$TARGET_DIR"
- echo "writing to $TARGET_DIR/$FN"
- mv "feather-wow.AppImage" "$TARGET_DIR/$FN"
- mv "wowllet.AppImage" "$TARGET_DIR/$FN"
- echo "[*] written to https://build.featherwallet.org/files/linux-release-appimage/$DRONE_SOURCE_BRANCH/$FN"
volumes:
@ -82,11 +82,11 @@ steps:
- name: files_win_release
path: /files
commands:
- export FN="feather-wow-`echo $DRONE_COMMIT_AFTER | cut -c 1-7`.zip"
- export FN="wowllet-`echo $DRONE_COMMIT_AFTER | cut -c 1-7`.zip"
- export TARGET_DIR="/files/$DRONE_SOURCE_BRANCH"
- mkdir -p "$TARGET_DIR"
- echo "writing to $TARGET_DIR/$FN"
- zip -j "$TARGET_DIR/$FN" build/x86_64-w64-mingw32/release/bin/feather-wow.exe
- zip -j "$TARGET_DIR/$FN" build/x86_64-w64-mingw32/release/bin/wowllet.exe
- echo "[*] written to https://build.featherwallet.org/files-wow/windows-release/$DRONE_SOURCE_BRANCH/$FN"
volumes:
- name: ccache_win_release
@ -113,18 +113,18 @@ steps:
commands:
- mkdir -p build
- ssh administrator@steve.jobs.xmr.pm "chmod +x build_wow_macos.sh && PATH=/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin ~/build_wow_macos.sh $DRONE_COMMIT_SHA"
- scp -P22 administrator@steve.jobs.xmr.pm:feather-wow.zip build/feather-wow.zip
- scp -P22 administrator@steve.jobs.xmr.pm:wowllet.zip build/wowllet.zip
- name: deploy
image: feather:mac
volumes:
- name: files_mac_release
path: /files
commands:
- export FN="feather-wow-`echo $DRONE_COMMIT_AFTER | cut -c 1-7`.zip"
- export FN="wowllet-`echo $DRONE_COMMIT_AFTER | cut -c 1-7`.zip"
- export TARGET_DIR="/files/$DRONE_SOURCE_BRANCH"
- mkdir -p "$TARGET_DIR"
- echo "writing to $TARGET_DIR/$FN"
- mv build/feather-wow.zip "$TARGET_DIR/$FN"
- mv build/wowllet.zip "$TARGET_DIR/$FN"
- echo "[*] written to https://build.featherwallet.org/files-wow/mac-release/$DRONE_SOURCE_BRANCH/$FN"
volumes:

@ -7,7 +7,7 @@ if(APPLE OR (WIN32 AND NOT STATIC))
find_program(MACDEPLOYQT_EXECUTABLE macdeployqt HINTS "${_qt_bin_dir}")
add_custom_command(TARGET deploy
POST_BUILD
COMMAND "${MACDEPLOYQT_EXECUTABLE}" "$<TARGET_FILE_DIR:feather-wow>/../.." -always-overwrite
COMMAND "${MACDEPLOYQT_EXECUTABLE}" "$<TARGET_FILE_DIR:wowllet>/../.." -always-overwrite
COMMENT "Running macdeployqt..."
)
@ -16,11 +16,11 @@ if(APPLE OR (WIN32 AND NOT STATIC))
if(_qt_svg_dylib)
add_custom_command(TARGET deploy
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy ${_qt_svg_dylib} $<TARGET_FILE_DIR:feather-wow>/../PlugIns/imageformats/
COMMAND ${CMAKE_INSTALL_NAME_TOOL} -change "${CMAKE_PREFIX_PATH}/lib/QtGui.framework/Versions/5/QtGui" "@executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui" $<TARGET_FILE_DIR:feather-wow>/../PlugIns/imageformats/libqsvg.dylib
COMMAND ${CMAKE_INSTALL_NAME_TOOL} -change "${CMAKE_PREFIX_PATH}/lib/QtWidgets.framework/Versions/5/QtWidgets" "@executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui" $<TARGET_FILE_DIR:feather-wow>/../PlugIns/imageformats/libqsvg.dylib
COMMAND ${CMAKE_INSTALL_NAME_TOOL} -change "${CMAKE_PREFIX_PATH}/lib/QtSvg.framework/Versions/5/QtSvg" "@executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui" $<TARGET_FILE_DIR:feather-wow>/../PlugIns/imageformats/libqsvg.dylib
COMMAND ${CMAKE_INSTALL_NAME_TOOL} -change "${CMAKE_PREFIX_PATH}/lib/QtCore.framework/Versions/5/QtCore" "@executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui" $<TARGET_FILE_DIR:feather-wow>/../PlugIns/imageformats/libqsvg.dylib
COMMAND ${CMAKE_COMMAND} -E copy ${_qt_svg_dylib} $<TARGET_FILE_DIR:wowllet>/../PlugIns/imageformats/
COMMAND ${CMAKE_INSTALL_NAME_TOOL} -change "${CMAKE_PREFIX_PATH}/lib/QtGui.framework/Versions/5/QtGui" "@executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui" $<TARGET_FILE_DIR:wowllet>/../PlugIns/imageformats/libqsvg.dylib
COMMAND ${CMAKE_INSTALL_NAME_TOOL} -change "${CMAKE_PREFIX_PATH}/lib/QtWidgets.framework/Versions/5/QtWidgets" "@executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui" $<TARGET_FILE_DIR:wowllet>/../PlugIns/imageformats/libqsvg.dylib
COMMAND ${CMAKE_INSTALL_NAME_TOOL} -change "${CMAKE_PREFIX_PATH}/lib/QtSvg.framework/Versions/5/QtSvg" "@executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui" $<TARGET_FILE_DIR:wowllet>/../PlugIns/imageformats/libqsvg.dylib
COMMAND ${CMAKE_INSTALL_NAME_TOOL} -change "${CMAKE_PREFIX_PATH}/lib/QtCore.framework/Versions/5/QtCore" "@executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui" $<TARGET_FILE_DIR:wowllet>/../PlugIns/imageformats/libqsvg.dylib
COMMENT "Copying libqsvg.dylib, running install_name_tool"
)
endif()

@ -3,17 +3,17 @@
set -e
unset SOURCE_DATE_EPOCH
APPDIR="$PWD/feather-wow.AppDir"
APPDIR="$PWD/wowllet.AppDir"
mkdir -p "$APPDIR"
mkdir -p "$APPDIR/usr/share/applications/"
mkdir -p "$APPDIR/usr/bin"
cp "$PWD/src/assets/feather-wow.desktop" "$APPDIR/usr/share/applications/feather-wow.desktop"
cp "$PWD/src/assets/images/appicons/64x64.png" "$APPDIR/feather-wow.png"
cp "$PWD/build/bin/feather-wow" "$APPDIR/usr/bin/feather-wow"
cp "$PWD/src/assets/wowllet.desktop" "$APPDIR/usr/share/applications/wowllet.desktop"
cp "$PWD/src/assets/images/appicons/64x64.png" "$APPDIR/wowllet.png"
cp "$PWD/build/bin/wowllet" "$APPDIR/usr/bin/wowllet"
LD_LIBRARY_PATH=/usr/local/lib /linuxdeployqt/squashfs-root/AppRun feather.AppDir/usr/share/applications/feather-wow.desktop -bundle-non-qt-libs
LD_LIBRARY_PATH=/usr/local/lib /linuxdeployqt/squashfs-root/AppRun feather.AppDir/usr/share/applications/wowllet.desktop -bundle-non-qt-libs
find feather.AppDir/ -exec touch -h -a -m -t 202101010100.00 {} \;
@ -27,7 +27,7 @@ mksquashfs feather.AppDir feather.squashfs -info -root-owned -no-xattrs -noappen
# mksquashfs writes a timestamp to the header
printf '\x00\x00\x00\x00' | dd conv=notrunc of=feather.squashfs bs=1 seek=$((0x8))
rm -f feather-wow.AppImage
cat runtime-x86_64 >> feather-wow.AppImage
cat feather.squashfs >> feather-wow.AppImage
chmod a+x feather-wow.AppImage
rm -f wowllet.AppImage
cat runtime-x86_64 >> wowllet.AppImage
cat feather.squashfs >> wowllet.AppImage
chmod a+x wowllet.AppImage

@ -70,29 +70,29 @@ if(APPLE)
list(APPEND RESOURCES ${ICON})
endif()
add_executable(feather-wow ${EXECUTABLE_FLAG} main.cpp
add_executable(wowllet ${EXECUTABLE_FLAG} main.cpp
${SOURCE_FILES}
${RESOURCES}
${ASSETS_TOR}
)
# mac os bundle
set_target_properties(feather-wow PROPERTIES
set_target_properties(wowllet PROPERTIES
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
MACOSX_BUNDLE TRUE
MACOSX_BUNDLE_INFO_PLIST "${CMAKE_SOURCE_DIR}/utils/Info.plist"
LINK_FLAGS_RELEASE -s
)
set_property(TARGET feather-wow PROPERTY RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
set_property(TARGET wowllet PROPERTY RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
target_include_directories(feather-wow PUBLIC ${OPENGL_INCLUDE_DIR})
target_include_directories(feather-wow PUBLIC ${Qt5Gui_PRIVATE_INCLUDE_DIRS})
target_include_directories(wowllet PUBLIC ${OPENGL_INCLUDE_DIR})
target_include_directories(wowllet PUBLIC ${Qt5Gui_PRIVATE_INCLUDE_DIRS})
file(GLOB_RECURSE SRC_SOURCES *.cpp)
file(GLOB_RECURSE SRC_HEADERS *.h)
target_include_directories(feather-wow PUBLIC
target_include_directories(wowllet PUBLIC
${CMAKE_BINARY_DIR}/src/feather_autogen/include
${CMAKE_SOURCE_DIR}/monero/include
${CMAKE_SOURCE_DIR}/monero/src
@ -119,38 +119,38 @@ target_include_directories(feather-wow PUBLIC
)
if(DONATE_BEG)
target_compile_definitions(feather-wow PRIVATE DONATE_BEG=1)
target_compile_definitions(wowllet PRIVATE DONATE_BEG=1)
endif()
if(TOR_BIN)
target_compile_definitions(feather-wow PRIVATE HAS_TOR_BIN=1)
target_compile_definitions(wowllet PRIVATE HAS_TOR_BIN=1)
endif()
if(XMRIG)
target_compile_definitions(feather-wow PRIVATE HAS_XMRIG=1)
target_compile_definitions(wowllet PRIVATE HAS_XMRIG=1)
endif()
if(HAVE_SYS_PRCTL_H)
target_compile_definitions(feather-wow PRIVATE HAVE_SYS_PRCTL_H=1)
target_compile_definitions(wowllet PRIVATE HAVE_SYS_PRCTL_H=1)
endif()
if(STATIC)
target_compile_definitions(feather-wow PRIVATE STATIC=1)
target_compile_definitions(wowllet PRIVATE STATIC=1)
endif()
if(STATIC)
target_compile_definitions(feather-wow PRIVATE STATIC=1)
target_compile_definitions(wowllet PRIVATE STATIC=1)
endif()
if("$ENV{DRONE}" STREQUAL "true")
target_compile_definitions(feather-wow PRIVATE DRONE=1)
target_compile_definitions(wowllet PRIVATE DRONE=1)
endif()
if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
target_compile_definitions(feather-wow PRIVATE QT_NO_DEBUG=1)
target_compile_definitions(wowllet PRIVATE QT_NO_DEBUG=1)
endif()
target_compile_definitions(feather-wow
target_compile_definitions(wowllet
PUBLIC
${Qt5Core_DEFINITIONS}
${Qt5Widgets_DEFINITIONS}
@ -166,12 +166,12 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
if(UNIX AND NOT APPLE)
# https://stackoverflow.com/questions/57766620/cmake-add-library-doesnt-initialize-static-global-variable
# so that contrib/monero-seed/src/gf_elem.cpp properly initializes. A better solution is welcome.
target_link_libraries(feather-wow -Wl,--whole-archive monero-seed::monero-seed -Wl,--no-whole-archive)
target_link_libraries(wowllet -Wl,--whole-archive monero-seed::monero-seed -Wl,--no-whole-archive)
else()
target_link_libraries(feather-wow monero-seed::monero-seed)
target_link_libraries(wowllet monero-seed::monero-seed)
endif()
target_link_libraries(feather-wow
target_link_libraries(wowllet
wallet_merged
${LMDB_LIBRARY}
epee
@ -198,38 +198,38 @@ target_link_libraries(feather-wow
)
if(APPLE)
target_link_libraries(feather-wow
target_link_libraries(wowllet
KDMacTouchBar
)
target_include_directories(feather-wow
target_include_directories(wowllet
PUBLIC ../contrib/KDMacTouchBar)
endif()
if(NOT APPLE)
target_link_libraries(feather-wow
target_link_libraries(wowllet
Qt5::QSvgIconPlugin
Qt5::QSvgPlugin
)
endif()
if(STATIC)
target_link_libraries(feather-wow
target_link_libraries(wowllet
Qt5::QSvgIconPlugin
Qt5::QSvgPlugin)
if(UNIX AND NOT APPLE)
target_link_libraries(feather-wow
target_link_libraries(wowllet
Qt5::QXcbIntegrationPlugin)
endif()
endif()
if(X11_FOUND)
target_link_libraries(feather-wow ${X11_LIBRARIES})
target_link_libraries(wowllet ${X11_LIBRARIES})
endif()
if(APPLE)
include(Deploy)
endif()
install(TARGETS feather-wow
install(TARGETS wowllet
DESTINATION ${CMAKE_INSTALL_PREFIX}
)

@ -45,11 +45,11 @@ AppContext::AppContext(QCommandLineParser *cmdargs) {
QString appImagePath = qgetenv("APPIMAGE");
if (appImagePath.isEmpty()) {
qDebug() << "Not an appimage, using currentPath()";
return QDir::currentPath() + "/.feather-wow";
return QDir::currentPath() + "/.wowllet";
}
QFileInfo appImageDir(appImagePath);
return appImageDir.absoluteDir().path() + "/.feather-wow";
return appImageDir.absoluteDir().path() + "/.wowllet";
}();
@ -81,7 +81,7 @@ AppContext::AppContext(QCommandLineParser *cmdargs) {
if (!QDir().mkpath(defaultWalletDir))
qCritical() << "Unable to create dir: " << defaultWalletDir;
this->configDirectory = QString("%1/.config/feather-wow/").arg(this->configRoot);
this->configDirectory = QString("%1/.config/wowllet/").arg(this->configRoot);
#if defined(Q_OS_UNIX)
if(!this->configDirectory.endsWith('/'))
this->configDirectory = QString("%1/").arg(this->configDirectory);

@ -3,7 +3,7 @@
<file>assets/about.txt</file>
<file>assets/ack.txt</file>
<file>assets/contributors.txt</file>
<file>assets/feather-wow.desktop</file>
<file>assets/wowllet.desktop</file>
<file>assets/nodes.json</file>
<file>assets/images/appicons/32x32.png</file>
<file>assets/images/appicons/48x48.png</file>

@ -1,11 +1,11 @@
[Desktop Entry]
Comment=Lightweight Wownero Wallet
Exec=feather-wow
Exec=wowllet
GenericName[en_US]=Wownero Wallet
GenericName=Wownero Wallet
Icon=feather-wow
Name[en_US]=Feather-WOW
Name=Feather-WOW
Icon=wowllet
Name[en_US]=WOWllet
Name=WOWllet
Categories=Finance;Network;
StartupNotify=false
StartupWMClass=feather

@ -41,7 +41,7 @@ if (AttachConsole(ATTACH_PARENT_PROCESS)) {
}
QCommandLineParser parser;
parser.setApplicationDescription("feather-wow");
parser.setApplicationDescription("wowllet");
parser.addHelpOption();
parser.addVersionOption();
@ -96,7 +96,7 @@ if (AttachConsole(ATTACH_PARENT_PROCESS)) {
if(cliMode) {
QCoreApplication cli_app(argc, argv);
QCoreApplication::setApplicationName("feather-wow");
QCoreApplication::setApplicationName("wowllet");
QCoreApplication::setOrganizationDomain("featherwallet.org");
QCoreApplication::setOrganizationName("featherwallet.org");
@ -129,7 +129,7 @@ if (AttachConsole(ATTACH_PARENT_PROCESS)) {
QApplication app(argc, argv);
QApplication::setApplicationName("feather-wow");
QApplication::setApplicationName("wowllet");
QApplication::setOrganizationDomain("featherwallet.org");
QApplication::setOrganizationName("featherwallet.org");
@ -138,7 +138,7 @@ if (AttachConsole(ATTACH_PARENT_PROCESS)) {
if(!quiet) {
QMap<QString, QString> info;
info["Qt"] = QT_VERSION_STR;
info["Feather-WOW"] = FEATHER_VERSION;
info["WOWllet"] = FEATHER_VERSION;
if (stagenet) info["Mode"] = "Stagenet";
else if (testnet) info["Mode"] = "Testnet";
else info["Mode"] = "Mainnet";

@ -89,7 +89,7 @@ MainWindow::MainWindow(AppContext *ctx, QWidget *parent) :
connect(ui->actionReport_bug, &QAction::triggered, [this](){
QMessageBox::information(this, "Reporting Bugs",
"<body>Please report any bugs as issues on our git repo:<br>\n"
"<a href=\"https://git.wownero.com/feather/feather-wow/issues\" style=\"color: #33A4DF\">https://git.wownero.com/feather/feather-wow/issues</a><br/><br/>"
"<a href=\"https://git.wownero.com/feather/wowllet/issues\" style=\"color: #33A4DF\">https://git.wownero.com/feather/wowllet/issues</a><br/><br/>"
"\n"
"Before reporting a bug, upgrade to the most recent version of Feather "
"(latest release or git HEAD), and include the version number in your report. "

@ -113,7 +113,7 @@ Config::Config(QObject* parent)
QString appImagePath = qgetenv("APPIMAGE");
QFileInfo appImageDir(appImagePath);
QDir portablePath(appImageDir.absoluteDir().path() + "/.feather-wow");
QDir portablePath(appImageDir.absoluteDir().path() + "/.wowllet");
if (portablePath.mkpath(".")) {
configPath = portablePath.path();
}
@ -122,7 +122,7 @@ Config::Config(QObject* parent)
}
}
configPath += "/.config/feather-wow/settings.json";
configPath += "/.config/wowllet/settings.json";
init(QDir::toNativeSeparators(configPath));
}

@ -261,9 +261,9 @@ QString Utils::getUnixAccountName() {
QString Utils::xdgDesktopEntry(){
return QString(
"[Desktop Entry]\n"
"Name=Feather-WOW\n"
"GenericName=Feather-WOW\n"
"X-GNOME-FullName=Feather-WOW\n"
"Name=WOWllet\n"
"GenericName=WOWllet\n"
"X-GNOME-FullName=WOWllet\n"
"Comment=a free Wownero desktop wallet\n"
"Keywords=Wownero;\n"
"Exec=\"%1\" %u\n"

@ -33,7 +33,7 @@ struct xdgDesktopEntryPaths {
};
const xdgDesktopEntryPaths xdgPaths = {
QString("%1/feather-wow.desktop").arg(QStandardPaths::writableLocation(QStandardPaths::ApplicationsLocation)),
QString("%1/wowllet.desktop").arg(QStandardPaths::writableLocation(QStandardPaths::ApplicationsLocation)),
QString("%1/.local/share/icons/wownero.png").arg(QDir::homePath()),
QString("/")
};

@ -15,7 +15,7 @@ NetworkPage::NetworkPage(AppContext *ctx, QWidget *parent) :
ui->customFrame->hide();
QPixmap p(":assets/images/feather-wow.png");
QPixmap p(":assets/images/wowllet.png");
ui->featherImage->setText("");
ui->featherImage->setPixmap(p.scaled(128, 128, Qt::KeepAspectRatio, Qt::SmoothTransformation));
ui->label_eg->setText("Examples:\n- http://127.0.0.1:18089\n- my.node.com\n- my.node.com:18089\n- user:pass@my.node.com:18089");

@ -19,7 +19,7 @@ WalletWizard::WalletWizard(AppContext *ctx, WalletWizard::Page startPage, QWidge
: QWizard(parent)
, m_ctx(ctx)
{
this->setWindowTitle("Welcome to Feather-WOW");
this->setWindowTitle("Welcome to WOWllet");
this->setWindowIcon(QIcon(":/assets/images/appicons/64x64.png"));
m_walletKeysFilesModel = new WalletKeysFilesModel(m_ctx, this);

@ -18,16 +18,16 @@
<string>????</string>
<key>CFBundleExecutable</key>
<string>feather-wow</string>
<string>wowllet</string>
<key>CFBundleName</key>
<string>Feather-WOW</string>
<string>WOWllet</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2014-2021 The Monero Project</string>
<key>CFBundleIdentifier</key>
<string>org.monero-project.feather-wow</string>
<string>org.monero-project.wowllet</string>
<key>CFBundleVersion</key>
<string>@VERSION_LONG@</string>

@ -6,20 +6,20 @@ echo "[+] hash: $HASH"
export DRONE=true
echo "[+] Building"
rm ~/feather-wow.zip 2>&1 >/dev/null
cd ~/feather-wow
rm ~/wowllet.zip 2>&1 >/dev/null
cd ~/wowllet
git fetch
git reset --hard "$HASH"
git submodule update --init --depth 120 monero
git submodule update --init --depth 120 --recursive monero
cp "/Users/administrator/tor/libevent-2.1.7.dylib" "/Users/administrator/feather-wow/src/assets/exec/libevent-2.1.7.dylib"
cp "/Users/administrator/tor/libevent-2.1.7.dylib" "/Users/administrator/wowllet/src/assets/exec/libevent-2.1.7.dylib"
CMAKE_PREFIX_PATH="~/Qt/5.15.1/clang_64" TOR_BIN="/Users/administrator/tor/tor" make -j3 mac-release
if [[ $? -eq 0 ]]; then
echo "[+] Feather built OK"
cd ~/feather-wow/build/bin
zip -qr ~/feather-wow.zip feather-wow.app
cd ~/wowllet/build/bin
zip -qr ~/wowllet.zip wowllet.app
else
echo "[+] Error!"
exit 1;

Loading…
Cancel
Save