From f4ef4411fa434dade3a8f035f39c39ecee33d331 Mon Sep 17 00:00:00 2001 From: HLXEasy Date: Mon, 6 Sep 2021 21:59:45 +0200 Subject: [PATCH 1/9] Use updated builder image for build of all Linux flavours --- Docker/CentOS/Dockerfile | 2 +- Docker/CentOS/Dockerfile_noUpload | 2 +- Docker/Debian/Dockerfile_Buster | 2 +- Docker/Debian/Dockerfile_Buster_noUpload | 2 +- Docker/Debian/Dockerfile_Stretch | 2 +- Docker/Debian/Dockerfile_Stretch_noUpload | 2 +- Docker/Fedora/Dockerfile | 2 +- Docker/Fedora/Dockerfile_noUpload | 2 +- Docker/OpenSUSE/Dockerfile | 2 +- Docker/OpenSUSE/Dockerfile_noUpload | 2 +- Docker/RaspberryPi/Dockerfile_Buster | 2 +- Docker/RaspberryPi/Dockerfile_Buster_noUpload | 2 +- Docker/Ubuntu/Dockerfile_18_04 | 2 +- Docker/Ubuntu/Dockerfile_18_04_noUpload | 2 +- Docker/Ubuntu/Dockerfile_20_04 | 2 +- Docker/Ubuntu/Dockerfile_20_04_noUpload | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Docker/CentOS/Dockerfile b/Docker/CentOS/Dockerfile index 6674aaefbc..6e038c6233 100644 --- a/Docker/CentOS/Dockerfile +++ b/Docker/CentOS/Dockerfile @@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT ### At first perform source build ### -FROM aliascash/alias-wallet-builder-centos-8:latest as build +FROM aliascash/alias-wallet-builder-centos-8:2.7 as build MAINTAINER HLXEasy # Build parameters diff --git a/Docker/CentOS/Dockerfile_noUpload b/Docker/CentOS/Dockerfile_noUpload index c9cf2275fc..e04dde8233 100644 --- a/Docker/CentOS/Dockerfile_noUpload +++ b/Docker/CentOS/Dockerfile_noUpload @@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT ### At first perform source build ### -FROM aliascash/alias-wallet-builder-centos-8:latest +FROM aliascash/alias-wallet-builder-centos-8:2.7 MAINTAINER HLXEasy # Build parameters diff --git a/Docker/Debian/Dockerfile_Buster b/Docker/Debian/Dockerfile_Buster index 06357d5240..6c231489d0 100644 --- a/Docker/Debian/Dockerfile_Buster +++ b/Docker/Debian/Dockerfile_Buster @@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT ### At first perform source build ### -FROM aliascash/alias-wallet-builder-debian-buster:latest as build +FROM aliascash/alias-wallet-builder-debian-buster:2.7 as build MAINTAINER HLXEasy # Build parameters diff --git a/Docker/Debian/Dockerfile_Buster_noUpload b/Docker/Debian/Dockerfile_Buster_noUpload index 252507246b..7c4ca7a806 100644 --- a/Docker/Debian/Dockerfile_Buster_noUpload +++ b/Docker/Debian/Dockerfile_Buster_noUpload @@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT ### At first perform source build ### -FROM aliascash/alias-wallet-builder-debian-buster:latest +FROM aliascash/alias-wallet-builder-debian-buster:2.7 MAINTAINER HLXEasy # Build parameters diff --git a/Docker/Debian/Dockerfile_Stretch b/Docker/Debian/Dockerfile_Stretch index f5080923b7..5bbd989d5e 100644 --- a/Docker/Debian/Dockerfile_Stretch +++ b/Docker/Debian/Dockerfile_Stretch @@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT ### At first perform source build ### -FROM aliascash/alias-wallet-builder-debian-stretch:latest as build +FROM aliascash/alias-wallet-builder-debian-stretch:2.7 as build MAINTAINER HLXEasy # Build parameters diff --git a/Docker/Debian/Dockerfile_Stretch_noUpload b/Docker/Debian/Dockerfile_Stretch_noUpload index 6ac0e980c4..3aa25631b4 100644 --- a/Docker/Debian/Dockerfile_Stretch_noUpload +++ b/Docker/Debian/Dockerfile_Stretch_noUpload @@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT ### At first perform source build ### -FROM aliascash/alias-wallet-builder-debian-stretch:latest +FROM aliascash/alias-wallet-builder-debian-stretch:2.7 MAINTAINER HLXEasy # Build parameters diff --git a/Docker/Fedora/Dockerfile b/Docker/Fedora/Dockerfile index 3626a2d100..0a39ae468e 100644 --- a/Docker/Fedora/Dockerfile +++ b/Docker/Fedora/Dockerfile @@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT ### At first perform source build ### -FROM aliascash/alias-wallet-builder-fedora:latest as build +FROM aliascash/alias-wallet-builder-fedora:2.7 as build MAINTAINER HLXEasy # Build parameters diff --git a/Docker/Fedora/Dockerfile_noUpload b/Docker/Fedora/Dockerfile_noUpload index 4fc3b79390..6ab259f453 100644 --- a/Docker/Fedora/Dockerfile_noUpload +++ b/Docker/Fedora/Dockerfile_noUpload @@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT ### At first perform source build ### -FROM aliascash/alias-wallet-builder-fedora:latest +FROM aliascash/alias-wallet-builder-fedora:2.7 MAINTAINER HLXEasy # Build parameters diff --git a/Docker/OpenSUSE/Dockerfile b/Docker/OpenSUSE/Dockerfile index 48e4944a33..16f62ccb8d 100644 --- a/Docker/OpenSUSE/Dockerfile +++ b/Docker/OpenSUSE/Dockerfile @@ -3,7 +3,7 @@ # SPDX-License-Identifier: MIT ### At first perform source build ### -FROM aliascash/alias-wallet-builder-opensuse-tumbleweed:latest as build +FROM aliascash/alias-wallet-builder-opensuse-tumbleweed:2.7 as build MAINTAINER HLXEasy # Build parameters diff --git a/Docker/OpenSUSE/Dockerfile_noUpload b/Docker/OpenSUSE/Dockerfile_noUpload index a7953363f6..e9f9a8fd82 100644 --- a/Docker/OpenSUSE/Dockerfile_noUpload +++ b/Docker/OpenSUSE/Dockerfile_noUpload @@ -3,7 +3,7 @@ # SPDX-License-Identifier: MIT ### At first perform source build ### -FROM aliascash/alias-wallet-builder-opensuse-tumbleweed:latest +FROM aliascash/alias-wallet-builder-opensuse-tumbleweed:2.7 MAINTAINER HLXEasy # Build parameters diff --git a/Docker/RaspberryPi/Dockerfile_Buster b/Docker/RaspberryPi/Dockerfile_Buster index 9f9fcf9dcb..5e81f0c097 100644 --- a/Docker/RaspberryPi/Dockerfile_Buster +++ b/Docker/RaspberryPi/Dockerfile_Buster @@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT ### At first perform source build ### -FROM aliascash/alias-wallet-builder-raspi-buster:latest as build +FROM aliascash/alias-wallet-builder-raspi-buster:2.7 as build MAINTAINER HLXEasy # Build parameters diff --git a/Docker/RaspberryPi/Dockerfile_Buster_noUpload b/Docker/RaspberryPi/Dockerfile_Buster_noUpload index b8274289d3..2a758b189a 100644 --- a/Docker/RaspberryPi/Dockerfile_Buster_noUpload +++ b/Docker/RaspberryPi/Dockerfile_Buster_noUpload @@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT ### At first perform source build ### -FROM aliascash/alias-wallet-builder-raspi-buster:latest +FROM aliascash/alias-wallet-builder-raspi-buster:2.7 MAINTAINER HLXEasy # Build parameters diff --git a/Docker/Ubuntu/Dockerfile_18_04 b/Docker/Ubuntu/Dockerfile_18_04 index 4acbb80de3..d4740b5f8c 100644 --- a/Docker/Ubuntu/Dockerfile_18_04 +++ b/Docker/Ubuntu/Dockerfile_18_04 @@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT ### At first perform source build ### -FROM aliascash/alias-wallet-builder-ubuntu-18-04:latest as build +FROM aliascash/alias-wallet-builder-ubuntu-18-04:2.7 as build MAINTAINER HLXEasy # Build parameters diff --git a/Docker/Ubuntu/Dockerfile_18_04_noUpload b/Docker/Ubuntu/Dockerfile_18_04_noUpload index 19e693806f..e986cad3f0 100644 --- a/Docker/Ubuntu/Dockerfile_18_04_noUpload +++ b/Docker/Ubuntu/Dockerfile_18_04_noUpload @@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT ### At first perform source build ### -FROM aliascash/alias-wallet-builder-ubuntu-18-04:latest +FROM aliascash/alias-wallet-builder-ubuntu-18-04:2.7 MAINTAINER HLXEasy # Build parameters diff --git a/Docker/Ubuntu/Dockerfile_20_04 b/Docker/Ubuntu/Dockerfile_20_04 index 77b83d4444..b13672a5ce 100644 --- a/Docker/Ubuntu/Dockerfile_20_04 +++ b/Docker/Ubuntu/Dockerfile_20_04 @@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT ### At first perform source build ### -FROM aliascash/alias-wallet-builder-ubuntu-20-04:latest as build +FROM aliascash/alias-wallet-builder-ubuntu-20-04:2.7 as build MAINTAINER HLXEasy # Build parameters diff --git a/Docker/Ubuntu/Dockerfile_20_04_noUpload b/Docker/Ubuntu/Dockerfile_20_04_noUpload index 7f6235d661..b5e35b0091 100644 --- a/Docker/Ubuntu/Dockerfile_20_04_noUpload +++ b/Docker/Ubuntu/Dockerfile_20_04_noUpload @@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT ### At first perform source build ### -FROM aliascash/alias-wallet-builder-ubuntu-20-04:latest +FROM aliascash/alias-wallet-builder-ubuntu-20-04:2.7 MAINTAINER HLXEasy # Build parameters From a00125f584e846dc899042d2586b4396f53ae34b Mon Sep 17 00:00:00 2001 From: HLXEasy Date: Sun, 19 Sep 2021 22:55:54 +0200 Subject: [PATCH 2/9] Updated run-vcpkg action to v7 --- .github/workflows/build-develop.yml | 26 ++++++++++++++------ .github/workflows/build-featurebranch.yml | 30 +++++++++++++++++------ .github/workflows/build-master.yml | 26 ++++++++++++++------ 3 files changed, 58 insertions(+), 24 deletions(-) diff --git a/.github/workflows/build-develop.yml b/.github/workflows/build-develop.yml index 1ca0e25147..206c84a9ab 100644 --- a/.github/workflows/build-develop.yml +++ b/.github/workflows/build-develop.yml @@ -222,12 +222,17 @@ jobs: setup-python: 'false' modules: 'qtwebengine' - - name: Install vcpkg and packages with cache - uses: lukka/run-vcpkg@v6 + # Restore from cache the previously built ports. If cache-miss, download and build vcpkg (aka "bootstrap vcpkg"). + - name: Restore from cache and install vcpkg + # Download and build vcpkg, without installing any port. If content is cached already, it is a no-op. + uses: lukka/run-vcpkg@v7 with: - vcpkgArguments: 'berkeleydb boost leveldb openssl' - vcpkgGitCommitId: a037d826492039db9d58af47a1e1248037d15f40 + setupOnly: true vcpkgTriplet: x64-windows + # Now that vcpkg is installed, it is being used to run with the desired arguments. + - run: | + $VCPKG_ROOT/vcpkg install berkeleydb boost leveldb openssl + shell: bash - name: Build Windows binaries run: ./scripts/cmake-build-win.bat @@ -287,12 +292,17 @@ jobs: modules: 'qtwebengine' arch: 'win32_msvc2017' - - name: Install vcpkg and packages with cache - uses: lukka/run-vcpkg@v6 + # Restore from cache the previously built ports. If cache-miss, download and build vcpkg (aka "bootstrap vcpkg"). + - name: Restore from cache and install vcpkg + # Download and build vcpkg, without installing any port. If content is cached already, it is a no-op. + uses: lukka/run-vcpkg@v7 with: - vcpkgArguments: 'berkeleydb boost leveldb openssl' - vcpkgGitCommitId: a037d826492039db9d58af47a1e1248037d15f40 + setupOnly: true vcpkgTriplet: x86-windows + # Now that vcpkg is installed, it is being used to run with the desired arguments. + - run: | + $VCPKG_ROOT/vcpkg install berkeleydb boost leveldb openssl + shell: bash - name: Build Windows binaries run: ./scripts/cmake-build-win-x86.bat diff --git a/.github/workflows/build-featurebranch.yml b/.github/workflows/build-featurebranch.yml index b000f5b4b1..b7dea8e754 100644 --- a/.github/workflows/build-featurebranch.yml +++ b/.github/workflows/build-featurebranch.yml @@ -96,12 +96,19 @@ jobs: version: '5.12.9' setup-python: 'false' modules: 'qtwebengine' - - name: Install vcpkg and packages with cache - uses: lukka/run-vcpkg@v6 + + # Restore from cache the previously built ports. If cache-miss, download and build vcpkg (aka "bootstrap vcpkg"). + - name: Restore from cache and install vcpkg + # Download and build vcpkg, without installing any port. If content is cached already, it is a no-op. + uses: lukka/run-vcpkg@v7 with: - vcpkgArguments: 'berkeleydb boost leveldb openssl' - vcpkgGitCommitId: a037d826492039db9d58af47a1e1248037d15f40 + setupOnly: true vcpkgTriplet: x64-windows + # Now that vcpkg is installed, it is being used to run with the desired arguments. + - run: | + $VCPKG_ROOT/vcpkg install berkeleydb boost leveldb openssl + shell: bash + - name: Build Windows binaries run: ./scripts/cmake-build-win.bat env: @@ -126,12 +133,19 @@ jobs: setup-python: 'false' modules: 'qtwebengine' arch: 'win32_msvc2017' - - name: Install vcpkg and packages with cache - uses: lukka/run-vcpkg@v6 + + # Restore from cache the previously built ports. If cache-miss, download and build vcpkg (aka "bootstrap vcpkg"). + - name: Restore from cache and install vcpkg + # Download and build vcpkg, without installing any port. If content is cached already, it is a no-op. + uses: lukka/run-vcpkg@v7 with: - vcpkgArguments: 'berkeleydb boost leveldb openssl' - vcpkgGitCommitId: a037d826492039db9d58af47a1e1248037d15f40 + setupOnly: true vcpkgTriplet: x86-windows + # Now that vcpkg is installed, it is being used to run with the desired arguments. + - run: | + $VCPKG_ROOT/vcpkg install berkeleydb boost leveldb openssl + shell: bash + - name: Build Windows binaries run: ./scripts/cmake-build-win-x86.bat env: diff --git a/.github/workflows/build-master.yml b/.github/workflows/build-master.yml index 1968f91509..be90153c08 100644 --- a/.github/workflows/build-master.yml +++ b/.github/workflows/build-master.yml @@ -218,12 +218,17 @@ jobs: setup-python: 'false' modules: 'qtwebengine' - - name: Install vcpkg and packages with cache - uses: lukka/run-vcpkg@v6 + # Restore from cache the previously built ports. If cache-miss, download and build vcpkg (aka "bootstrap vcpkg"). + - name: Restore from cache and install vcpkg + # Download and build vcpkg, without installing any port. If content is cached already, it is a no-op. + uses: lukka/run-vcpkg@v7 with: - vcpkgArguments: 'berkeleydb boost leveldb openssl' - vcpkgGitCommitId: a037d826492039db9d58af47a1e1248037d15f40 + setupOnly: true vcpkgTriplet: x64-windows + # Now that vcpkg is installed, it is being used to run with the desired arguments. + - run: | + $VCPKG_ROOT/vcpkg install berkeleydb boost leveldb openssl + shell: bash - name: Build Windows binaries run: ./scripts/cmake-build-win.bat @@ -283,12 +288,17 @@ jobs: modules: 'qtwebengine' arch: 'win32_msvc2017' - - name: Install vcpkg and packages with cache - uses: lukka/run-vcpkg@v6 + # Restore from cache the previously built ports. If cache-miss, download and build vcpkg (aka "bootstrap vcpkg"). + - name: Restore from cache and install vcpkg + # Download and build vcpkg, without installing any port. If content is cached already, it is a no-op. + uses: lukka/run-vcpkg@v7 with: - vcpkgArguments: 'berkeleydb boost leveldb openssl' - vcpkgGitCommitId: a037d826492039db9d58af47a1e1248037d15f40 + setupOnly: true vcpkgTriplet: x86-windows + # Now that vcpkg is installed, it is being used to run with the desired arguments. + - run: | + $VCPKG_ROOT/vcpkg install berkeleydb boost leveldb openssl + shell: bash - name: Build Windows binaries run: ./scripts/cmake-build-win-x86.bat From 7c2c57c154fced3739e98b65e46174b1195c4f48 Mon Sep 17 00:00:00 2001 From: HLXEasy Date: Sun, 19 Sep 2021 23:04:34 +0200 Subject: [PATCH 3/9] Added missing parameters to run-vcpkg action --- .github/workflows/build-develop.yml | 4 ++++ .github/workflows/build-featurebranch.yml | 4 ++++ .github/workflows/build-master.yml | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/.github/workflows/build-develop.yml b/.github/workflows/build-develop.yml index 206c84a9ab..114c213c7c 100644 --- a/.github/workflows/build-develop.yml +++ b/.github/workflows/build-develop.yml @@ -229,6 +229,8 @@ jobs: with: setupOnly: true vcpkgTriplet: x64-windows + vcpkgDirectory: ${{ runner.workspace }}/vcpkg/ + vcpkgGitCommitId: 7bc5b8cdfaf35329c1520b2af8d368e2b1cb78e6 # Now that vcpkg is installed, it is being used to run with the desired arguments. - run: | $VCPKG_ROOT/vcpkg install berkeleydb boost leveldb openssl @@ -299,6 +301,8 @@ jobs: with: setupOnly: true vcpkgTriplet: x86-windows + vcpkgDirectory: ${{ runner.workspace }}/vcpkg/ + vcpkgGitCommitId: 7bc5b8cdfaf35329c1520b2af8d368e2b1cb78e6 # Now that vcpkg is installed, it is being used to run with the desired arguments. - run: | $VCPKG_ROOT/vcpkg install berkeleydb boost leveldb openssl diff --git a/.github/workflows/build-featurebranch.yml b/.github/workflows/build-featurebranch.yml index b7dea8e754..0c1e49ad84 100644 --- a/.github/workflows/build-featurebranch.yml +++ b/.github/workflows/build-featurebranch.yml @@ -104,6 +104,8 @@ jobs: with: setupOnly: true vcpkgTriplet: x64-windows + vcpkgDirectory: ${{ runner.workspace }}/vcpkg/ + vcpkgGitCommitId: 7bc5b8cdfaf35329c1520b2af8d368e2b1cb78e6 # Now that vcpkg is installed, it is being used to run with the desired arguments. - run: | $VCPKG_ROOT/vcpkg install berkeleydb boost leveldb openssl @@ -141,6 +143,8 @@ jobs: with: setupOnly: true vcpkgTriplet: x86-windows + vcpkgDirectory: ${{ runner.workspace }}/vcpkg/ + vcpkgGitCommitId: 7bc5b8cdfaf35329c1520b2af8d368e2b1cb78e6 # Now that vcpkg is installed, it is being used to run with the desired arguments. - run: | $VCPKG_ROOT/vcpkg install berkeleydb boost leveldb openssl diff --git a/.github/workflows/build-master.yml b/.github/workflows/build-master.yml index be90153c08..cb971cb0ad 100644 --- a/.github/workflows/build-master.yml +++ b/.github/workflows/build-master.yml @@ -225,6 +225,8 @@ jobs: with: setupOnly: true vcpkgTriplet: x64-windows + vcpkgDirectory: ${{ runner.workspace }}/vcpkg/ + vcpkgGitCommitId: 7bc5b8cdfaf35329c1520b2af8d368e2b1cb78e6 # Now that vcpkg is installed, it is being used to run with the desired arguments. - run: | $VCPKG_ROOT/vcpkg install berkeleydb boost leveldb openssl @@ -295,6 +297,8 @@ jobs: with: setupOnly: true vcpkgTriplet: x86-windows + vcpkgDirectory: ${{ runner.workspace }}/vcpkg/ + vcpkgGitCommitId: 7bc5b8cdfaf35329c1520b2af8d368e2b1cb78e6 # Now that vcpkg is installed, it is being used to run with the desired arguments. - run: | $VCPKG_ROOT/vcpkg install berkeleydb boost leveldb openssl From a1e9637c83e19040e84372f283502dcea1aee409 Mon Sep 17 00:00:00 2001 From: HLXEasy Date: Sun, 19 Sep 2021 23:35:51 +0200 Subject: [PATCH 4/9] Updated used vcpkg hash to 761c81d4, where Boost was updated to 1.76 --- .github/workflows/build-develop.yml | 4 ++-- .github/workflows/build-featurebranch.yml | 4 ++-- .github/workflows/build-master.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-develop.yml b/.github/workflows/build-develop.yml index 114c213c7c..45389f0997 100644 --- a/.github/workflows/build-develop.yml +++ b/.github/workflows/build-develop.yml @@ -230,7 +230,7 @@ jobs: setupOnly: true vcpkgTriplet: x64-windows vcpkgDirectory: ${{ runner.workspace }}/vcpkg/ - vcpkgGitCommitId: 7bc5b8cdfaf35329c1520b2af8d368e2b1cb78e6 + vcpkgGitCommitId: 761c81d43335a5d5ccc2ec8ad90bd7e2cbba734e # Now that vcpkg is installed, it is being used to run with the desired arguments. - run: | $VCPKG_ROOT/vcpkg install berkeleydb boost leveldb openssl @@ -302,7 +302,7 @@ jobs: setupOnly: true vcpkgTriplet: x86-windows vcpkgDirectory: ${{ runner.workspace }}/vcpkg/ - vcpkgGitCommitId: 7bc5b8cdfaf35329c1520b2af8d368e2b1cb78e6 + vcpkgGitCommitId: 761c81d43335a5d5ccc2ec8ad90bd7e2cbba734e # Now that vcpkg is installed, it is being used to run with the desired arguments. - run: | $VCPKG_ROOT/vcpkg install berkeleydb boost leveldb openssl diff --git a/.github/workflows/build-featurebranch.yml b/.github/workflows/build-featurebranch.yml index 0c1e49ad84..898662123f 100644 --- a/.github/workflows/build-featurebranch.yml +++ b/.github/workflows/build-featurebranch.yml @@ -105,7 +105,7 @@ jobs: setupOnly: true vcpkgTriplet: x64-windows vcpkgDirectory: ${{ runner.workspace }}/vcpkg/ - vcpkgGitCommitId: 7bc5b8cdfaf35329c1520b2af8d368e2b1cb78e6 + vcpkgGitCommitId: 761c81d43335a5d5ccc2ec8ad90bd7e2cbba734e # Now that vcpkg is installed, it is being used to run with the desired arguments. - run: | $VCPKG_ROOT/vcpkg install berkeleydb boost leveldb openssl @@ -144,7 +144,7 @@ jobs: setupOnly: true vcpkgTriplet: x86-windows vcpkgDirectory: ${{ runner.workspace }}/vcpkg/ - vcpkgGitCommitId: 7bc5b8cdfaf35329c1520b2af8d368e2b1cb78e6 + vcpkgGitCommitId: 761c81d43335a5d5ccc2ec8ad90bd7e2cbba734e # Now that vcpkg is installed, it is being used to run with the desired arguments. - run: | $VCPKG_ROOT/vcpkg install berkeleydb boost leveldb openssl diff --git a/.github/workflows/build-master.yml b/.github/workflows/build-master.yml index cb971cb0ad..87b79fa279 100644 --- a/.github/workflows/build-master.yml +++ b/.github/workflows/build-master.yml @@ -226,7 +226,7 @@ jobs: setupOnly: true vcpkgTriplet: x64-windows vcpkgDirectory: ${{ runner.workspace }}/vcpkg/ - vcpkgGitCommitId: 7bc5b8cdfaf35329c1520b2af8d368e2b1cb78e6 + vcpkgGitCommitId: 761c81d43335a5d5ccc2ec8ad90bd7e2cbba734e # Now that vcpkg is installed, it is being used to run with the desired arguments. - run: | $VCPKG_ROOT/vcpkg install berkeleydb boost leveldb openssl @@ -298,7 +298,7 @@ jobs: setupOnly: true vcpkgTriplet: x86-windows vcpkgDirectory: ${{ runner.workspace }}/vcpkg/ - vcpkgGitCommitId: 7bc5b8cdfaf35329c1520b2af8d368e2b1cb78e6 + vcpkgGitCommitId: 761c81d43335a5d5ccc2ec8ad90bd7e2cbba734e # Now that vcpkg is installed, it is being used to run with the desired arguments. - run: | $VCPKG_ROOT/vcpkg install berkeleydb boost leveldb openssl From e556ac388e70c6c8b9c1523590594d174ccb4d4a Mon Sep 17 00:00:00 2001 From: HLXEasy Date: Mon, 20 Sep 2021 00:04:55 +0200 Subject: [PATCH 5/9] Added missing vcpkgTriplet option --- .github/workflows/build-develop.yml | 4 ++++ .github/workflows/build-featurebranch.yml | 4 ++++ .github/workflows/build-master.yml | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/.github/workflows/build-develop.yml b/.github/workflows/build-develop.yml index 45389f0997..f62c108893 100644 --- a/.github/workflows/build-develop.yml +++ b/.github/workflows/build-develop.yml @@ -235,6 +235,8 @@ jobs: - run: | $VCPKG_ROOT/vcpkg install berkeleydb boost leveldb openssl shell: bash + with: + vcpkgTriplet: x64-windows - name: Build Windows binaries run: ./scripts/cmake-build-win.bat @@ -307,6 +309,8 @@ jobs: - run: | $VCPKG_ROOT/vcpkg install berkeleydb boost leveldb openssl shell: bash + with: + vcpkgTriplet: x64-windows - name: Build Windows binaries run: ./scripts/cmake-build-win-x86.bat diff --git a/.github/workflows/build-featurebranch.yml b/.github/workflows/build-featurebranch.yml index 898662123f..71d77e5cf0 100644 --- a/.github/workflows/build-featurebranch.yml +++ b/.github/workflows/build-featurebranch.yml @@ -110,6 +110,8 @@ jobs: - run: | $VCPKG_ROOT/vcpkg install berkeleydb boost leveldb openssl shell: bash + with: + vcpkgTriplet: x64-windows - name: Build Windows binaries run: ./scripts/cmake-build-win.bat @@ -149,6 +151,8 @@ jobs: - run: | $VCPKG_ROOT/vcpkg install berkeleydb boost leveldb openssl shell: bash + with: + vcpkgTriplet: x64-windows - name: Build Windows binaries run: ./scripts/cmake-build-win-x86.bat diff --git a/.github/workflows/build-master.yml b/.github/workflows/build-master.yml index 87b79fa279..88481f5d84 100644 --- a/.github/workflows/build-master.yml +++ b/.github/workflows/build-master.yml @@ -231,6 +231,8 @@ jobs: - run: | $VCPKG_ROOT/vcpkg install berkeleydb boost leveldb openssl shell: bash + with: + vcpkgTriplet: x64-windows - name: Build Windows binaries run: ./scripts/cmake-build-win.bat @@ -303,6 +305,8 @@ jobs: - run: | $VCPKG_ROOT/vcpkg install berkeleydb boost leveldb openssl shell: bash + with: + vcpkgTriplet: x64-windows - name: Build Windows binaries run: ./scripts/cmake-build-win-x86.bat From 14a3946edcf655c3470ad2956f86a9efbd647a01 Mon Sep 17 00:00:00 2001 From: HLXEasy Date: Mon, 20 Sep 2021 00:11:24 +0200 Subject: [PATCH 6/9] Simplified vcpkg setup --- .github/workflows/build-develop.yml | 24 ++++------------------- .github/workflows/build-featurebranch.yml | 24 ++++------------------- .github/workflows/build-master.yml | 24 ++++------------------- 3 files changed, 12 insertions(+), 60 deletions(-) diff --git a/.github/workflows/build-develop.yml b/.github/workflows/build-develop.yml index f62c108893..e29e1895ac 100644 --- a/.github/workflows/build-develop.yml +++ b/.github/workflows/build-develop.yml @@ -222,21 +222,13 @@ jobs: setup-python: 'false' modules: 'qtwebengine' - # Restore from cache the previously built ports. If cache-miss, download and build vcpkg (aka "bootstrap vcpkg"). - - name: Restore from cache and install vcpkg - # Download and build vcpkg, without installing any port. If content is cached already, it is a no-op. + - name: Setup vcpkg uses: lukka/run-vcpkg@v7 with: - setupOnly: true + vcpkgArguments: berkeleydb:x64-windows boost:x64-windows leveldb:x64-windows openssl:x64-windows vcpkgTriplet: x64-windows vcpkgDirectory: ${{ runner.workspace }}/vcpkg/ vcpkgGitCommitId: 761c81d43335a5d5ccc2ec8ad90bd7e2cbba734e - # Now that vcpkg is installed, it is being used to run with the desired arguments. - - run: | - $VCPKG_ROOT/vcpkg install berkeleydb boost leveldb openssl - shell: bash - with: - vcpkgTriplet: x64-windows - name: Build Windows binaries run: ./scripts/cmake-build-win.bat @@ -296,21 +288,13 @@ jobs: modules: 'qtwebengine' arch: 'win32_msvc2017' - # Restore from cache the previously built ports. If cache-miss, download and build vcpkg (aka "bootstrap vcpkg"). - - name: Restore from cache and install vcpkg - # Download and build vcpkg, without installing any port. If content is cached already, it is a no-op. + - name: Setup vcpkg uses: lukka/run-vcpkg@v7 with: - setupOnly: true + vcpkgArguments: berkeleydb:x86-windows boost:x86-windows leveldb:x86-windows openssl:x86-windows vcpkgTriplet: x86-windows vcpkgDirectory: ${{ runner.workspace }}/vcpkg/ vcpkgGitCommitId: 761c81d43335a5d5ccc2ec8ad90bd7e2cbba734e - # Now that vcpkg is installed, it is being used to run with the desired arguments. - - run: | - $VCPKG_ROOT/vcpkg install berkeleydb boost leveldb openssl - shell: bash - with: - vcpkgTriplet: x64-windows - name: Build Windows binaries run: ./scripts/cmake-build-win-x86.bat diff --git a/.github/workflows/build-featurebranch.yml b/.github/workflows/build-featurebranch.yml index 71d77e5cf0..506e86d891 100644 --- a/.github/workflows/build-featurebranch.yml +++ b/.github/workflows/build-featurebranch.yml @@ -97,21 +97,13 @@ jobs: setup-python: 'false' modules: 'qtwebengine' - # Restore from cache the previously built ports. If cache-miss, download and build vcpkg (aka "bootstrap vcpkg"). - - name: Restore from cache and install vcpkg - # Download and build vcpkg, without installing any port. If content is cached already, it is a no-op. + - name: Setup vcpkg uses: lukka/run-vcpkg@v7 with: - setupOnly: true + vcpkgArguments: berkeleydb:x64-windows boost:x64-windows leveldb:x64-windows openssl:x64-windows vcpkgTriplet: x64-windows vcpkgDirectory: ${{ runner.workspace }}/vcpkg/ vcpkgGitCommitId: 761c81d43335a5d5ccc2ec8ad90bd7e2cbba734e - # Now that vcpkg is installed, it is being used to run with the desired arguments. - - run: | - $VCPKG_ROOT/vcpkg install berkeleydb boost leveldb openssl - shell: bash - with: - vcpkgTriplet: x64-windows - name: Build Windows binaries run: ./scripts/cmake-build-win.bat @@ -138,21 +130,13 @@ jobs: modules: 'qtwebengine' arch: 'win32_msvc2017' - # Restore from cache the previously built ports. If cache-miss, download and build vcpkg (aka "bootstrap vcpkg"). - - name: Restore from cache and install vcpkg - # Download and build vcpkg, without installing any port. If content is cached already, it is a no-op. + - name: Setup vcpkg uses: lukka/run-vcpkg@v7 with: - setupOnly: true + vcpkgArguments: berkeleydb:x86-windows boost:x86-windows leveldb:x86-windows openssl:x86-windows vcpkgTriplet: x86-windows vcpkgDirectory: ${{ runner.workspace }}/vcpkg/ vcpkgGitCommitId: 761c81d43335a5d5ccc2ec8ad90bd7e2cbba734e - # Now that vcpkg is installed, it is being used to run with the desired arguments. - - run: | - $VCPKG_ROOT/vcpkg install berkeleydb boost leveldb openssl - shell: bash - with: - vcpkgTriplet: x64-windows - name: Build Windows binaries run: ./scripts/cmake-build-win-x86.bat diff --git a/.github/workflows/build-master.yml b/.github/workflows/build-master.yml index 88481f5d84..7df1098915 100644 --- a/.github/workflows/build-master.yml +++ b/.github/workflows/build-master.yml @@ -218,21 +218,13 @@ jobs: setup-python: 'false' modules: 'qtwebengine' - # Restore from cache the previously built ports. If cache-miss, download and build vcpkg (aka "bootstrap vcpkg"). - - name: Restore from cache and install vcpkg - # Download and build vcpkg, without installing any port. If content is cached already, it is a no-op. + - name: Setup vcpkg uses: lukka/run-vcpkg@v7 with: - setupOnly: true + vcpkgArguments: berkeleydb:x64-windows boost:x64-windows leveldb:x64-windows openssl:x64-windows vcpkgTriplet: x64-windows vcpkgDirectory: ${{ runner.workspace }}/vcpkg/ vcpkgGitCommitId: 761c81d43335a5d5ccc2ec8ad90bd7e2cbba734e - # Now that vcpkg is installed, it is being used to run with the desired arguments. - - run: | - $VCPKG_ROOT/vcpkg install berkeleydb boost leveldb openssl - shell: bash - with: - vcpkgTriplet: x64-windows - name: Build Windows binaries run: ./scripts/cmake-build-win.bat @@ -292,21 +284,13 @@ jobs: modules: 'qtwebengine' arch: 'win32_msvc2017' - # Restore from cache the previously built ports. If cache-miss, download and build vcpkg (aka "bootstrap vcpkg"). - - name: Restore from cache and install vcpkg - # Download and build vcpkg, without installing any port. If content is cached already, it is a no-op. + - name: Setup vcpkg uses: lukka/run-vcpkg@v7 with: - setupOnly: true + vcpkgArguments: berkeleydb:x86-windows boost:x86-windows leveldb:x86-windows openssl:x86-windows vcpkgTriplet: x86-windows vcpkgDirectory: ${{ runner.workspace }}/vcpkg/ vcpkgGitCommitId: 761c81d43335a5d5ccc2ec8ad90bd7e2cbba734e - # Now that vcpkg is installed, it is being used to run with the desired arguments. - - run: | - $VCPKG_ROOT/vcpkg install berkeleydb boost leveldb openssl - shell: bash - with: - vcpkgTriplet: x64-windows - name: Build Windows binaries run: ./scripts/cmake-build-win-x86.bat From 2f697e703259ce2349bec67e9e547e8856749eba Mon Sep 17 00:00:00 2001 From: HLXEasy Date: Sun, 26 Sep 2021 21:42:00 +0200 Subject: [PATCH 7/9] Updated used vcpkg hash to 35312384, where python3 was updated --- .github/workflows/build-develop.yml | 4 ++-- .github/workflows/build-featurebranch.yml | 4 ++-- .github/workflows/build-master.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-develop.yml b/.github/workflows/build-develop.yml index e29e1895ac..c185667939 100644 --- a/.github/workflows/build-develop.yml +++ b/.github/workflows/build-develop.yml @@ -228,7 +228,7 @@ jobs: vcpkgArguments: berkeleydb:x64-windows boost:x64-windows leveldb:x64-windows openssl:x64-windows vcpkgTriplet: x64-windows vcpkgDirectory: ${{ runner.workspace }}/vcpkg/ - vcpkgGitCommitId: 761c81d43335a5d5ccc2ec8ad90bd7e2cbba734e + vcpkgGitCommitId: 35312384e7701760ed7855961eff41a63f9cc379 - name: Build Windows binaries run: ./scripts/cmake-build-win.bat @@ -294,7 +294,7 @@ jobs: vcpkgArguments: berkeleydb:x86-windows boost:x86-windows leveldb:x86-windows openssl:x86-windows vcpkgTriplet: x86-windows vcpkgDirectory: ${{ runner.workspace }}/vcpkg/ - vcpkgGitCommitId: 761c81d43335a5d5ccc2ec8ad90bd7e2cbba734e + vcpkgGitCommitId: 35312384e7701760ed7855961eff41a63f9cc379 - name: Build Windows binaries run: ./scripts/cmake-build-win-x86.bat diff --git a/.github/workflows/build-featurebranch.yml b/.github/workflows/build-featurebranch.yml index 506e86d891..a00cd1b108 100644 --- a/.github/workflows/build-featurebranch.yml +++ b/.github/workflows/build-featurebranch.yml @@ -103,7 +103,7 @@ jobs: vcpkgArguments: berkeleydb:x64-windows boost:x64-windows leveldb:x64-windows openssl:x64-windows vcpkgTriplet: x64-windows vcpkgDirectory: ${{ runner.workspace }}/vcpkg/ - vcpkgGitCommitId: 761c81d43335a5d5ccc2ec8ad90bd7e2cbba734e + vcpkgGitCommitId: 35312384e7701760ed7855961eff41a63f9cc379 - name: Build Windows binaries run: ./scripts/cmake-build-win.bat @@ -136,7 +136,7 @@ jobs: vcpkgArguments: berkeleydb:x86-windows boost:x86-windows leveldb:x86-windows openssl:x86-windows vcpkgTriplet: x86-windows vcpkgDirectory: ${{ runner.workspace }}/vcpkg/ - vcpkgGitCommitId: 761c81d43335a5d5ccc2ec8ad90bd7e2cbba734e + vcpkgGitCommitId: 35312384e7701760ed7855961eff41a63f9cc379 - name: Build Windows binaries run: ./scripts/cmake-build-win-x86.bat diff --git a/.github/workflows/build-master.yml b/.github/workflows/build-master.yml index 7df1098915..c3117aa2fb 100644 --- a/.github/workflows/build-master.yml +++ b/.github/workflows/build-master.yml @@ -224,7 +224,7 @@ jobs: vcpkgArguments: berkeleydb:x64-windows boost:x64-windows leveldb:x64-windows openssl:x64-windows vcpkgTriplet: x64-windows vcpkgDirectory: ${{ runner.workspace }}/vcpkg/ - vcpkgGitCommitId: 761c81d43335a5d5ccc2ec8ad90bd7e2cbba734e + vcpkgGitCommitId: 35312384e7701760ed7855961eff41a63f9cc379 - name: Build Windows binaries run: ./scripts/cmake-build-win.bat @@ -290,7 +290,7 @@ jobs: vcpkgArguments: berkeleydb:x86-windows boost:x86-windows leveldb:x86-windows openssl:x86-windows vcpkgTriplet: x86-windows vcpkgDirectory: ${{ runner.workspace }}/vcpkg/ - vcpkgGitCommitId: 761c81d43335a5d5ccc2ec8ad90bd7e2cbba734e + vcpkgGitCommitId: 35312384e7701760ed7855961eff41a63f9cc379 - name: Build Windows binaries run: ./scripts/cmake-build-win-x86.bat From c343272b0cec860bbdd616a2031010bf072c1c6b Mon Sep 17 00:00:00 2001 From: HLXEasy Date: Sat, 23 Oct 2021 22:44:24 +0200 Subject: [PATCH 8/9] Updated Windows build steps --- .github/workflows/build-develop.yml | 12 ++++++------ .github/workflows/build-featurebranch.yml | 14 ++++++++------ .github/workflows/build-master.yml | 12 ++++++------ 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build-develop.yml b/.github/workflows/build-develop.yml index c185667939..1f649939a1 100644 --- a/.github/workflows/build-develop.yml +++ b/.github/workflows/build-develop.yml @@ -227,8 +227,8 @@ jobs: with: vcpkgArguments: berkeleydb:x64-windows boost:x64-windows leveldb:x64-windows openssl:x64-windows vcpkgTriplet: x64-windows - vcpkgDirectory: ${{ runner.workspace }}/vcpkg/ - vcpkgGitCommitId: 35312384e7701760ed7855961eff41a63f9cc379 + vcpkgDirectory: 'C:\vcpkg' + vcpkgGitCommitId: aa028e94d733b03852ea441b2474468f43d94c5b - name: Build Windows binaries run: ./scripts/cmake-build-win.bat @@ -237,7 +237,7 @@ jobs: QTDIR: ${{ env.Qt5_Dir }} VSDIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise' CMAKEDIR: 'C:\Program Files\CMake\bin' - VCPKGDIR: ${{ github.workspace }}/vcpkg + VCPKGDIR: 'C:\vcpkg' - name: Create zip archive and sha256 checksum run: | @@ -293,8 +293,8 @@ jobs: with: vcpkgArguments: berkeleydb:x86-windows boost:x86-windows leveldb:x86-windows openssl:x86-windows vcpkgTriplet: x86-windows - vcpkgDirectory: ${{ runner.workspace }}/vcpkg/ - vcpkgGitCommitId: 35312384e7701760ed7855961eff41a63f9cc379 + vcpkgDirectory: 'C:\vcpkg' + vcpkgGitCommitId: aa028e94d733b03852ea441b2474468f43d94c5b - name: Build Windows binaries run: ./scripts/cmake-build-win-x86.bat @@ -303,7 +303,7 @@ jobs: QTDIR_x86: ${{ env.Qt5_Dir }} VSDIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise' CMAKEDIR_x86: 'C:\Program Files\CMake\bin' - VCPKGDIR: ${{ github.workspace }}/vcpkg + VCPKGDIR: 'C:\vcpkg' - name: Create zip archive and sha256 checksum run: | diff --git a/.github/workflows/build-featurebranch.yml b/.github/workflows/build-featurebranch.yml index a00cd1b108..87577a87b3 100644 --- a/.github/workflows/build-featurebranch.yml +++ b/.github/workflows/build-featurebranch.yml @@ -90,6 +90,7 @@ jobs: - uses: actions/checkout@v2 with: persist-credentials: false + - name: Install Qt uses: jurplel/install-qt-action@v2 with: @@ -102,8 +103,8 @@ jobs: with: vcpkgArguments: berkeleydb:x64-windows boost:x64-windows leveldb:x64-windows openssl:x64-windows vcpkgTriplet: x64-windows - vcpkgDirectory: ${{ runner.workspace }}/vcpkg/ - vcpkgGitCommitId: 35312384e7701760ed7855961eff41a63f9cc379 + vcpkgDirectory: 'C:\vcpkg' + vcpkgGitCommitId: aa028e94d733b03852ea441b2474468f43d94c5b - name: Build Windows binaries run: ./scripts/cmake-build-win.bat @@ -112,7 +113,7 @@ jobs: QTDIR: ${{ env.Qt5_Dir }} VSDIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise' CMAKEDIR: 'C:\Program Files\CMake\bin' - VCPKGDIR: ${{ github.workspace }}/vcpkg + VCPKGDIR: 'C:\vcpkg' # ========================================================================== # Build Windows x86 version @@ -122,6 +123,7 @@ jobs: - uses: actions/checkout@v2 with: persist-credentials: false + - name: Install Qt uses: jurplel/install-qt-action@v2 with: @@ -135,8 +137,8 @@ jobs: with: vcpkgArguments: berkeleydb:x86-windows boost:x86-windows leveldb:x86-windows openssl:x86-windows vcpkgTriplet: x86-windows - vcpkgDirectory: ${{ runner.workspace }}/vcpkg/ - vcpkgGitCommitId: 35312384e7701760ed7855961eff41a63f9cc379 + vcpkgDirectory: 'C:\vcpkg' + vcpkgGitCommitId: aa028e94d733b03852ea441b2474468f43d94c5b - name: Build Windows binaries run: ./scripts/cmake-build-win-x86.bat @@ -145,4 +147,4 @@ jobs: QTDIR_x86: ${{ env.Qt5_Dir }} VSDIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise' CMAKEDIR_x86: 'C:\Program Files\CMake\bin' - VCPKGDIR: ${{ github.workspace }}/vcpkg + VCPKGDIR: 'C:\vcpkg' diff --git a/.github/workflows/build-master.yml b/.github/workflows/build-master.yml index c3117aa2fb..a54e3e4925 100644 --- a/.github/workflows/build-master.yml +++ b/.github/workflows/build-master.yml @@ -223,8 +223,8 @@ jobs: with: vcpkgArguments: berkeleydb:x64-windows boost:x64-windows leveldb:x64-windows openssl:x64-windows vcpkgTriplet: x64-windows - vcpkgDirectory: ${{ runner.workspace }}/vcpkg/ - vcpkgGitCommitId: 35312384e7701760ed7855961eff41a63f9cc379 + vcpkgDirectory: 'C:\vcpkg' + vcpkgGitCommitId: aa028e94d733b03852ea441b2474468f43d94c5b - name: Build Windows binaries run: ./scripts/cmake-build-win.bat @@ -233,7 +233,7 @@ jobs: QTDIR: ${{ env.Qt5_Dir }} VSDIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise' CMAKEDIR: 'C:\Program Files\CMake\bin' - VCPKGDIR: ${{ github.workspace }}/vcpkg + VCPKGDIR: 'C:\vcpkg' - name: Create zip archive and sha256 checksum run: | @@ -289,8 +289,8 @@ jobs: with: vcpkgArguments: berkeleydb:x86-windows boost:x86-windows leveldb:x86-windows openssl:x86-windows vcpkgTriplet: x86-windows - vcpkgDirectory: ${{ runner.workspace }}/vcpkg/ - vcpkgGitCommitId: 35312384e7701760ed7855961eff41a63f9cc379 + vcpkgDirectory: 'C:\vcpkg' + vcpkgGitCommitId: aa028e94d733b03852ea441b2474468f43d94c5b - name: Build Windows binaries run: ./scripts/cmake-build-win-x86.bat @@ -299,7 +299,7 @@ jobs: QTDIR_x86: ${{ env.Qt5_Dir }} VSDIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise' CMAKEDIR_x86: 'C:\Program Files\CMake\bin' - VCPKGDIR: ${{ github.workspace }}/vcpkg + VCPKGDIR: 'C:\vcpkg' - name: Create zip archive and sha256 checksum run: | From afcdeb28a94e088745dde976f84cc73d22ea59d3 Mon Sep 17 00:00:00 2001 From: HLXEasy Date: Mon, 25 Oct 2021 21:57:54 +0200 Subject: [PATCH 9/9] Replaced 'emit' with 'Q_EMIT' for build using vcpkg according to https://github.com/qbittorrent/qBittorrent/pull/15557#issuecomment-939836504 --- src/qt/rpcconsole.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp index 383f8a3d82..c3d1744d41 100644 --- a/src/qt/rpcconsole.cpp +++ b/src/qt/rpcconsole.cpp @@ -141,7 +141,7 @@ void RPCExecutor::request(const QString &command) std::vector args; if(!parseCommandLine(args, command.toStdString())) { - emit reply(RPCConsole::CMD_ERROR, QString("Parse error: unbalanced ' or \"")); + Q_EMIT reply(RPCConsole::CMD_ERROR, QString("Parse error: unbalanced ' or \"")); return; } @@ -165,21 +165,21 @@ void RPCExecutor::request(const QString &command) else strPrint = write_string(result, true); - emit reply(RPCConsole::CMD_REPLY, QString::fromStdString(strPrint)); + Q_EMIT reply(RPCConsole::CMD_REPLY, QString::fromStdString(strPrint)); } catch (const json_spirit::Object& objError) { try // Nice formatting for standard-format error { int code = find_value(objError, "code").get_int(); std::string message = find_value(objError, "message").get_str(); - emit reply(RPCConsole::CMD_ERROR, QString::fromStdString(message) + " (code " + QString::number(code) + ")"); + Q_EMIT reply(RPCConsole::CMD_ERROR, QString::fromStdString(message) + " (code " + QString::number(code) + ")"); } catch (const std::runtime_error&) // raised when converting to invalid type, i.e. missing code or message { // Show raw JSON object - emit reply(RPCConsole::CMD_ERROR, QString::fromStdString(write_string(json_spirit::Value(objError), false))); + Q_EMIT reply(RPCConsole::CMD_ERROR, QString::fromStdString(write_string(json_spirit::Value(objError), false))); }; } catch (const std::exception& e) { - emit reply(RPCConsole::CMD_ERROR, QString("Error: ") + QString::fromStdString(e.what())); + Q_EMIT reply(RPCConsole::CMD_ERROR, QString("Error: ") + QString::fromStdString(e.what())); }; } @@ -227,7 +227,7 @@ RPCConsole::RPCConsole(QWidget *parent) : RPCConsole::~RPCConsole() { //GUIUtil::saveWindowGeometry("nRPCConsoleWindow", this); - emit stopExecutor(); + Q_EMIT stopExecutor(); delete ui; } @@ -406,7 +406,7 @@ void RPCConsole::on_lineEdit_returnPressed() if(!cmd.isEmpty()) { message(CMD_REQUEST, cmd); - emit cmdRequest(cmd); + Q_EMIT cmdRequest(cmd); // Remove command, if already in history history.removeOne(cmd); // Append command to history