Skip to content

Commit

Permalink
Bring submodule current, fix innosetup
Browse files Browse the repository at this point in the history
  • Loading branch information
The Blur Network committed Dec 11, 2018
1 parent a8161f0 commit c8b422b
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 9 deletions.
1 change: 1 addition & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[submodule "monero"]
path = monero
url = https://github.com/blur-network/blur.git
branch = stable
8 changes: 4 additions & 4 deletions build_libwallet_api.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@


# MONERO_URL=https://github.com/blur-network/blur.git
# MONERO_BRANCH=v0.1.7.5u
# MONERO_BRANCH=stable
CPU_CORE_COUNT=$(grep -c ^processor /proc/cpuinfo 2>/dev/null || sysctl -n hw.ncpu)
pushd $(pwd)
ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
Expand Down Expand Up @@ -33,9 +33,9 @@ if [ "$platform" != "linux" ]; then
echo "Building libunbound..."
pushd $MONERO_DIR/build/release/external/unbound
# no need to make, it was already built as dependency for libwallet
make -j4
make install -j4
popd
# make -j4
# make install -j4
# popd
fi

popd
Expand Down
4 changes: 2 additions & 2 deletions get_libwallet_api.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
MONERO_URL=https://github.com/blur-network/blur.git
MONERO_BRANCH=master
MONERO_BRANCH=stable

pushd $(pwd)
ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
Expand All @@ -17,7 +17,7 @@ if [ ! -d $MONERO_DIR/src ]; then
fi
git submodule update --remote
git -C $MONERO_DIR fetch
git -C $MONERO_DIR checkout master
git -C $MONERO_DIR checkout stable



Expand Down
4 changes: 2 additions & 2 deletions installers/windows/Monero.iss
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ AppName=Blur Network Wallet
; Thus it's important to keep this stable over releases
; With a different "AppName" InnoSetup would treat a mere update as a completely new application and thus mess up

AppVersion=0.1.7.6.1
AppVersion=0.1.8.1
DefaultDirName={pf}\Blur Network Wallet
DefaultGroupName=Blur Network Wallet
UninstallDisplayIcon={app}\blur-gui-wallet.exe
Expand All @@ -18,7 +18,7 @@ ArchitecturesInstallIn64BitMode=x64
ArchitecturesAllowed=x64
WizardSmallImageFile=WizardSmallImage.bmp
WizardImageFile=WelcomeImage.bmp
DisableWelcomePage=yes
DisableWelcomePage=no
LicenseFile=LICENSE


Expand Down
2 changes: 1 addition & 1 deletion monero
Submodule monero updated 1364 files

0 comments on commit c8b422b

Please sign in to comment.