Fix openssl dependency on windows.

DEAKSoftware · Sep 20, 2021 · 235dee1 · 235dee1
2 parents 476f16f + a7638c5
commit 235dee1
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 23 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -10,6 +10,12 @@ Provide a descriptive summary of the issue.
 
 **NOTE:** Do not submit bug reports for the Synergy application here. Only submit issues relating to the build scripts in this repository.
 
+### System Information
+
+* Operating System: _[Example: macOS Big Sur 11.5 (20G71)]_  
+* Build Environment: _[Example: Xcode 13.0 beta 3 (13A5192i)]_  
+* Synergy Version: _[Example: Synergy 1.14.0.4-stable]_  
+
 ### Steps to Reproduce
 
 1. Describe any preparation work or required setup, if appropriate;

diff --git a/Documentation/BuildingOnDarwin.md b/Documentation/BuildingOnDarwin.md
@@ -7,14 +7,9 @@
       * [Homebrew](http://brew.sh/)
       * [Python 3](https://www.python.org/downloads/windows/)
       * [XCode](https://developer.apple.com/xcode/download/)
-      * [Qt 5](https://www.qt.io/download/), select the following components:
-         * Qt 5.12.9 / macOS
+      * [Qt5](https://download.qt.io/official_releases/qt/)
 
-2. Edit the [`Scripts/config.txt`](../Scripts/config.txt) file and make sure the following variables are configured properly under the `[Darwin]` section:
-
-      * `libQtPath` -- Full path to the Qt library, clang, 64-bit build.
-
-3. Run the installer script to configure additional dependencies, as noted below. If you wish to examine what packages will be installed, see package lists [`PackageListBrew.txt`](../Scripts/Install/PackageListBrew.txt) and [`PackageListPython.txt`](../Scripts/Install/PackageListPython.txt).
+2. Run the installer script to configure additional dependencies, as noted below. If you wish to examine what packages will be installed, see package lists [`PackageListBrew.txt`](../Scripts/Install/PackageListBrew.txt) and [`PackageListPython.txt`](../Scripts/Install/PackageListPython.txt).
 
       * If Python is already installed:
          ```sh
@@ -27,6 +22,11 @@
 
       Use the `--upgrade` switch to refresh packages at a later date.
 
+3. Edit the [`Scripts/config.txt`](../Scripts/config.txt) file and make sure the following variables are configured properly under the `[Darwin]` section:
+
+      * `libQtPath` -- Full path to the Qt library (query with `brew --prefix qt5`).
+      * `openSSLPath` -- Full path to the OpenSSL library (query with `brew --prefix openssl`).
+
 ### Building
 
 Build the project with the following Python script. Packages will be copied into the [`Binaries`](../Binaries) directory.
@@ -46,3 +46,18 @@ Similarly, one can clean the project, which resets Git repositories to a clean s
 ```sh
 ./Scripts/clean.py
 ```
+<!--
+### Issues
+
+If you are building on Apple M1 and having trouble linking `arm64` binaries with the Qt5 library, try the following. Install Qt build dependencies:
+
+```sh
+brew install pcre2 harfbuzz freetype
+```
+
+Reinstall Qt5 and build from source:
+
+```sh
+brew reinstall -s qt5
+```
+-->
diff --git a/Documentation/BuildingOnWindows.md b/Documentation/BuildingOnWindows.md
@@ -12,16 +12,9 @@
       * [WiX Toolset](https://wixtoolset.org/releases/), install the following components:
          * WiX Toolset Build Tools
          * WiX Toolset Visual Studio 2019 Extension
-      * [Qt 5](https://www.qt.io/download/), select the following components:
-         * Qt 5.12.9 / MSVC 2017 64-bit
+      * [Qt5](https://download.qt.io/official_releases/qt/)
 
-2. Edit the [`Scripts\config.txt`](../Scripts/config.txt) file and make sure the following variables are configured properly under the `[Windows]` section:
-
-      * `libQtPath` -- Full path to the Qt library, Visual C++, 64-bit build.
-      * `vcvarsallPath` -- Full path to Visual Studio's `vcvarsall.bat` command script. This sets the necessary compiler environment variables for building. See [Microsoft C++ toolset documentation](https://docs.microsoft.com/en-us/cpp/build/building-on-the-command-line?view=vs-2019) for details.
-      * `cmakeGenerator` -- Specifies the generator setting for cmake. Run `cmake --help` to choose a suitable generator that best matches the Visual Studio version installed earlier.
-
-3. Run the installer script to configure additional dependencies, as noted below. If you wish to examine what packages will be installed, see package lists [`PackageListChoco.config`](../Scripts/Install/PackageListChoco.config) and [`PackageListPython.txt`](../Scripts/Install/PackageListPython.txt).
+2. Run the installer script to configure additional dependencies, as noted below. If you wish to examine what packages will be installed, see package lists [`PackageListChoco.config`](../Scripts/Install/PackageListChoco.config) and [`PackageListPython.txt`](../Scripts/Install/PackageListPython.txt).
 
       * If Python is already installed:
          ```bat
@@ -34,6 +27,12 @@
 
       Use the `--upgrade` switch (Python), or the `-upgrade` switch (PowerShell) to refresh packages at a later date.
 
+3. Edit the [`Scripts\config.txt`](../Scripts/config.txt) file and make sure the following variables are configured properly under the `[Windows]` section:
+
+      * `libQtPath` -- Full path to the Qt library, Visual C++, 64-bit build.
+      * `vcvarsallPath` -- Full path to Visual Studio's `vcvarsall.bat` command script. This sets the necessary compiler environment variables for building. See [Microsoft C++ toolset documentation](https://docs.microsoft.com/en-us/cpp/build/building-on-the-command-line?view=vs-2019) for details.
+      * `cmakeGenerator` -- Specifies the generator setting for cmake. Run `cmake --help` to choose a suitable generator that best matches the Visual Studio version installed earlier.
+
 ### Building
 
 Build the project with the following Python script. Packages will be copied into the [`Binaries`](../Binaries) directory.

diff --git a/Scripts/Install/PackageListBrew.txt b/Scripts/Install/PackageListBrew.txt
@@ -3,3 +3,4 @@ git
 libsodium
 openssl
 python
+qt5
diff --git a/Scripts/build.py b/Scripts/build.py
@@ -17,6 +17,7 @@ def configureSubmodules():
    print( statusBefore )
 
    utility.runCommand( "git submodule update --init --remote --recursive" )
+   utility.runCommand( "git submodule foreach --recursive 'git fetch --tags'" )
 
    if config.productCheckout:
       os.chdir( config.productRepoPath )

diff --git a/Scripts/config.txt b/Scripts/config.txt
@@ -19,8 +19,8 @@
 
 [Darwin]
 
-   libQtPath   = ~/Qt5.12.9/5.12.9/clang_64
-   openSSLPath = /usr/local/opt/openssl
+   libQtPath   = /usr/local/opt/qt@5
+   openSSLPath = /usr/local/opt/openssl@1.1
 
 [Linux]
 

diff --git a/readme.md b/readme.md
@@ -6,13 +6,10 @@
 
 ## Download
 
-* [Synergy 1.13.1.41-stable](https://github.com/DEAKSoftware/Synergy-Binaries/releases/tag/1.13.1.41-stable)
-* [Synergy 1.12.0-stable](https://github.com/DEAKSoftware/Synergy-Binaries/releases/tag/1.12.0-stable)
-
 Binaries are available for the following platforms:
 
-* macOS 10.12 Sierra: `.dmg`
-* Linux Mint 20 Ulyana: `.deb`, `.rpm`, `.AppImage`
+* macOS 11.4 Big Sur: `.dmg`
+* Linux Mint 20 Ulyana: `.deb`, `.rpm`, portable `.AppImage`
 * Windows 10: `.msi`, portable `.zip`
 
 See [Releases](https://github.com/DEAKSoftware/Synergy-Binaries/releases) for additional versions, such as release candidates, patches, etc. If a particular version is missing, [create a new issue](https://github.com/DEAKSoftware/Synergy-Binaries/issues/new/choose) to request new binaries. If you can't locate a binary package for your particular distribution, you might want to try building the project yourself.