diff options
| author | selsta <selsta@sent.at> | 2020-09-26 02:15:58 +0200 |
|---|---|---|
| committer | selsta <selsta@sent.at> | 2020-09-26 02:15:58 +0200 |
| commit | 9df9cb8da792c4f640cc0437271b2b67ee935027 (patch) | |
| tree | 1b17ecd0f85fa394dfe809c255d9b8214215c571 | |
| parent | a32d39cc9689e994287a9b35304aa966ab42a371 (diff) | |
| download | monzero-gui-9df9cb8da792c4f640cc0437271b2b67ee935027.tar.gz monzero-gui-9df9cb8da792c4f640cc0437271b2b67ee935027.tar.xz monzero-gui-9df9cb8da792c4f640cc0437271b2b67ee935027.zip | |
build: enable USE_SINGLE_BUILDDIR by default, OFF to disable
| -rw-r--r-- | .github/workflows/build.yml | 8 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | README.md | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f939a599..4948550e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ jobs: - name: update brew and install dependencies run: brew update && brew install boost hidapi zmq libpgm miniupnpc ldns expat libunwind-headers protobuf qt5 pkg-config - name: build - run: USE_SINGLE_BUILDDIR=ON DEV_MODE=ON make release -j3 + run: DEV_MODE=ON make release -j3 - name: test qml run: build/release/bin/monero-wallet-gui.app/Contents/MacOS/monero-wallet-gui --test-qml @@ -36,7 +36,7 @@ jobs: - name: install monero gui dependencies run: sudo apt -y install qtbase5-dev qt5-default qtdeclarative5-dev qml-module-qtquick-controls qml-module-qtquick-controls2 qml-module-qtquick-dialogs qml-module-qtquick-xmllistmodel qml-module-qt-labs-settings qml-module-qt-labs-folderlistmodel qttools5-dev-tools qml-module-qtquick-templates2 libqt5svg5-dev libgcrypt20-dev xvfb - name: build - run: USE_SINGLE_BUILDDIR=ON DEV_MODE=ON make release -j3 + run: DEV_MODE=ON make release -j3 - name: test qml run: xvfb-run -a build/release/bin/monero-wallet-gui --test-qml @@ -54,7 +54,7 @@ jobs: update: true install: mingw-w64-x86_64-toolchain make mingw-w64-x86_64-cmake mingw-w64-x86_64-boost mingw-w64-x86_64-openssl mingw-w64-x86_64-zeromq mingw-w64-x86_64-libsodium mingw-w64-x86_64-hidapi mingw-w64-x86_64-protobuf-c mingw-w64-x86_64-libusb git mingw-w64-x86_64-qt5 mingw-w64-x86_64-libgcrypt - name: build - run: USE_SINGLE_BUILDDIR=ON DEV_MODE=ON make release-win64 -j2 + run: DEV_MODE=ON make release-win64 -j2 - name: test qml run: build/release/bin/monero-wallet-gui --test-qml @@ -67,7 +67,7 @@ jobs: - name: preprare build enviroment run: docker build --tag monero:build-env-linux --build-arg THREADS=3 --file Dockerfile.linux . - name: build - run: docker run --rm -v /home/runner/work/monero-gui/monero-gui:/monero-gui -w /monero-gui monero:build-env-linux sh -c 'USE_SINGLE_BUILDDIR=ON make release-static -j3' + run: docker run --rm -v /home/runner/work/monero-gui/monero-gui:/monero-gui -w /monero-gui monero:build-env-linux sh -c 'make release-static -j3' docker-windows-static: runs-on: ubuntu-20.04 @@ -6,7 +6,7 @@ ifneq ($(dotgit), .git/config) endif subbuilddir:=$(shell echo `uname | sed -e 's|[:/\\ \(\)]|_|g'`/`git branch | grep '\* ' | cut -f2- -d' '| sed -e 's|[:/\\ \(\)]|_|g'`) -ifeq ($(USE_SINGLE_BUILDDIR),) +ifeq ($(USE_SINGLE_BUILDDIR), OFF) builddir := build/"$(subbuilddir)" topdir := ../../../.. deldirs := $(builddir) @@ -118,7 +118,7 @@ Packaging for your favorite distribution would be a welcome contribution! 4. Build ``` - docker run --rm -it -v <MONERO_GUI_DIR_FULL_PATH>:/monero-gui -w /monero-gui monero:build-env-linux sh -c 'USE_SINGLE_BUILDDIR=ON make release-static -j4' + docker run --rm -it -v <MONERO_GUI_DIR_FULL_PATH>:/monero-gui -w /monero-gui monero:build-env-linux sh -c 'make release-static -j4' ``` \* `<MONERO_GUI_DIR_FULL_PATH>` - absolute path to `monero-gui` directory \* `4` - number of CPU threads to use |