rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

integrate inno installer into cmake

This commit is contained in:
walker0643 2018-03-01 10:57:13 -05:00
parent c351d450ae
commit db1e05ff08
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -356,8 +356,10 @@ endif()
# Windows installer # Windows installer
# #
if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
message (STATUS "Configuring the v1 installer") message (STATUS "Configuring the wix installer")
configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/wix ${CMAKE_BINARY_DIR}/installer) configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/wix ${CMAKE_BINARY_DIR}/installer-wix)
message (STATUS "Configuring the inno installer")
configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/inno ${CMAKE_BINARY_DIR}/installer-inno)
endif() endif()
# #

2
cmake/Version.cmake
View File

@ -39,7 +39,7 @@ endif()
if (NOT DEFINED BARRIER_REVISION) if (NOT DEFINED BARRIER_REVISION)
if (DEFINED ENV{GIT_COMMIT}) if (DEFINED ENV{GIT_COMMIT})
string (SUBSTRING $ENV{GIT_COMMIT} 0 8 BARRIER_REVISION) string (SUBSTRING $ENV{GIT_COMMIT} 0 8 BARRIER_REVISION)
elseif (BARRIER_VERSION_STAGE STREQUAL "snapshot") else()
execute_process ( execute_process (
COMMAND git rev-parse --short=8 HEAD COMMAND git rev-parse --short=8 HEAD
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}

12
dist/inno/barrier.iss → dist/inno/barrier.iss.in vendored
View File

@ -1,5 +1,5 @@
#define MyAppName "Barrier" #define MyAppName "Barrier"
#define MyAppVersion "1.9" #define MyAppVersion "@BARRIER_VERSION@"
#define MyAppPublisher "Debauchee Open Source Group" #define MyAppPublisher "Debauchee Open Source Group"
#define MyAppURL "https://github.com/debauchee/barrier/wiki" #define MyAppURL "https://github.com/debauchee/barrier/wiki"
#define MyAppExeName "barrier.exe" #define MyAppExeName "barrier.exe"
@ -18,10 +18,10 @@ AppSupportURL={#MyAppURL}
AppUpdatesURL={#MyAppURL} AppUpdatesURL={#MyAppURL}
DefaultDirName={pf}\{#MyAppName} DefaultDirName={pf}\{#MyAppName}
DisableProgramGroupPage=yes DisableProgramGroupPage=yes
LicenseFile=E:\Projects\vs\barrier-release.git\res\License.rtf LicenseFile=@CMAKE_CURRENT_SOURCE_DIR@/res/License.rtf
OutputDir=E:\Projects\vs\barrier-release.git\build\installer\bin OutputDir=@CMAKE_RUNTIME_OUTPUT_DIRECTORY@/../installer-inno/bin
OutputBaseFilename=BarrierSetup OutputBaseFilename=BarrierSetup-{#MyAppVersion}
SetupIconFile=E:\Projects\vs\barrier-release.git\res\barrier.ico SetupIconFile=@CMAKE_CURRENT_SOURCE_DIR@/res/barrier.ico
Compression=lzma Compression=lzma
SolidCompression=yes SolidCompression=yes
ArchitecturesInstallIn64BitMode=x64 ia64 ArchitecturesInstallIn64BitMode=x64 ia64
@ -32,7 +32,7 @@ ArchitecturesInstallIn64BitMode=x64 ia64
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
[Files] [Files]
Source: "E:\Projects\vs\barrier-release.git\build\bin\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs Source: "@CMAKE_RUNTIME_OUTPUT_DIRECTORY@/Release/*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
; NOTE: Don't use "Flags: ignoreversion" on any shared system files ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
[Icons] [Icons]