From a9ed47192a24986d314f71cb96cadc2cec1f225f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20De=C3=A1k?= Date: Thu, 30 Jul 2020 11:03:32 +1000 Subject: [PATCH 1/9] Update and rename update_request.md to binary_request.md --- .../ISSUE_TEMPLATE/{update_request.md => binary_request.md} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename .github/ISSUE_TEMPLATE/{update_request.md => binary_request.md} (62%) diff --git a/.github/ISSUE_TEMPLATE/update_request.md b/.github/ISSUE_TEMPLATE/binary_request.md similarity index 62% rename from .github/ISSUE_TEMPLATE/update_request.md rename to .github/ISSUE_TEMPLATE/binary_request.md index 2bb600f..f40cd60 100644 --- a/.github/ISSUE_TEMPLATE/update_request.md +++ b/.github/ISSUE_TEMPLATE/binary_request.md @@ -1,7 +1,7 @@ --- -name: Update Request +name: Binary Request about: Request an update for Synergy binaries -title: 'Update Request: [SPECIFY VERSION HERE]' +title: 'Binary Request: [SPECIFY VERSION HERE]' labels: Update assignees: '' --- From 99096d2b6ae222d0910cacff2a12c97173736b68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20De=C3=A1k?= Date: Thu, 30 Jul 2020 11:04:06 +1000 Subject: [PATCH 2/9] Update binary_request.md --- .github/ISSUE_TEMPLATE/binary_request.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/binary_request.md b/.github/ISSUE_TEMPLATE/binary_request.md index f40cd60..680a607 100644 --- a/.github/ISSUE_TEMPLATE/binary_request.md +++ b/.github/ISSUE_TEMPLATE/binary_request.md @@ -1,6 +1,6 @@ --- name: Binary Request -about: Request an update for Synergy binaries +about: Request an update for Synergy binaries. title: 'Binary Request: [SPECIFY VERSION HERE]' labels: Update assignees: '' From b9981db6ceae71758499600c75b53039d99d5b01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20De=C3=A1k?= Date: Thu, 30 Jul 2020 11:05:15 +1000 Subject: [PATCH 3/9] Update bug_report.md --- .github/ISSUE_TEMPLATE/bug_report.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 7b07cf8..a060eb7 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -1,6 +1,6 @@ --- name: Bug Report -about: Create a bug report if something is broken in the build system +about: Create a bug report if something is broken in the build system. title: '' labels: Bug assignees: '' @@ -8,7 +8,7 @@ assignees: '' Provide a descriptive summary of the issue. -**NOTE:** Do not submit bug reports for Synergy here. Only submit issues regarding build scripts relating to this repository. +**NOTE:** Do not submit bug reports for the Synergy application here. Only submit issues relating to the build scripts in this repository. ### Steps to Reproduce From 15f3f2498739a47883491760beb4205f22369bf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20De=C3=A1k?= Date: Thu, 30 Jul 2020 11:11:26 +1000 Subject: [PATCH 4/9] Update readme.md --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index db4ecae..944f502 100644 --- a/readme.md +++ b/readme.md @@ -17,7 +17,7 @@ Binaries are available for the following platforms: * Linux Mint 20 Ulyana: `.deb`, `.rpm`, `.AppImage` * Windows 7: `.msi`, portable `.zip` -See [Releases](https://github.com/DEAKSoftware/Synergy-Binaries/releases) for additional versions. If you can't locate a binary package for your particular distribution, try building the project yourself. +See [Releases](https://github.com/DEAKSoftware/Synergy-Binaries/releases) for additional versions. 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. ## Building From 6d6a4812f6c109a0232871623b7ded35ca3ff015 Mon Sep 17 00:00:00 2001 From: DominikDeak Date: Thu, 30 Jul 2020 13:44:11 +1000 Subject: [PATCH 5/9] Fix issues with mac build script. --- Scripts/Build/BuildDarwin.sh | 4 ++-- Scripts/Detail/Config.py | 5 +---- Synergy-Core | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Scripts/Build/BuildDarwin.sh b/Scripts/Build/BuildDarwin.sh index 6aab388..92fa0fe 100755 --- a/Scripts/Build/BuildDarwin.sh +++ b/Scripts/Build/BuildDarwin.sh @@ -20,9 +20,9 @@ buildApplication() { make -j || exit 1 make install/strip || exit 1 - macdeployqt "${productBuildPath}/bundle/Synergy.app" || exit 1 + "${libQtPath}/bin/macdeployqt" "${productBuildPath}/bundle/Synergy.app" || exit 1 - rsync -a --delete "${productBuildPath}/bundle/Synergy.app" "${binariesPath}/${productName}.app" || exit 1 + rsync -av --delete "${productBuildPath}/bundle/Synergy.app/" "${binariesPath}/${productName}.app/" || exit 1 popd diff --git a/Scripts/Detail/Config.py b/Scripts/Detail/Config.py index 3c838cf..40cf292 100644 --- a/Scripts/Detail/Config.py +++ b/Scripts/Detail/Config.py @@ -168,7 +168,4 @@ class Configuration(): return dict( ( name, getattr( self, name ) ) for name in dir( self ) if not callable( getattr( self, name ) ) and not name.startswith( '__' ) ) -scriptPath = utility.joinPath( utility.basePathAtSource( __file__ ), ".." ) -configPath = utility.joinPath( scriptPath, "config.txt" ) - -config = Configuration( configPath ) +config = Configuration( utility.joinPath( utility.basePathAtSource( __file__ ), "..", "config.txt" ) ) diff --git a/Synergy-Core b/Synergy-Core index 6991e90..a7e51d5 160000 --- a/Synergy-Core +++ b/Synergy-Core @@ -1 +1 @@ -Subproject commit 6991e908f55cdb1da292937e2f373abd82424ac3 +Subproject commit a7e51d5986c9895de62e2ea6d5ee5517dcb1a407 From 931179256d0bd8301310de9dabb26cf9fae9041d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20De=C3=A1k?= Date: Fri, 31 Jul 2020 03:36:54 +1000 Subject: [PATCH 6/9] Update license.md --- license.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/license.md b/license.md index 89110cd..d0d9d20 100644 --- a/license.md +++ b/license.md @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2018 DEAK Software +Copyright (c) 2020 DEAK Software Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From d2a6bc3e676577e3d916a71a1347aab2a3846cb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20De=C3=A1k?= Date: Fri, 31 Jul 2020 11:54:18 +1000 Subject: [PATCH 7/9] Update bug_report.md --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index a060eb7..1452c7f 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -26,4 +26,4 @@ Describe what actually happened after completing the steps above. ### Additional Notes -Provide additional information, such as references to related problems or workarounds. +Provide additional information, such as references to related problems or workarounds, or logs text formatted inside a pair of \`\`\` tags. From d39dd94ae03998e8ee611f917a4f72bfb1c9adcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20De=C3=A1k?= Date: Fri, 31 Jul 2020 11:54:44 +1000 Subject: [PATCH 8/9] Update bug_report.md --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 1452c7f..0746f04 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -26,4 +26,4 @@ Describe what actually happened after completing the steps above. ### Additional Notes -Provide additional information, such as references to related problems or workarounds, or logs text formatted inside a pair of \`\`\` tags. +Provide additional information, such as references to related problems or workarounds, or log text formatted inside a pair of \`\`\` tags. From 793f8948bb25b0df740d666fd897e52abfb1beac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20De=C3=A1k?= Date: Fri, 31 Jul 2020 11:58:51 +1000 Subject: [PATCH 9/9] Update bug_report.md --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 0746f04..fc86891 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -26,4 +26,4 @@ Describe what actually happened after completing the steps above. ### Additional Notes -Provide additional information, such as references to related problems or workarounds, or log text formatted inside a pair of \`\`\` tags. +Provide additional information, such as references to related problems, workarounds, or log text formatted inside a [code quoting block](https://docs.github.com/en/github/writing-on-github/basic-writing-and-formatting-syntax#quoting-code).