diff --git a/.gitmodules b/.gitmodules index 713c793..142fb36 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ [submodule "monero"] path = monero url = https://github.com/blur-network/blur.git + branch = v0.1.9.9.2-snap diff --git a/blur-gui-wallet.pro b/blur-gui-wallet.pro index 7dbdf41..bd2be6b 100644 --- a/blur-gui-wallet.pro +++ b/blur-gui-wallet.pro @@ -5,7 +5,7 @@ TEMPLATE = app -QT += qml quick widgets concurrent +QT += qml quick widgets WALLET_ROOT=$$PWD/monero diff --git a/build_snap.sh b/build_snap.sh index cc6b92a..776c779 100755 --- a/build_snap.sh +++ b/build_snap.sh @@ -1,7 +1,7 @@ #!/bin/bash BUILD_TYPE=$1 -source ./../../../utils.sh +source ${SNAPCRAFT_PART_SRC}/utils.sh platform=$(get_platform) # default build type if [ -z $BUILD_TYPE ]; then @@ -60,7 +60,7 @@ else fi -source ./../../../utils.sh +source ${SNAPCRAFT_PART_SRC}/utils.sh pushd $(pwd) ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" MONERO_DIR=monero @@ -72,11 +72,11 @@ if [[ $platform == *bsd* ]]; then fi # build libwallet -./../../../get_libwallet_api.sh $BUILD_TYPE +${SNAPCRAFT_PART_SRC}/get_libwallet_api.sh $BUILD_TYPE # build zxcvbn if [ "$DISABLE_PASS_STRENGTH_METER" != true ]; then - $MAKE -C ../../../src/zxcvbn-c || exit + $MAKE -C ${SNAPCRACFT_PART_SRC}/zxcvbn-c || exit fi if [ ! -d build ]; then mkdir build; fi @@ -96,28 +96,20 @@ elif [ "$platform" == "mingw64" ] || [ "$platform" == "mingw32" ]; then MONEROD_EXEC=blurd.exe fi -# force version update -get_tag -echo "var GUI_VERSION = \"$TAGNAME\"" > version.js -pushd "$MONERO_DIR" -get_tag -popd -echo "var GUI_MONERO_VERSION = \"$TAGNAME\"" >> version.js - cd build if ! QMAKE=$(find_command qmake qmake-qt5); then echo "Failed to find suitable qmake command." exit 1 fi -$QMAKE ../../../../blur-gui-wallet.pro "$CONFIG" || exit +$QMAKE ${SNAPCRAFT_PART_SRC}/blur-gui-wallet.pro "$CONFIG" || exit $MAKE || exit # Copy blurd to bin folder if [ "$platform" != "mingw32" ] && [ "$ANDROID" != true ]; then -cp ../../../../$MONERO_DIR/bin/$MONEROD_EXEC $BIN_PATH +cp ${SNAPCRAFT_PART_SRC}/$MONERO_DIR/bin/$MONEROD_EXEC ${SNAPCRAFT_PART_SRC}/release/bin/ fi -# make deploy +make deploy popd diff --git a/get_libwallet_api.sh b/get_libwallet_api.sh index 56eb69e..dfc057f 100755 --- a/get_libwallet_api.sh +++ b/get_libwallet_api.sh @@ -1,6 +1,6 @@ #!/bin/bash MONERO_URL=https://github.com/blur-network/blur.git -MONERO_BRANCH=v0.1.9.9.2 +MONERO_BRANCH=v0.1.9.9.2-snap pushd $(pwd) ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" @@ -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 v0.1.9.9.2 +git -C $MONERO_DIR checkout v0.1.9.9.2-snap diff --git a/monero b/monero index 4f6f84a..976976e 160000 --- a/monero +++ b/monero @@ -1 +1 @@ -Subproject commit 4f6f84ae005f128ddb3a052323e038c596eddfb6 +Subproject commit 976976ea3fe2d823b0eb0d732e4853e7cd8c1dd0 diff --git a/snap/etc/blurd.conf b/snap/etc/blurd.conf new file mode 100644 index 0000000..1833055 --- /dev/null +++ b/snap/etc/blurd.conf @@ -0,0 +1,17 @@ +# Configuration for blurd +# Syntax: any command line option may be specified as 'clioptionname=value'. +# See 'blurd --help' for all available options. + +# Overriden by snap: +# data-dir=/var/log/blur +# log-file=/var/log/blur/blurnetwork.log + +add-priority-node=66.70.189.131:52541 +add-priority-node=66.70.188.178:52541 +add-priority-node=66.70.189.183:52541 +add-priority-node=66.70.189.183:52541 +add-priority-node=51.79.66.123:52541 +add-priority-node=51.79.64.184:52541 +p2p-bind-port=52541 +rpc-bind-port=52542 + diff --git a/snap/qml.qrc b/snap/qml.qrc deleted file mode 100644 index cd54940..0000000 --- a/snap/qml.qrc +++ /dev/null @@ -1,211 +0,0 @@ - - - main.qml - LeftPanel.qml - RightPanel.qml - MiddlePanel.qml - images/closeIcon.png - images/helpIcon.png - images/maximizeIcon.png - images/minimizeIcon.png - images/moneroLogo.png - components/Label.qml - images/whatIsIcon.png - images/lockIcon.png - components/MenuButton.qml - images/menuIndicator.png - pages/Dashboard.qml - pages/Transfer.qml - pages/History.qml - pages/AddressBook.qml - pages/Mining.qml - pages/Settings.qml - components/NetworkStatusItem.qml - images/statusConnected.png - images/statusDisconnected.png - components/Input.qml - components/SearchInput.qml - images/magnifier.png - components/StandardButton.qml - images/dropIndicator.png - images/hseparator.png - components/LineEdit.qml - components/TableHeader.qml - images/ascSortIndicator.png - images/ascSortIndicatorActived.png - images/ascSortIndicatorPressed.png - images/descSortIndicator.png - images/descSortIndicatorActived.png - images/descSortIndicatorPressed.png - images/backToWindowIcon.png - components/DashboardTable.qml - components/TableDropdown.qml - images/tableOptions.png - images/dropdownAdd.png - images/dropdownSearch.png - images/dropdownSend.png - components/TipItem.qml - images/tip.png - tabs/Twitter.qml - tabs/tweetSearch.js - tabs/TweetsModel.qml - components/Scroll.qml - components/AddressBookTable.qml - components/SubaddressTable.qml - images/deleteIcon.png - images/moneroIcon.png - components/StandardDropdown.qml - images/whiteDropIndicator.png - components/PrivacyLevel.qml - images/privacyTick.png - components/CheckBox.qml - images/checkedOrangeIcon.png - images/uncheckedIcon.png - components/DatePicker.qml - images/datePicker.png - images/nextMonth.png - images/prevMonth.png - components/TickDelegate.qml - components/TitleBar.qml - images/collapseRightPanel.png - images/expandRightPanel.png - images/dropdownCopy.png - images/expandTable.png - images/dropdownDel.png - components/HistoryTable.qml - components/HistoryTableMobile.qml - images/gotoBasicVersion.png - images/goToBasicVersionHovered.png - BasicPanel.qml - images/moneroLogo2.png - components/PrivacyLevelSmall.qml - images/checkedVioletIcon.png - images/resize.png - images/resizeHovered.png - wizard/WizardWelcome.qml - wizard/WizardMain.qml - images/nextPage.png - images/prevPage.png - wizard/WizardOptions.qml - images/createWallet.png - images/openAccount.png - images/recoverWallet.png - wizard/WizardCreateWallet.qml - images/greyTriangle.png - images/copyToClipboard.png - wizard/WizardPassword.qml - wizard/WizardConfigure.qml - wizard/WizardFinish.qml - wizard/WizardPasswordInput.qml - lang/languages.xml - lang/flags/bd.png - lang/flags/bg.png - lang/flags/br.png - lang/flags/catalonia.png - lang/flags/cn.png - lang/flags/hr.png - lang/flags/hu.png - lang/flags/cz.png - lang/flags/dk.png - lang/flags/eg.png - lang/flags/esperanto.png - lang/flags/fi.png - lang/flags/fr.png - lang/flags/de.png - lang/flags/in.png - lang/flags/id.png - lang/flags/il.png - lang/flags/it.png - lang/flags/jp.png - lang/flags/lt.png - lang/flags/nl.png - lang/flags/ps.png - lang/flags/pl.png - lang/flags/pt.png - lang/flags/ro.png - lang/flags/ru.png - lang/flags/rs.png - lang/flags/sk.png - lang/flags/si.png - lang/flags/za.png - lang/flags/kr.png - lang/flags/es.png - lang/flags/se.png - lang/flags/tw.png - lang/flags/tr.png - lang/flags/ua.png - lang/flags/gb.png - lang/flags/us.png - lang/flags/pirate.png - wizard/WizardManageWalletUI.qml - wizard/WizardRecoveryWallet.qml - wizard/WizardMemoTextInput.qml - wizard/utils.js - pages/Receive.qml - pages/TxKey.qml - pages/SharedRingDB.qml - components/IconButton.qml - components/PasswordDialog.qml - components/NewPasswordDialog.qml - components/InputDialog.qml - components/ProcessingSplash.qml - components/ProgressBar.qml - components/StandardDialog.qml - pages/Sign.qml - components/DaemonManagerDialog.qml - wizard/WizardPasswordUI.qml - wizard/WizardCreateViewOnlyWallet.qml - components/DaemonConsole.qml - components/QRCodeScanner.qml - components/Notifier.qml - components/MobileHeader.qml - components/TextBlock.qml - wizard/WizardDaemonSettings.qml - components/RemoteNodeEdit.qml - pages/Keys.qml - images/menu.png - images/appicon.ico - images/right.png - images/card-background.png - images/minimize.png - images/fullscreen.png - images/close.png - images/moneroLogo_white.png - images/moneroIcon-trans28x28.png - images/moneroIcon-trans84x84.png - images/moneroIcon-trans56x56.png - images/question.png - images/expand.png - images/titlebarGradient.jpg - images/titlebarLogo.png - images/menuArrow.png - images/menuButtonGradient.png - fonts/SFUIDisplay-Medium.otf - fonts/SFUIDisplay-Regular.otf - fonts/SFUIDisplay-Light.otf - fonts/SFUIDisplay-Bold.otf - components/Style.qml - components/qmldir - components/InlineButton.qml - images/lightning.png - images/leftPanelBg.jpg - images/moneroIcon-28x28.png - images/lightning-white.png - images/middlePanelBg.jpg - components/InputMulti.qml - images/checkedIcon-black.png - components/LineEditMulti.qml - components/LabelButton.qml - components/LabelSubheader.qml - images/arrow-right-medium-white.png - images/rightArrow.png - images/upArrow-green.png - images/downArrow.png - images/historyBorderRadius.png - components/HistoryTableInnerColumn.qml - components/CheckBox2.qml - js/TxUtils.js - images/warning.png - images/checkedBlackIcon.png - - diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index ef07611..dbb2b8f 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -33,6 +33,7 @@ parts: blur-wallet: build-packages: [build-essential, git, cmake, pkg-config, libboost-all-dev, libssl-dev, libsodium-dev, qtbase5-dev, qt5-default, qtdeclarative5-dev, qml-module-qtquick-controls, qml-module-qtquick-dialogs, qml-module-qtquick-xmllistmodel, qml-module-qt-labs-folderlistmodel, qml-module-qt-labs-settings, qttools5-dev-tools] plugin: dump + override-build: sh -c '${SNAPCRAFT_PART_SRC}/build_snap.sh release' && cp -r ${SNAPCRAFT_PART_BUILD}/release/bin ${SNAPCRAFT_PART_INSTALL}/ source: . stage-packages: - libboost-serialization1.62.0 @@ -45,7 +46,7 @@ parts: - libboost-date-time1.62.0 - libboost-program-options1.62.0 - libssl-dev - - libsodium-dev + - libsodium23 - libstdc++6 - libgcc1 - libreadline-gplv2-dev @@ -65,7 +66,9 @@ parts: - libtinfo5 organize: local/start_gui.sh: bin/start_gui.sh + bin: usr/bin prime: + - usr/bin - usr/lib - -usr/share @@ -73,5 +76,6 @@ parts: plugin: dump source: . prime: + - usr/lib - blurd - blur-gui-wallet diff --git a/snap/translations.qrc b/snap/translations.qrc deleted file mode 100644 index 5e0fbe1..0000000 --- a/snap/translations.qrc +++ /dev/null @@ -1,34 +0,0 @@ - - - monero-core_ar.qm - monero-core_cat.qm - monero-core_cs.qm - monero-core_da.qm - monero-core_de.qm - monero-core_eo.qm - monero-core_es.qm - monero-core_fi.qm - monero-core_fr.qm - monero-core_he.qm - monero-core_hi.qm - monero-core_hr.qm - monero-core_id.qm - monero-core_it.qm - monero-core_ja.qm - monero-core_ko.qm - monero-core_nl.qm - monero-core_pl.qm - monero-core_pt-br.qm - monero-core_pt-pt.qm - monero-core_ro.qm - monero-core_rs.qm - monero-core_ru.qm - monero-core_sk.qm - monero-core_sl.qm - monero-core_sv.qm - monero-core_tr.qm - monero-core_ua.qm - monero-core_zh-cn.qm - monero-core_zh-tw.qm - -