From 9d514ef8767151016571278c2656028cb44be7c2 Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Thu, 24 Oct 2019 13:49:50 +0100 Subject: [PATCH 1/3] Updated installer package, made QT path configurable, added redist to msi --- CMakeLists.txt | 3 ++- dist/wix/Include.wxi.in | 5 ++-- dist/wix/Product.wxs | 6 +++++ dist/wix/Synergy.sln | 20 +++++++------- dist/wix/Synergy.wixproj | 58 +++++++++++++++++++++------------------- 5 files changed, 51 insertions(+), 41 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e162d631..308c2e8c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -377,8 +377,9 @@ endif() # if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") message (STATUS "Configuring the v1 installer") - configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/wix ${CMAKE_BINARY_DIR}/installer) generate_versionfile() + set(QT_PATH $ENV{CMAKE_PREFIX_PATH}) + configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/wix ${CMAKE_BINARY_DIR}/installer) endif() # diff --git a/dist/wix/Include.wxi.in b/dist/wix/Include.wxi.in index c0391c7c..41c632ad 100644 --- a/dist/wix/Include.wxi.in +++ b/dist/wix/Include.wxi.in @@ -2,7 +2,6 @@ - @@ -11,12 +10,12 @@ - + - + diff --git a/dist/wix/Product.wxs b/dist/wix/Product.wxs index dce91922..f4c1a7f6 100644 --- a/dist/wix/Product.wxs +++ b/dist/wix/Product.wxs @@ -15,6 +15,7 @@ + @@ -36,6 +37,11 @@ = 602)]]> + + + + + diff --git a/dist/wix/Synergy.sln b/dist/wix/Synergy.sln index 81ed8811..0de1bd1c 100644 --- a/dist/wix/Synergy.sln +++ b/dist/wix/Synergy.sln @@ -1,27 +1,29 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29411.108 MinimumVisualStudioVersion = 10.0.40219.1 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Synergy", "Synergy.wixproj", "{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x86 = Debug|x86 Debug|x64 = Debug|x64 - Release|x86 = Release|x86 + Debug|x86 = Debug|x86 Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Debug|x64.ActiveCfg = Debug|x86 {D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Debug|x86.ActiveCfg = Debug|x86 {D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Debug|x86.Build.0 = Debug|x86 - {D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Debug|x64.ActiveCfg = Debug|x64 - {D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Debug|x64.Build.0 = Debug|x64 + {D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Release|x64.ActiveCfg = Release|x86 {D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Release|x86.ActiveCfg = Release|x86 {D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Release|x86.Build.0 = Release|x86 - {D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Release|x64.ActiveCfg = Release|x64 - {D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {2E0AA1C9-0F14-4FE4-8F18-430484EFBACE} + EndGlobalSection EndGlobal diff --git a/dist/wix/Synergy.wixproj b/dist/wix/Synergy.wixproj index 003665ee..b340455f 100644 --- a/dist/wix/Synergy.wixproj +++ b/dist/wix/Synergy.wixproj @@ -1,31 +1,33 @@  - - 3.10 - {d4ba9f39-6a35-4c8f-9cb2-67fcbe5cab17} - 2.0 - Synergy - Package - $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets - $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets - bin\$(Configuration)\ - wix\obj\$(Configuration)\ - - - - $(WixExtDir)\WixFirewallExtension.dll - WixFirewallExtension - - - $(WixExtDir)\WixUtilExtension.dll - WixUtilExtension - - - $(WixExtDir)\WixUIExtension.dll - WixUIExtension - - - - - + + 3.11 + {d4ba9f39-6a35-4c8f-9cb2-67fcbe5cab17} + 2.0 + Synergy + Package + bin\$(Configuration)\ + wix\obj\$(Configuration)\ + + + + + + + + + C:\Program Files (x86)\WiX Toolset v3.11\bin\WixUtilExtension.dll + WixUtilExtension + + + C:\Program Files (x86)\WiX Toolset v3.11\bin\WixUIExtension.dll + WixUIExtension + + + C:\Program Files (x86)\WiX Toolset v3.11\bin\WixFirewallExtension.dll + WixFirewallExtension + + + + \ No newline at end of file From 9d804129f09803ed8c2fc0907c0092c043f882a4 Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Thu, 24 Oct 2019 14:08:43 +0100 Subject: [PATCH 2/3] Tidied up wix include and fixed sln build configurations --- dist/wix/Include.wxi.in | 3 +-- dist/wix/Synergy.sln | 10 ++++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dist/wix/Include.wxi.in b/dist/wix/Include.wxi.in index 41c632ad..3cfcd201 100644 --- a/dist/wix/Include.wxi.in +++ b/dist/wix/Include.wxi.in @@ -10,13 +10,12 @@ - - + diff --git a/dist/wix/Synergy.sln b/dist/wix/Synergy.sln index 0de1bd1c..5451972b 100644 --- a/dist/wix/Synergy.sln +++ b/dist/wix/Synergy.sln @@ -7,18 +7,20 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Synergy", "Synergy.wixproj" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 - Release|x64 = Release|x64 + Debug|x64 = Debug|x64 Release|x86 = Release|x86 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Debug|x64.ActiveCfg = Debug|x86 {D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Debug|x86.ActiveCfg = Debug|x86 {D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Debug|x86.Build.0 = Debug|x86 - {D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Release|x64.ActiveCfg = Release|x86 + {D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Debug|x64.ActiveCfg = Debug|x64 + {D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Debug|x64.Build.0 = Debug|x64 {D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Release|x86.ActiveCfg = Release|x86 {D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Release|x86.Build.0 = Release|x86 + {D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Release|x64.ActiveCfg = Release|x64 + {D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From c62ed8494f3f1d349c0fcf95689cc449c5a686e9 Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Thu, 24 Oct 2019 14:19:20 +0100 Subject: [PATCH 3/3] removed quotes from windows version variables --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 308c2e8c..75855d2a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -349,10 +349,10 @@ macro(generate_versionfile) "export SYNERGY_VERSION_STAGE=\"${SYNERGY_VERSION_STAGE}\"\n") elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows") FILE(WRITE ${CMAKE_BINARY_DIR}/version.bat - "SET SYNERGY_VERSION_MAJOR=\"${SYNERGY_VERSION_MAJOR}\"\n" - "SET SYNERGY_VERSION_MINOR=\"${SYNERGY_VERSION_MINOR}\"\n" - "SET SYNERGY_VERSION_PATCH=\"${SYNERGY_VERSION_PATCH}\"\n" - "SET SYNERGY_VERSION_STAGE=\"${SYNERGY_VERSION_STAGE}\"\n") + "SET SYNERGY_VERSION_MAJOR=${SYNERGY_VERSION_MAJOR}\n" + "SET SYNERGY_VERSION_MINOR=${SYNERGY_VERSION_MINOR}\n" + "SET SYNERGY_VERSION_PATCH=${SYNERGY_VERSION_PATCH}\n" + "SET SYNERGY_VERSION_STAGE=${SYNERGY_VERSION_STAGE}\n") endif() endmacro(generate_versionfile)