Merge branch 'master' of https://github.com/DEAKSoftware/Synergy-Binaries

Documentation/BuildingOnDarwin.md

@@ -18,7 +18,7 @@
 
       * If Python is already installed:
          ```sh
-         python.exe ./Scripts/install.py [--upgrade]
+         ./Scripts/install.py [--upgrade]
          ```
       * If Python is not installed:
          ```sh

Documentation/BuildingOnLinux.md

@@ -11,7 +11,7 @@
 
       * If Python is already installed:
          ```sh
-         python.exe ./Scripts/install.py [--upgrade]
+         ./Scripts/install.py [--upgrade]
          ```
       * If Python is not installed:
          ```sh
@@ -36,7 +36,7 @@ Similarly, one can clean the project, which resets Git repositories to a clean s
 
 ### Launching Automatically
 
-In Linux Mint we can launch `synergy` client automatically via _System Settings → Startup Applications_, then add an entry with the command:
+In Linux Mint we can launch the Synergy client automatically via _System Settings → Startup Applications_, then add an entry with the command:
 
 ```sh
 /usr/bin/synergyc --name ClientName --daemon #.#.#.#

Documentation/BuildingOnWindows.md

@@ -18,7 +18,7 @@
 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. which sets compiler environment variables. See [Microsoft C++ toolset documentation](https://docs.microsoft.com/en-us/cpp/build/building-on-the-command-line?view=vs-2019) for details.
+      * `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).
@@ -32,7 +32,7 @@
          powershell.exe -File Scripts\Install\InstallWindows.ps1 [-upgrade]
          ```
 
-      Use the `--upgrade` switch (or `-upgrade` switch for PowerShell) to refresh packages at a later date.
+      Use the `--upgrade` switch (Python), or the `-upgrade` switch (PowerShell) to refresh packages at a later date.
 
 ### Building
 

Scripts/Build/BuildDarwin.sh

@@ -32,7 +32,7 @@ buildDMG() {
 
    ln -s /Applications "${productBuildPath}/bundle/Applications"
 
-   hdiutil create -volname "${productName} ${productVersion}" -srcfolder "${productBuildPath}/bundle" -ov -format UDZO "${binariesPath}/${productPackageName}.dmg" || exit 1
+   hdiutil create -volname "${productName} ${productVersion}-${productStage}" -srcfolder "${productBuildPath}/bundle" -ov -format UDZO "${binariesPath}/${productPackageName}.dmg" || exit 1
 
 }
 

Scripts/Detail/Config.py

@@ -46,7 +46,7 @@ class Configuration():
 
          section = platform.system()
 
-         for name in self.variableList():
+         for name in self.propertyList():
             value = parser.get( section, name, fallback = getattr( self, name ) )
             setattr( self, name, value )
 
@@ -162,7 +162,9 @@ class Configuration():
       utility.printItem( "productRevision: ", self.productRevision )
       utility.printItem( "productPackageName: ", self.productPackageName )
 
-   def variableList( self ):
+   # Property list
+
+   def propertyList( self ):
 
       return dict( ( name, getattr( self, name ) ) for name in dir( self ) if not callable( getattr( self, name ) ) and not name.startswith( '__' ) )
 

Scripts/Install/InstallWindows.ps1

@@ -24,8 +24,11 @@ $upgradeBlock =
    {
    param( [ string ] $installToolsPath )
 
+   [System.Xml.XmlDocument]$packageListChocoXML = new-object System.Xml.XmlDocument
    $packageListChocoPath = Join-Path -Path $installToolsPath -ChildPath "PackageListChoco.config"
-   choco upgrade all
+   $packageListChocoXML.load( $packageListChocoPath )
+   $packages = ( $packageListChocoXML.SelectNodes( '/packages/package' ) | ForEach-Object { $PSItem.id } )
+   choco upgrade $packages
    refreshenv
 
    $packageListPythonPath = Join-Path -Path $installToolsPath -ChildPath "PackageListPython.txt"

Scripts/build.py

@@ -31,7 +31,7 @@ def configureEnvironment():
 
    utility.printHeading( "Configuring environment..." )
 
-   for name, value in config.variableList().items():
+   for name, value in config.propertyList().items():
 
       if value:
          print( "\tSetting: ${" + utility.style.bold + name + utility.style.none + "}" )