Add the batch of release v3.4.3 commits

bcndev · May 27, 2019 · 871f4e1 · 871f4e1
1 parent 8380c02
commit 871f4e1
Show file tree

Hide file tree

Showing 16 changed files with 145 additions and 171 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # bytecoin-gui
 
-[![Build Status](https://dev.azure.com/bcndev/bytecoin/_apis/build/status/bytecoin-desktop?branchName=releases/3.4.2)](https://dev.azure.com/bcndev/bytecoin/_build/latest?definitionId=2&branchName=releases/3.4.2)
+[![Build Status](https://dev.azure.com/bcndev/bytecoin/_apis/build/status/bytecoin-desktop?branchName=releases/3.4.3)](https://dev.azure.com/bcndev/bytecoin/_build/latest?definitionId=2&branchName=releases/3.4.3)
 
 ## How to build binaries from source code
 

diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -1,5 +1,16 @@
 ## Release Notes
 
+### v3.4.3 (Amethyst)
+
+- Fixed a falsy update notification.
+- Fixed parsing `walletd` parameters.
+- Remove `libusb` dependency.
+- Updated the Bytecoin daemons.
+
+### v3.4.2 (Amethyst)
+
+- Updated the Bytecoin daemons.
+
 ### v3.4.2-beta-20190412
 
 - Updated the Bytecoin daemons.
@@ -9,7 +20,7 @@
 - Fixed a bug in a dialog box.
 - Updated the Bytecoin daemons.
 
-### v3.4.1
+### v3.4.1 (Amethyst)
 
 - Fixed creating Amethyst wallets.
 - Added support of the new format of sendproofs.
@@ -18,7 +29,7 @@
 - Made minor improvements and bug fixes. 
 - Updated the Bytecoin daemons.
 
-### v3.4.0
+### v3.4.0 (Amethyst)
 
 - Updated the Bytecoin daemons.
 

diff --git a/Windows Installer/Installer.wxs b/Windows Installer/Installer.wxs
@@ -232,9 +232,6 @@ Build example:
             <Component Id='LibGLESV2DllComp' Guid='*'>
                 <File Id='LibGLESV2Dll' Source='..\bin\libGLESV2.dll' KeyPath='yes' />
             </Component>
-            <Component Id='LibUsbDllComp' Guid='*'>
-                <File Id='LibUsbDll' Source='..\bin\libusb-1.0.dll' KeyPath='yes' />
-            </Component>
             <Component Id='Opengl32swDllComp' Guid='*'>
                 <File Id='Opengl32swDll' Source='..\bin\opengl32sw.dll' KeyPath='yes' />
             </Component>
@@ -279,4 +276,4 @@ Build example:
         </DirectoryRef>
     </Fragment>
 
-</Wix>
+</Wix>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -27,8 +27,7 @@ variables:
 
 jobs:
 
-####################### Linux #######################
-- job: Linux
+- job: WaitForDaemonsBuild
   pool:
     vmImage: ubuntu-16.04
   steps:
@@ -41,13 +40,44 @@ jobs:
     displayName: Echo predefined vars
 
   - script: |
-      mkdir bytecoin && cd bytecoin
-      git init
+      set -o xtrace
       desktopRepo="$(desktopRepo)"
-      git remote add origin https://user:$(GithubPAT)@github.com/${desktopRepo%-*}
-      git fetch --depth 1 origin $(Build.SourceBranch)
-      git checkout FETCH_HEAD
-    displayName: Clone daemons code
+      daemonsRepo=${desktopRepo%-*}
+      contains () { [[ "$1" =~ (^|[[:space:]])"$2" ]]; }
+      while [ : ]
+      do
+        branches=`curl -H "Authorization: token $(GithubPAT)" https://api.github.com/repos/$daemonsRepo/branches | jq -r '.[] | .name' | tr '\n' ' '`
+        echo branches=$branches
+        contains "$branches" releases ; result=$?
+        [[ $result -eq 0 ]] && sleep 30s || break
+      done
+    displayName: Sleep while daemons repo has 'releases/*' branch
+
+####################### Linux #######################
+- job: Linux
+  pool:
+    vmImage: ubuntu-16.04
+  dependsOn: WaitForDaemonsBuild
+  steps:
+  - checkout: none
+
+  - task: DownloadBuildArtifacts@0
+    displayName: Download daemons build artifacts
+    inputs:
+      buildType: specific
+      project: bytecoin
+      pipeline: bytecoin-daemons
+      buildVersionToDownload: 'latest'
+      downloadType: single
+      artifactName: linux64
+      downloadPath: '$(Build.ArtifactStagingDirectory)'
+
+  - script: |
+      unzip $(Build.ArtifactStagingDirectory)/linux64/\*.zip
+      mkdir bytecoin/bin
+      mv -v *d bytecoin/bin/
+      ./bytecoin/bin/bytecoind --version
+    displayName: Unzip daemons build artifact
 
   - script: |
       mkdir bytecoin-gui && cd bytecoin-gui
@@ -57,36 +87,10 @@ jobs:
       git checkout FETCH_HEAD
     displayName: Clone desktop code
 
-  - script: |
-      sudo apt-get install -y libusb-1.0-0-dev
-    displayName: Install libusb-1.0
-
   - script: |
       sudo apt-get install -y qt5-qmake qtbase5-dev qtbase5-dev-tools qt5-default
     displayName: Install qt
 
-  - script: |
-      wget -c 'https://dl.bintray.com/boostorg/release/1.69.0/source/boost_1_69_0.tar.gz'
-      mkdir boost && tar -xzf ./boost_1_69_0.tar.gz --directory boost --strip-components=1
-    displayName: Fetch boost
-
-  - script: |
-      git clone --single-branch --depth 1 https://github.com/bcndev/lmdb.git
-    displayName: Clone LMDB
-
-  - script: |
-      git clone --single-branch --branch OpenSSL_1_1_1b --depth 1 https://github.com/openssl/openssl.git
-    displayName: Clone OpenSSL
-
-  - script: |
-      cd openssl && ./Configure linux-x86_64 no-shared && make -j$(nproc)
-    displayName: Build OpenSSL
-
-  - script: |
-      mkdir bytecoin/build && cd bytecoin/build
-      cmake -DWITH_LEDGER=1 .. && make -j$(nproc)
-    displayName: Build daemons
-
   - script: |
       mkdir bytecoin-gui/build && cd bytecoin-gui/build
       qmake ../src/bytecoin-gui.pro && make -j$(nproc)
@@ -111,6 +115,7 @@ jobs:
 - job: Mac
   pool:
     vmImage: macOS-10.13
+  dependsOn: WaitForDaemonsBuild
   variables:
     MACOSX_DEPLOYMENT_TARGET: 10.11
   condition: |
@@ -123,14 +128,23 @@ jobs:
   steps:
   - checkout: none
 
+  - task: DownloadBuildArtifacts@0
+    displayName: Download daemons build artifacts
+    inputs:
+      buildType: specific
+      project: bytecoin
+      pipeline: bytecoin-daemons
+      buildVersionToDownload: 'latest'
+      downloadType: single
+      artifactName: macos
+      downloadPath: '$(Build.ArtifactStagingDirectory)'
+
   - script: |
-      mkdir bytecoin && cd bytecoin
-      git init
-      desktopRepo="$(desktopRepo)"
-      git remote add origin https://user:$(GithubPAT)@github.com/${desktopRepo%-*}
-      git fetch --depth 1 origin $(Build.SourceBranch)
-      git checkout FETCH_HEAD
-    displayName: Clone daemons code
+      unzip $(Build.ArtifactStagingDirectory)/macos/\*.zip
+      mkdir bytecoin/bin
+      mv -v *d bytecoin/bin/
+      ./bytecoin/bin/bytecoind --version
+    displayName: Unzip daemons build artifact
 
   - script: |
       mkdir bytecoin-gui && cd bytecoin-gui
@@ -140,39 +154,10 @@ jobs:
       git checkout FETCH_HEAD
     displayName: Clone desktop code
 
-  - script: |
-      brew install boost
-    displayName: Install boost from Homebrew
-
   - script: |
       brew install qt
     displayName: Install qt
 
-  - script: |
-      curl -L -O https://github.com/libusb/libusb/releases/download/v1.0.22/libusb-1.0.22.tar.bz2
-      mkdir libusb && tar -xvf libusb-1.0.22.tar.bz2 --directory libusb --strip-components=1
-      cd libusb
-      ./configure --prefix=`pwd`
-      make install
-    displayName: Build libusb
-
-  - script: |
-      git clone --single-branch --depth 1 https://github.com/bcndev/lmdb.git
-    displayName: Clone LMDB
-
-  - script: |
-      git clone --single-branch --branch OpenSSL_1_1_1b --depth 1 https://github.com/openssl/openssl.git
-    displayName: Clone OpenSSL
-
-  - script: |
-      cd openssl && ./Configure darwin64-x86_64-cc no-shared && make -j
-    displayName: Build OpenSSL
-
-  - script: |
-      mkdir bytecoin/build && cd bytecoin/build
-      cmake -DWITH_LEDGER=1 .. && make -j
-    displayName: Build daemons
-
   - script: |
       mkdir bytecoin-gui/build && cd bytecoin-gui/build
       /usr/local/opt/qt/bin/qmake ../src/bytecoin-gui.pro && make -j
@@ -198,6 +183,7 @@ jobs:
 - job: Windows
   pool:
     vmImage: vs2017-win2016
+  dependsOn: WaitForDaemonsBuild
   condition: |
     and(
       succeeded(),
@@ -236,10 +222,26 @@ jobs:
   steps:
   - checkout: none
 
+  - task: DownloadBuildArtifacts@0
+    displayName: Download daemons build artifacts
+    inputs:
+      buildType: specific
+      project: bytecoin
+      pipeline: bytecoin-daemons
+      buildVersionToDownload: 'latest'
+      downloadType: single
+      artifactName: win$(arch)
+      downloadPath: '$(Build.ArtifactStagingDirectory)'
+
   - bash: |
-      curl -O http://strawberryperl.com/download/5.28.1.1/strawberry-perl-5.28.1.1-64bit-portable.zip
-      7z x strawberry-perl-5.28.1.1-64bit-portable.zip -ostrawberry-perl
-    displayName: Install ActivePerl (required to build OpenSSL)
+      set -o xtrace
+      7z x "$(Build.ArtifactStagingDirectory)"/win$(arch)/\*.zip
+      mkdir bytecoin/bin
+      mv -v *d.exe bytecoin/bin
+      mv -v *d.pdb bytecoin/bin
+      mv -v *.dll bytecoin/bin/
+      ./bytecoin/bin/bytecoind --version
+    displayName: Unzip daemons build artifact
 
   - bash: |
       curl -L -O $(qtRepoUrlPrefix)$(arch)_$(qtMSVC)$(qtBinArch)/$(qtFullVer)qtbase-$(qtBuildName)$(qtBinArch).7z
@@ -265,15 +267,6 @@ jobs:
       7z x jom.zip -ojom
     displayName: Install Jom
 
-  - bash: |
-      mkdir bytecoin && cd bytecoin
-      git init
-      desktopRepo="$(desktopRepo)"
-      git remote add origin https://user:$(GithubPAT)@github.com/${desktopRepo%-*}
-      git fetch --depth 1 origin $(Build.SourceBranch)
-      git checkout FETCH_HEAD
-    displayName: Clone daemons code
-
   - bash: |
       mkdir bytecoin-gui && cd bytecoin-gui
       git init
@@ -282,59 +275,6 @@ jobs:
       git checkout FETCH_HEAD
     displayName: Clone desktop code
 
-  - bash: |
-      curl -L -O https://dl.bintray.com/boostorg/release/1.69.0/source/boost_1_69_0.zip
-      7z x boost_1_69_0.zip
-      mv boost_1_69_0 boost
-    displayName: Fetch boost
-
-  - bash: |
-      curl -L -O https://github.com/libusb/libusb/releases/download/v1.0.22/libusb-1.0.22.7z
-      7z x libusb-1.0.22.7z -olibusb
-    displayName: Fetch libusb
-
-  - bash: |
-      git clone --single-branch --depth 1 https://github.com/bcndev/lmdb.git
-    displayName: Clone LMDB
-
-  - bash: |
-      git clone --single-branch --branch OpenSSL_1_1_1b --depth 1 https://github.com/openssl/openssl.git $(opensslDir)
-    displayName: Clone OpenSSL
-
-  - bash: |
-      sed -i 's/  lib_cflags       => add("\/Zi \/Fdossl_static.pdb"),/# lib_cflags       => add("\/Zi \/Fdossl_static.pdb"),/g' $(opensslDir)/Configurations/10-main.conf
-      sed -i 's/  dso_cflags       => "\/Zi \/Fddso.pdb",/# dso_cflags       => "\/Zi \/Fddso.pdb",/g' $(opensslDir)/Configurations/10-main.conf
-      sed -i 's/  bin_cflags       => "\/Zi \/Fdapp.pdb",/# bin_cflags       => "\/Zi \/Fdapp.pdb",/g' $(opensslDir)/Configurations/10-main.conf
-    displayName: Patch OpenSSL config files to build OpenSSL using many threads
-    # we have to do it because of:
-    #   fatal error C1041: cannot open program database openssl\ossl_static.pdb;
-    #   if multiple CL.EXE write to the same .PDB file, please use /FS
-    # But we do not need the debug files and there is no option to disable them.
-
-  - bash: |
-      cd $(opensslDir)
-      ../strawberry-perl/perl/bin/perl.exe Configure $(opensslConfig) no-shared no-asm no-stdio no-tests
-       echo "call \"$VCINSTALLDIR\Auxiliary\Build\vcvars$(arch).bat\"" > compile.bat
-       echo "..\jom\jom -j %NUMBER_OF_PROCESSORS%" >> compile.bat
-      ./compile.bat
-    displayName: Build OpenSSL
-
-  - bash: |
-      mkdir bytecoin/build && cd bytecoin/build
-      "$(vsCMakeDir)"/cmake.exe -DWITH_LEDGER=1 -G "$(generatorName)" --config RelWithDebInfo ..
-      CL=/MP
-      "$(vsMSBuildDir)"/msbuild.exe ALL_BUILD.vcxproj -maxcpucount -p:Configuration=RelWithDebInfo
-    displayName: Build daemons
-
-  - bash: |
-      mv -v bytecoin/bin/RelWithDebInfo/* bytecoin/bin
-      mv -v bytecoin/libs/RelWithDebInfo/* bytecoin/libs
-    displayName: Move daemons from RelWithDebInfo to bin/ or libs/
-
-  - bash: |
-      cp -v libusb/MS$(arch)/dll/libusb-1.0.dll bytecoin/bin
-    displayName: Copy libusb to bytecoin/bin
-
   - bash: |
       mkdir bytecoin-gui/build && cd bytecoin-gui/build
       echo "call \"$VCINSTALLDIR\Auxiliary\Build\vcvars$(arch).bat\"" > compile.bat
@@ -385,10 +325,8 @@ jobs:
   condition: |
     and(
       succeeded(),
-      or(
-        startsWith(variables['build.sourceBranch'], 'refs/heads/releases/'),
-        startsWith(variables['build.sourceBranch'], 'refs/tags/')
-    ))
+      startsWith(variables['build.sourceBranch'], 'refs/heads/releases/')
+    )
   steps:
   - checkout: none
 
@@ -446,3 +384,6 @@ jobs:
         https://uploads.github.com/repos/$(desktopRepo)/releases/$release_id/assets?name="bytecoin-desktop-$(Build.SourceBranchName)-win32-portable.zip"
     displayName: Create github release in desktop repo
 
+  - script: |
+      curl -H "Authorization: token $(GithubPAT)" -X DELETE https://api.github.com/repos/$(daemonsRepo)/git/$(Build.SourceBranch)
+    displayName: Remove branch created for the build
diff --git a/src/application.cpp b/src/application.cpp
@@ -49,7 +49,7 @@ WalletApplication::WalletApplication(int& argc, char** argv)
     , crashDialog_(new CrashDialog())
     , m_isAboutToQuit(false)
 {
-    setApplicationName("bytecoin"); // do not change becasuse it also changes data directory under Mac and Win
+    setApplicationName("bytecoin"); // do not change because it also changes data directory under Mac and Win
     setApplicationDisplayName(tr("Bytecoin Wallet") + ' ' + Settings::getFullVersion());
     setApplicationVersion(VERSION);
     setQuitOnLastWindowClosed(false);
@@ -609,7 +609,7 @@ void WalletApplication::updateReceived()
     const QString newVersionStr = downloader_->downloadedData();
     if (newVersionStr.length() > 15)
         return;
-    const QString currentVersionStr = Settings::getFullVersion();
+    const QString currentVersionStr = Settings::getVersion();
 
     if (compareVersion(newVersionStr, currentVersionStr) > 0)
         emit updateIsReadySignal(newVersionStr);