DragonX/SilentDragonXLite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #46 from MyHush/dev

Browse Source 
fix Github links, update build scripts, bump version
This commit is contained in:
Denio
2019-11-30 10:01:39 +01:00
committed by GitHub
parent b9c6c42605 9c7deb2628
commit c5e320d23d
10 changed files with 1661 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1614
res/SilentDragonLite.xpm Normal file
View File

File diff suppressed because it is too large Load Diff

4
src/controller.cpp
View File

@@ -658,7 +658,7 @@ void Controller::checkForUpdate(bool silent) {
if (!zrpc->haveConnection()) if (!zrpc->haveConnection())
return noConnection(); return noConnection();
QUrl cmcURL("https://api.github.com/repos/DenioD/SilentDragonLite/releases"); QUrl cmcURL("https://api.github.com/repos/MyHush/SilentDragonLite/releases");
QNetworkRequest req; QNetworkRequest req;
req.setUrl(cmcURL); req.setUrl(cmcURL);
@@ -706,7 +706,7 @@ void Controller::checkForUpdate(bool silent) {
.arg(currentVersion.toString()), .arg(currentVersion.toString()),
QMessageBox::Yes, QMessageBox::Cancel); QMessageBox::Yes, QMessageBox::Cancel);
if (ans == QMessageBox::Yes) { if (ans == QMessageBox::Yes) {
QDesktopServices::openUrl(QUrl("https://github.com/DenioD/SilentDragonLite/releases")); QDesktopServices::openUrl(QUrl("https://github.com/MyHush/SilentDragonLite/releases"));
} else { } else {
// If the user selects cancel, don't bother them again for this version // If the user selects cancel, don't bother them again for this version
s.setValue("update/lastversion", maxVersion.toString()); s.setValue("update/lastversion", maxVersion.toString());

4
src/mainwindow.cpp
View File

@@ -59,7 +59,7 @@ MainWindow::MainWindow(QWidget *parent) :
// File a bug // File a bug
QObject::connect(ui->actionFile_a_bug, &QAction::triggered, [=]() { QObject::connect(ui->actionFile_a_bug, &QAction::triggered, [=]() {
QDesktopServices::openUrl(QUrl("https://github.com/DenioD/SilentDragonLite/issues/new")); QDesktopServices::openUrl(QUrl("https://github.com/MyHush/SilentDragonLite/issues/new"));
}); });
// Set up check for updates action // Set up check for updates action
@@ -529,7 +529,7 @@ void MainWindow::donate() {
ui->Amount1->setText("0.00"); ui->Amount1->setText("0.00");
ui->MemoTxt1->setText(tr("Some feedback about SilentDragonlite or Hush...")); ui->MemoTxt1->setText(tr("Some feedback about SilentDragonlite or Hush..."));
ui->statusBar->showMessage(tr("Send Duke some private and shielded feedback about") % Settings::getTokenName() % tr(" or SilentDragonLite")); ui->statusBar->showMessage(tr("Send DenioD some private and shielded feedback about") % Settings::getTokenName() % tr(" or SilentDragonLite"));
// And switch to the send tab. // And switch to the send tab.
ui->tabWidget->setCurrentIndex(1); ui->tabWidget->setCurrentIndex(1);

2
src/scripts/control
View File

@@ -1,4 +1,4 @@
Package: silentdragonlite Package: SilentDragonLite
Version: RELEASE_VERSION Version: RELEASE_VERSION
Section: base Section: base
Priority: optional Priority: optional

8
src/scripts/desktopentry
View File

@@ -2,12 +2,12 @@
Name=SilentDragonLite Name=SilentDragonLite
Comment=Lightclient UI wallet for Hush Comment=Lightclient UI wallet for Hush
GenericName=Wallet GenericName=Wallet
Exec=/usr/local/bin/silentdragonlite %u Exec=/usr/local/bin/SilentDragonLite %u
Icon=silentdragonlite.xpm Icon=SilentDragonLite.xpm
Type=Application Type=Application
StartupNotify=true StartupNotify=true
StartupWMClass=silentdragonlite StartupWMClass=SilentDragonLite
Categories=Utility; Categories=Utility;
MimeType=x-scheme-handler/hush; MimeType=x-scheme-handler/hush;
Keywords=silentdragonlite; Keywords=SilentDragonLite;

4
src/scripts/dotranslations.sh
View File

@@ -11,7 +11,7 @@ $QT_STATIC/bin/lrelease silentdragon-lite.pro
# Then update the qt base translations. First, get all languages # Then update the qt base translations. First, get all languages
ls res/*.qm | awk -F '[_.]' '{print $4}' | while read -r language ; do ls res/*.qm | awk -F '[_.]' '{print $4}' | while read -r language ; do
if [ -f $QT_STATIC/translations/qtbase_$language.qm ]; then if [ -f $QT_STATIC/translations/qtbase_$language.qm ]; then
$QT_STATIC/bin/lconvert -o res/hush_$language.qm $QT_STATIC/translations/qtbase_$language.qm res/zec_qt_wallet_$language.qm $QT_STATIC/bin/lconvert -o res/silentdragonlite_$language.qm $QT_STATIC/translations/qtbase_$language.qm res/silentdragonlite_$language.qm
mv res/hush_$language.qm res/zec_qt_wallet_$language.qm mv res/silentdragonlite_$language.qm res/silentdragonlite_$language.qm
fi fi
done done

6
src/scripts/mkmacdmg.sh
View File

@@ -55,7 +55,7 @@ export PATH=$PATH:/usr/local/bin
#Clean #Clean
echo -n "Cleaning..............." echo -n "Cleaning..............."
make distclean >/dev/null 2>&1 make distclean >/dev/null 2>&1
rm -f artifacts/macOS-silentdragonlite-v$APP_VERSION.dmg rm -f artifacts/macOS-SilentDragonLite-v$APP_VERSION.dmg
echo "[OK]" echo "[OK]"
@@ -73,7 +73,7 @@ echo "[OK]"
#Qt deploy #Qt deploy
echo -n "Deploying.............." echo -n "Deploying.............."
mkdir artifacts >/dev/null 2>&1 mkdir artifacts >/dev/null 2>&1
rm -f artifcats/Silentdragonlite.dmg >/dev/null 2>&1 rm -f artifcats/SilentDragonLite.dmg >/dev/null 2>&1
rm -f artifacts/rw* >/dev/null 2>&1 rm -f artifacts/rw* >/dev/null 2>&1
$QT_PATH/bin/macdeployqt SilentDragonLite.app $QT_PATH/bin/macdeployqt SilentDragonLite.app
codesign --deep --force --verify --verbose -s "$CERTIFICATE" --options runtime --timestamp SilentDragonLite.app/ codesign --deep --force --verify --verbose -s "$CERTIFICATE" --options runtime --timestamp SilentDragonLite.app/
@@ -81,7 +81,7 @@ echo "[OK]"
echo -n "Building dmg..........." echo -n "Building dmg..........."
mv silentdragonlite.app Silentdragonlite.app mv SilentDragonLite.app SilentDragonLite.app
create-dmg --volname "SilentDragonLite-v$APP_VERSION" --volicon "res/logo.icns" --window-pos 200 120 --icon "SilentDragonLite.app" 200 190 --app-drop-link 600 185 --hide-extension "SilentDragonLite.app" --window-size 800 400 --hdiutil-quiet --background res/dmgbg.png artifacts/macOS-SilentDragonLite-v$APP_VERSION.dmg SilentDragonLite.app >/dev/null 2>&1 create-dmg --volname "SilentDragonLite-v$APP_VERSION" --volicon "res/logo.icns" --window-pos 200 120 --icon "SilentDragonLite.app" 200 190 --app-drop-link 600 185 --hide-extension "SilentDragonLite.app" --window-size 800 400 --hdiutil-quiet --background res/dmgbg.png artifacts/macOS-SilentDragonLite-v$APP_VERSION.dmg SilentDragonLite.app >/dev/null 2>&1
if [ ! -f artifacts/macOS-SilentDragonLite-v$APP_VERSION.dmg ]; then if [ ! -f artifacts/macOS-SilentDragonLite-v$APP_VERSION.dmg ]; then

58
src/scripts/mkrelease.sh
View File

@@ -31,7 +31,7 @@ echo "[OK]"
echo -n "Building..............." echo -n "Building..............."
rm -rf bin/silentdragonlite* > /dev/null rm -rf bin/SilentDragonLite* > /dev/null
# Build the lib first # Build the lib first
cd lib && make release && cd .. cd lib && make release && cd ..
make -j$(nproc) > /dev/null make -j$(nproc) > /dev/null
@@ -40,7 +40,7 @@ echo "[OK]"
# Test for Qt # Test for Qt
echo -n "Static link............" echo -n "Static link............"
if [[ $(ldd silentdragonlite | grep -i "Qt") ]]; then if [[ $(ldd SilentDragonLite | grep -i "Qt") ]]; then
echo "FOUND QT; ABORT"; echo "FOUND QT; ABORT";
exit 1 exit 1
fi fi
@@ -48,25 +48,25 @@ echo "[OK]"
echo -n "Packaging.............." echo -n "Packaging.............."
mkdir bin/silentdragonlite-v$APP_VERSION > /dev/null mkdir bin/SilentDragonLite-v$APP_VERSION > /dev/null
strip silentdragonlite strip SilentDragonLite
cp silentdragonlite bin/silentdragonlite-v$APP_VERSION > /dev/null cp SilentDragonLite bin/SilentDragonLite-v$APP_VERSION > /dev/null
cp README.md bin/silentdragonlite-v$APP_VERSION > /dev/null cp README.md bin/SilentDragonLite-v$APP_VERSION > /dev/null
cp LICENSE bin/silentdragonlite-v$APP_VERSION > /dev/null cp LICENSE bin/SilentDragonLite-v$APP_VERSION > /dev/null
cd bin && tar czf linux-silentdragonlite-v$APP_VERSION.tar.gz silentdragonlite-v$APP_VERSION/ > /dev/null cd bin && tar czf linux-SilentDragonLite-v$APP_VERSION.tar.gz SilentDragonLite-v$APP_VERSION/ > /dev/null
cd .. cd ..
mkdir artifacts >/dev/null 2>&1 mkdir artifacts >/dev/null 2>&1
cp bin/linux-silentdragonlite-v$APP_VERSION.tar.gz ./artifacts/linux-binaries-silentdragonlite-v$APP_VERSION.tar.gz cp bin/linux-SilentDragonLite-v$APP_VERSION.tar.gz ./artifacts/linux-binaries-SilentDragonLite-v$APP_VERSION.tar.gz
echo "[OK]" echo "[OK]"
if [ -f artifacts/linux-binaries-silentdragonlite-v$APP_VERSION.tar.gz ] ; then if [ -f artifacts/linux-binaries-SilentDragonLite-v$APP_VERSION.tar.gz ] ; then
echo -n "Package contents......." echo -n "Package contents......."
# Test if the package is built OK # Test if the package is built OK
if tar tf "artifacts/linux-binaries-silentdragonlite-v$APP_VERSION.tar.gz" | wc -l | grep -q "4"; then if tar tf "artifacts/linux-binaries-SilentDragonLite-v$APP_VERSION.tar.gz" | wc -l | grep -q "4"; then
echo "[OK]" echo "[OK]"
else else
echo "[ERROR]" echo "[ERROR]"
@@ -78,23 +78,23 @@ else
fi fi
echo -n "Building deb..........." echo -n "Building deb..........."
debdir=bin/deb/silentdragonlite-v$APP_VERSION debdir=bin/deb/SilentDragonLite-v$APP_VERSION
mkdir -p $debdir > /dev/null mkdir -p $debdir > /dev/null
mkdir $debdir/DEBIAN mkdir $debdir/DEBIAN
mkdir -p $debdir/usr/local/bin mkdir -p $debdir/usr/local/bin
cat src/scripts/control | sed "s/RELEASE_VERSION/$APP_VERSION/g" > $debdir/DEBIAN/control cat src/scripts/control | sed "s/RELEASE_VERSION/$APP_VERSION/g" > $debdir/DEBIAN/control
cp silentdragonlite $debdir/usr/local/bin/ cp SilentDragonLite $debdir/usr/local/bin/
mkdir -p $debdir/usr/share/pixmaps/ mkdir -p $debdir/usr/share/pixmaps/
cp res/silentdragonlite.xpm $debdir/usr/share/pixmaps/ cp res/SilentDragonLite.xpm $debdir/usr/share/pixmaps/
mkdir -p $debdir/usr/share/applications mkdir -p $debdir/usr/share/applications
cp src/scripts/desktopentry $debdir/usr/share/applications/silentdragonlite.desktop cp src/scripts/desktopentry $debdir/usr/share/applications/SilentDragonLite.desktop
dpkg-deb --build $debdir >/dev/null dpkg-deb --build $debdir >/dev/null
cp $debdir.deb artifacts/linux-deb-silentdragonlite-v$APP_VERSION.deb cp $debdir.deb artifacts/linux-deb-SilentDragonLite-v$APP_VERSION.deb
echo "[OK]" echo "[OK]"
@@ -112,36 +112,40 @@ export PATH=$MXE_PATH:$PATH
echo -n "Configuring............" echo -n "Configuring............"
make clean > /dev/null make clean > /dev/null
#rm -f silentdragonlite-mingw.pro #rm -f SilentDragonLite-mingw.pro
rm -rf release/ rm -rf release/
cp src/precompiled.h release/
#Mingw seems to have trouble with precompiled headers, so strip that option from the .pro file #Mingw seems to have trouble with precompiled headers, so strip that option from the .pro file
#cat silentdragon-lite.pro | sed "s/precompile_header/release/g" | sed "s/PRECOMPILED_HEADER.*//g" > silentdragonlite-mingw.pro #cat silentdragon-lite.pro | sed "s/precompile_header/release/g" | sed "s/PRECOMPILED_HEADER.*//g" > SilentDragonLite-mingw.pro
echo "[OK]" echo "[OK]"
echo -n "Building..............." echo -n "Building..............."
cp src/precompiled.h release/
# Build the lib first # Build the lib first
cd lib && make winrelease && cd .. cd lib && make winrelease && cd ..
x86_64-w64-mingw32.static-qmake-qt5 silentdragonlite.pro CONFIG+=release > /dev/null cp src/precompiled.h release/
x86_64-w64-mingw32.static-qmake-qt5 silentdragon-lite.pro CONFIG+=release > /dev/null
cp src/precompiled.h release/
make -j32 > /dev/null make -j32 > /dev/null
echo "[OK]" echo "[OK]"
echo -n "Packaging.............." echo -n "Packaging.............."
mkdir release/silentdragonlite-v$APP_VERSION mkdir release/SilentDragonLite-v$APP_VERSION
cp release/silentdragonlite.exe release/silentdragonlite-v$APP_VERSION cp release/SilentDragonLite.exe release/SilentDragonLite-v$APP_VERSION
cp README.md release/silentdragonlite-v$APP_VERSION cp README.md release/SilentDragonLite-v$APP_VERSION
cp LICENSE release/silentdragonlite-v$APP_VERSION cp LICENSE release/SilentDragonLite-v$APP_VERSION
cd release && zip -r Windows-binaries-silentdragonlite-v$APP_VERSION.zip silentdragonlite-v$APP_VERSION/ > /dev/null cd release && zip -r Windows-binaries-SilentDragonLite-v$APP_VERSION.zip SilentDragonLite-v$APP_VERSION/ > /dev/null
cd .. cd ..
mkdir artifacts >/dev/null 2>&1 mkdir artifacts >/dev/null 2>&1
cp release/Windows-binaries-silentdragonlite-v$APP_VERSION.zip ./artifacts/ cp release/Windows-binaries-SilentDragonLite-v$APP_VERSION.zip ./artifacts/
echo "[OK]" echo "[OK]"
if [ -f artifacts/Windows-binaries-silentdragonlite-v$APP_VERSION.zip ] ; then if [ -f artifacts/Windows-binaries-SilentDragonLite-v$APP_VERSION.zip ] ; then
echo -n "Package contents......." echo -n "Package contents......."
if unzip -l "artifacts/Windows-binaries-silentdragonlite-v$APP_VERSION.zip" | wc -l | grep -q "9"; then if unzip -l "artifacts/Windows-binaries-SilentDragonLite-v$APP_VERSION.zip" | wc -l | grep -q "9"; then
echo "[OK]" echo "[OK]"
else else
echo "[ERROR]" echo "[ERROR]"

2
src/scripts/signbinaries.sh
View File

@@ -33,7 +33,7 @@ rm -f sha256sum-v$APP_VERSION.txt
rm -f signatures-v$APP_VERSION.tar.gz rm -f signatures-v$APP_VERSION.tar.gz
# sha256sum the binaries # sha256sum the binaries
gsha256sum *$APP_VERSION* > sha256sum-v$APP_VERSION.txt sha256sum *$APP_VERSION* > sha256sum-v$APP_VERSION.txt
for i in $( ls *SilentDragonLite-v$APP_VERSION* sha256sum-v$APP_VERSION* ); do for i in $( ls *SilentDragonLite-v$APP_VERSION* sha256sum-v$APP_VERSION* ); do
echo "Signing" $i echo "Signing" $i

2
src/version.h
View File

@@ -1 +1 @@
#define APP_VERSION "1.1.1" #define APP_VERSION "1.1.2"