From 207a93c75115ecba46662b1aaf718de2c261f5e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20De=C3=A1k?= Date: Mon, 27 Jul 2020 13:28:09 +1000 Subject: [PATCH 1/6] Update BuildingOnWindows.md --- Documentation/BuildingOnWindows.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/BuildingOnWindows.md b/Documentation/BuildingOnWindows.md index 9a43174..af7deec 100644 --- a/Documentation/BuildingOnWindows.md +++ b/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). From 60350ab17bf1b79f84a2bc3fcd9c407f416d9dc7 Mon Sep 17 00:00:00 2001 From: DominikDeak Date: Mon, 27 Jul 2020 13:34:36 +1000 Subject: [PATCH 2/6] Doc edits. --- Scripts/Build/BuildDarwin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Scripts/Build/BuildDarwin.sh b/Scripts/Build/BuildDarwin.sh index 8d69c27..6aab388 100755 --- a/Scripts/Build/BuildDarwin.sh +++ b/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 } From 274f67199b106ac18aaca9dcd577803f95e1cdfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20De=C3=A1k?= Date: Tue, 28 Jul 2020 10:37:32 +1000 Subject: [PATCH 3/6] Work on scripts. --- Scripts/Install/InstallWindows.ps1 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Scripts/Install/InstallWindows.ps1 b/Scripts/Install/InstallWindows.ps1 index 4d9f0d5..69b0a96 100644 --- a/Scripts/Install/InstallWindows.ps1 +++ b/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" From a955b2aafdc1a02f872d2a675d837ab9dc7eb57f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20De=C3=A1k?= Date: Tue, 28 Jul 2020 12:23:59 +1000 Subject: [PATCH 4/6] Doc edits. --- Documentation/BuildingOnDarwin.md | 2 +- Documentation/BuildingOnLinux.md | 2 +- Documentation/BuildingOnWindows.md | 2 +- Scripts/Detail/Config.py | 6 ++++-- Scripts/build.py | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Documentation/BuildingOnDarwin.md b/Documentation/BuildingOnDarwin.md index 5bd78e0..ac00899 100644 --- a/Documentation/BuildingOnDarwin.md +++ b/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 diff --git a/Documentation/BuildingOnLinux.md b/Documentation/BuildingOnLinux.md index 708f8d3..ee6618b 100644 --- a/Documentation/BuildingOnLinux.md +++ b/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 diff --git a/Documentation/BuildingOnWindows.md b/Documentation/BuildingOnWindows.md index af7deec..b101eac 100644 --- a/Documentation/BuildingOnWindows.md +++ b/Documentation/BuildingOnWindows.md @@ -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), the or `-upgrade` switch (PowerShell) to refresh packages at a later date. ### Building diff --git a/Scripts/Detail/Config.py b/Scripts/Detail/Config.py index 7ac26c9..3c838cf 100644 --- a/Scripts/Detail/Config.py +++ b/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( '__' ) ) diff --git a/Scripts/build.py b/Scripts/build.py index 512882e..90df47f 100755 --- a/Scripts/build.py +++ b/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 + "}" ) From bd739b74a1f4fe212a7667f45548602dcf11f962 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20De=C3=A1k?= Date: Tue, 28 Jul 2020 12:26:05 +1000 Subject: [PATCH 5/6] Update BuildingOnWindows.md --- Documentation/BuildingOnWindows.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/BuildingOnWindows.md b/Documentation/BuildingOnWindows.md index b101eac..22acf66 100644 --- a/Documentation/BuildingOnWindows.md +++ b/Documentation/BuildingOnWindows.md @@ -32,7 +32,7 @@ powershell.exe -File Scripts\Install\InstallWindows.ps1 [-upgrade] ``` - Use the `--upgrade` switch (Python), the or `-upgrade` switch (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 From 335d67a52657b8ca7f3fcac196bb0d088ee194ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20De=C3=A1k?= Date: Tue, 28 Jul 2020 12:31:35 +1000 Subject: [PATCH 6/6] Update BuildingOnLinux.md --- Documentation/BuildingOnLinux.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/BuildingOnLinux.md b/Documentation/BuildingOnLinux.md index ee6618b..1963ed8 100644 --- a/Documentation/BuildingOnLinux.md +++ b/Documentation/BuildingOnLinux.md @@ -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 #.#.#.#