Specify MSI GUID and fixed env vars

symless · Sep 26, 2024 · d0ac277 · d0ac277
1 parent 1fe072f
commit d0ac277
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,9 +20,10 @@ on:
 
 env:
   GIT_SHA: ${{ github.sha }}
-  PACKAGE_PREFIX: "synergy"
   PACKAGE_BUILD: ${{ !github.event.pull_request.draft }}
   PACKAGE_UPLOAD: ${{ !github.event.pull_request.draft }}
+  SYNERGY_PRODUCT_NAME: ${{ vars.SYNERGY_PRODUCT_NAME }}
+  SYNERGY_PACKAGE_PREFIX: ${{ vars.SYNERGY_PACKAGE_PREFIX }}
 
 jobs:
   # Quality gate to allow PR merge, used in the branch protection rules.
@@ -118,7 +119,7 @@ jobs:
         uses: ./deskflow/.github/actions/dist-upload
         with:
           use-github: true
-          github-target-filename: "${{ env.PACKAGE_PREFIX }}-${{ matrix.target.name }}"
+          github-target-filename: "${{ env.SYNERGY_PACKAGE_PREFIX }}-${{ matrix.target.name }}"
           package-version: ${{ env.DESKFLOW_VERSION }}
 
   macos:
@@ -197,7 +198,7 @@ jobs:
         uses: ./deskflow/.github/actions/dist-upload
         with:
           use-github: true
-          github-target-filename: "${{ env.PACKAGE_PREFIX }}-${{ matrix.target.name }}"
+          github-target-filename: "${{ env.SYNERGY_PACKAGE_PREFIX }}-${{ matrix.target.name }}"
           package-version: ${{ env.DESKFLOW_VERSION }}
 
   linux-matrix:
@@ -274,5 +275,5 @@ jobs:
         uses: ./deskflow/.github/actions/dist-upload
         with:
           use-github: true
-          github-target-filename: "${{ env.PACKAGE_PREFIX }}-${{ matrix.distro.name }}"
+          github-target-filename: "${{ env.SYNERGY_PACKAGE_PREFIX }}-${{ matrix.distro.name }}"
           package-version: ${{ env.DESKFLOW_VERSION }}
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,8 +18,8 @@ cmake_minimum_required(VERSION 3.8)
 
 project(synergy C CXX)
 
-include(cmake/Branding.cmake)
+include(cmake/Deskflow.cmake)
 
-configure_branding()
+configure_deskflow()
 
 add_subdirectory(deskflow)
diff --git a/cmake/Branding.cmake → cmake/Deskflow.cmake b/cmake/Branding.cmake → cmake/Deskflow.cmake
@@ -14,10 +14,17 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-macro(configure_branding)
+macro(configure_deskflow)
 
-  if(NOT "$ENV{DESKFLOW_PRODUCT_NAME}" STREQUAL "")
-    set(DESKFLOW_PRODUCT_NAME $ENV{DESKFLOW_PRODUCT_NAME})
+  configure_meta()
+  configure_dist()
+  configure_bin_names()
+endmacro()
+
+macro(configure_meta)
+
+  if(NOT "$ENV{SYNERGY_PRODUCT_NAME}" STREQUAL "")
+    set(DESKFLOW_PRODUCT_NAME $ENV{SYNERGY_PRODUCT_NAME})
   endif()
 
   set(DESKFLOW_APP_ID
@@ -56,10 +63,22 @@ macro(configure_branding)
       "SYN1"
       CACHE STRING "Mac bundle code (4 characters)")
 
-  configure_bin_names()
+endmacro()
+
+macro(configure_dist)
+
+    set(DESKFLOW_MSI_64_GUID
+    "E8A4FA54-14B9-4FD1-8E00-7BC46555FDA0"
+    CACHE STRING "GUID for 64-bit MSI installer")
+
+    set(DESKFLOW_MSI_32_GUID
+    "BE0B9FD8-45E2-4A8E-A0D8-1F774D074A78"
+    CACHE STRING "GUID for 32-bit MSI installer")
+
 endmacro()
 
 macro(configure_bin_names)
+
   set(GUI_BINARY_NAME
       "synergy"
       CACHE STRING "Filename of the GUI binary")
@@ -83,4 +102,5 @@ macro(configure_bin_names)
   set(LEGACY_BINARY_NAME
       "synergy-legacy"
       CACHE STRING "Filename of the legacy binary")
+
 endmacro()