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

build with embedded zcashd

Browse Source
This commit is contained in:
Aditya Kulkarni
2018-11-09 14:46:21 -08:00
parent b2fa525987
commit 0429b592aa
2 changed files with 49 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/connection.cpp
View File

@@ -333,7 +333,7 @@ void ConnectionLoader::refreshZcashdState(Connection* connection, std::function<
!res.is_discarded()) {
// The server is loading, so just poll until it succeeds
QString status = QString::fromStdString(res["error"]["message"]);
showInformation("Your zcashd is starting up. Please wait.", status);
this->showInformation("Your zcashd is starting up. Please wait.", status);
// Refresh after one second
QTimer::singleShot(1000, [=]() { this->refreshZcashdState(connection, refused); });

73
src/scripts/mkrelease.sh
View File

@@ -9,7 +9,17 @@ if [ -z $MXE_PATH ]; then echo "MXE_PATH is not set. Set it to ~/github/mxe/usr/
if [ -z $APP_VERSION ]; then echo "APP_VERSION is not set"; exit 1; fi
if [ -z $PREV_VERSION ]; then echo "PREV_VERSION is not set"; exit 1; fi
echo -n "Version files."
if [ ! -f ../zcash/artifacts/zcashd ]; then
echo "Couldn't find zcashd in ../zcash/artifacts/. Please build zcashd."
exit 1;
fi
if [ ! -f ../zcash/artifacts/zcashd.exe ]; then
echo "Couldn't find zcashd.exe in ../zcash/artifacts/. Please build zcashd.exe"
exit 1;
fi
echo -n "Version files....."
# Replace the version number in the .pro file so it gets picked up everywhere
sed -i "s/${PREV_VERSION}/${APP_VERSION}/g" zec-qt-wallet.pro > /dev/null
@@ -17,28 +27,28 @@ sed -i "s/${PREV_VERSION}/${APP_VERSION}/g" zec-qt-wallet.pro > /dev/null
sed -i "s/${PREV_VERSION}/${APP_VERSION}/g" README.md > /dev/null
echo "[OK]"
echo -n "Cleaning......"
rm -f bin/linux-zec-qt-wallet*
rm -rf release/
echo -n "Cleaning.........."
rm -rf bin/*
make distclean > /dev/null
echo "[OK]"
echo "Linux"
echo ""
echo "[Linux]"
echo -n "Configuring..."
echo -n "Configuring......."
$QT_STATIC/bin/qmake zec-qt-wallet.pro -spec linux-clang CONFIG+=release > /dev/null
#Mingw seems to have trouble with precompiled headers, so strip that option from the .pro file
echo "[OK]"
echo -n "Building......"
echo -n "Building.........."
rm -rf bin/zec-qt-wallet* > /dev/null
make -j$(nproc) > /dev/null
echo "[OK]"
# Test for Qt
echo -n "Static link..."
echo -n "Static link......."
if [[ $(ldd zec-qt-wallet | grep -i "Qt") ]]; then
echo "FOUND QT; ABORT";
exit 1
@@ -46,32 +56,37 @@ fi
echo "[OK]"
echo -n "Packaging....."
echo -n "Packaging........."
mkdir bin/zec-qt-wallet-v$APP_VERSION > /dev/null
cp zec-qt-wallet bin/zec-qt-wallet-v$APP_VERSION > /dev/null
cp ../zcash/artifacts/zcashd bin/zec-qt-wallet-v$APP_VERSION > /dev/null
cp README.md bin/zec-qt-wallet-v$APP_VERSION > /dev/null
cp LICENSE bin/zec-qt-wallet-v$APP_VERSION > /dev/null
cd bin && tar cvf linux-zec-qt-wallet-v$APP_VERSION.tar.gz zec-qt-wallet-v$APP_VERSION/ > /dev/null
cd ..
mkdir artifacts >/dev/null 2>&1
cp bin/linux-zec-qt-wallet-v$APP_VERSION.tar.gz ./artifacts
echo "[OK]"
if [ -f artifacts/linux-zec-qt-wallet-v$APP_VERSION.tar.gz ] ; then
echo "[OK]"
echo "Done. Build is artifacts/linux-zec-qt-wallet-v$APP_VERSION.tar.gz"
echo "Package contents:"
tar tf "artifacts/linux-zec-qt-wallet-v$APP_VERSION.tar.gz"
echo -n "Package contents.."
# Test if the package is built OK
if tar tf "artifacts/linux-zec-qt-wallet-v$APP_VERSION.tar.gz" | wc -l | grep -q "5"; then
echo "[OK]"
else
exit 1
fi
else
echo "[ERROR]"
exit 1
fi
echo "Windows"
echo ""
echo "[Windows]"
export PATH=$MXE_PATH:$PATH
echo -n "Configuring..."
echo -n "Configuring......."
make clean > /dev/null
rm -f zec-qt-wallet-mingw.pro
rm -rf release/
@@ -80,30 +95,38 @@ cat zec-qt-wallet.pro | sed "s/precompile_header/release/g" | sed "s/PRECOMPILED
echo "[OK]"
echo -n "Building......"
echo -n "Building.........."
x86_64-w64-mingw32.static-qmake-qt5 zec-qt-wallet-mingw.pro CONFIG+=release > /dev/null
make -j32 > /dev/null
echo "[OK]"
echo -n "Packaging....."
echo -n "Packaging........."
mkdir release/zec-qt-wallet-v$APP_VERSION
cp release/zec-qt-wallet.exe release/zec-qt-wallet-v$APP_VERSION
cp ../zcash/artifacts/zcashd.exe release/zec-qt-wallet-v$APP_VERSION > /dev/null
cp README.md release/zec-qt-wallet-v$APP_VERSION
cp LICENSE release/zec-qt-wallet-v$APP_VERSION
cd release && zip -r Windows-zec-qt-wallet-v$APP_VERSION.zip zec-qt-wallet-v$APP_VERSION/ > /dev/null
cd ..
mkdir artifacts >/dev/null 2>&1
cp release/Windows-zec-qt-wallet-v$APP_VERSION.zip ./artifacts
echo "[OK]"
if [ -f artifacts/Windows-zec-qt-wallet-v$APP_VERSION.zip ] ; then
echo "[OK]"
echo "Done. Build is artifacts/Windows-zec-qt-wallet-v$APP_VERSION.zip"
echo "Package contents:"
unzip -l "artifacts/Windows-zec-qt-wallet-v$APP_VERSION.zip"
echo -n "Package contents.."
if unzip -l "artifacts/Windows-zec-qt-wallet-v$APP_VERSION.zip" | wc -l | grep -q "10"; then
echo "[OK]"
else
echo "[ERROR]"
exit 1
fi
else
echo "[ERROR]"
exit 1
fi
echo ""
echo "Build is artifacts/Windows-zec-qt-wallet-v$APP_VERSION.zip"
echo "Build is artifacts/linux-zec-qt-wallet-v$APP_VERSION.tar.gz"