diff --git a/.gitignore b/.gitignore index b2608b6..273106c 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,6 @@ IDEWorkspaceChecks.plist *.sln node_modules zec-qt-wallet.pro.user.4.10-pre1 +zecwallet-lite +zecwallet-lite_plugin_import.cpp +zecwallet-lite_resource.rc diff --git a/lib/src/lib.rs b/lib/src/lib.rs index 98b03fa..afe5456 100644 --- a/lib/src/lib.rs +++ b/lib/src/lib.rs @@ -105,14 +105,6 @@ pub extern fn litelib_initialize_new_from_phrase(dangerous: bool, server: *const } }; - let seed = match lightclient.do_seed_phrase() { - Ok(s) => s.dump(), - Err(e) => { - let e_str = CString::new(format!("Error: {}", e)).unwrap(); - return e_str.into_raw(); - } - }; - LIGHTCLIENT.lock().unwrap().replace(Some(Arc::new(lightclient))); let c_str = CString::new("OK").unwrap(); diff --git a/src/scripts/mkrelease.sh b/src/scripts/mkrelease.sh index 596c448..f96a8ef 100755 --- a/src/scripts/mkrelease.sh +++ b/src/scripts/mkrelease.sh @@ -9,7 +9,7 @@ if [ -z $PREV_VERSION ]; then echo "PREV_VERSION is not set"; 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 +sed -i "s/${PREV_VERSION}/${APP_VERSION}/g" zecwallet-lite.pro > /dev/null # Also update it in the README.md sed -i "s/${PREV_VERSION}/${APP_VERSION}/g" README.md > /dev/null @@ -32,7 +32,8 @@ echo "[OK]" echo -n "Building..............." rm -rf bin/zecwallet* > /dev/null -make clean > /dev/null +# Build the lib first +cd lib && make release && cd .. make -j$(nproc) > /dev/null echo "[OK]" @@ -84,7 +85,7 @@ mkdir -p $debdir/usr/local/bin cat src/scripts/control | sed "s/RELEASE_VERSION/$APP_VERSION/g" > $debdir/DEBIAN/control -cp zecwallet $debdir/usr/local/bin/ +cp zecwallet-lite $debdir/usr/local/bin/ mkdir -p $debdir/usr/share/pixmaps/ cp res/zecwallet-lite.xpm $debdir/usr/share/pixmaps/ @@ -119,6 +120,8 @@ echo "[OK]" echo -n "Building..............." +# Build the lib first +cd lib && make winrelease && cd .. x86_64-w64-mingw32.static-qmake-qt5 zecwallet-lite.pro CONFIG+=release > /dev/null make -j32 > /dev/null echo "[OK]"