From 68a36b3b67ec82cdd3f77e88e40d1043cbab5000 Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Wed, 19 Sep 2018 18:23:50 -0400 Subject: New upstream version 2.1.2+dfsg --- dist/inno/barrier.iss.in | 74 ----- dist/inno/scripts/isxdl/english.ini | 49 --- dist/inno/scripts/isxdl/isxdl.dll | Bin 124416 -> 0 bytes dist/inno/scripts/isxdl/isxdl.iss | 14 - dist/inno/scripts/lang/english.iss | 18 -- dist/inno/scripts/products.iss | 6 - dist/inno/scripts/products.pas | 329 --------------------- dist/inno/scripts/products/msiproduct.iss | 49 --- dist/inno/scripts/products/stringversion.iss | 62 ---- dist/inno/scripts/products/vcredist2017.iss | 32 -- dist/inno/scripts/products/winversion.iss | 49 --- .../bundle/Barrier.app/Contents/Info.plist.in | 32 -- dist/macos/bundle/Barrier.app/Contents/PkgInfo | 1 - .../Barrier.app/Contents/Resources/Barrier.icns | Bin 470437 -> 0 bytes dist/macos/bundle/build_installer.sh.in | 77 ----- dist/macos/bundle/reref_dylibs.sh | 41 --- dist/wix/Barrier.sln | 27 -- dist/wix/Barrier.wixproj | 31 -- dist/wix/Include.wxi.in | 25 -- dist/wix/Product.wxs | 104 ------- 20 files changed, 1020 deletions(-) delete mode 100644 dist/inno/barrier.iss.in delete mode 100644 dist/inno/scripts/isxdl/english.ini delete mode 100644 dist/inno/scripts/isxdl/isxdl.dll delete mode 100644 dist/inno/scripts/isxdl/isxdl.iss delete mode 100644 dist/inno/scripts/lang/english.iss delete mode 100644 dist/inno/scripts/products.iss delete mode 100644 dist/inno/scripts/products.pas delete mode 100644 dist/inno/scripts/products/msiproduct.iss delete mode 100644 dist/inno/scripts/products/stringversion.iss delete mode 100644 dist/inno/scripts/products/vcredist2017.iss delete mode 100644 dist/inno/scripts/products/winversion.iss delete mode 100644 dist/macos/bundle/Barrier.app/Contents/Info.plist.in delete mode 100644 dist/macos/bundle/Barrier.app/Contents/PkgInfo delete mode 100644 dist/macos/bundle/Barrier.app/Contents/Resources/Barrier.icns delete mode 100755 dist/macos/bundle/build_installer.sh.in delete mode 100755 dist/macos/bundle/reref_dylibs.sh delete mode 100644 dist/wix/Barrier.sln delete mode 100644 dist/wix/Barrier.wixproj delete mode 100644 dist/wix/Include.wxi.in delete mode 100644 dist/wix/Product.wxs (limited to 'dist') diff --git a/dist/inno/barrier.iss.in b/dist/inno/barrier.iss.in deleted file mode 100644 index 6b52bcc..0000000 --- a/dist/inno/barrier.iss.in +++ /dev/null @@ -1,74 +0,0 @@ -#define MyAppName "Barrier" -#define MyAppVersion "@BARRIER_VERSION@" -#define MyAppPublisher "Debauchee Open Source Group" -#define MyAppURL "https://github.com/debauchee/barrier/wiki" -#define MyAppExeName "barrier.exe" -#define MyAppServiceName "Barrier" -#define MyAppServiceExe "barrierd.exe" -#define MyAppServiceDesc "Manages the Barrier background processes." - -[Setup] -AppId={{41036EA6-3F7A-4803-8AE0-469E5E91EFCC} -AppName={#MyAppName} -AppVersion={#MyAppVersion} -AppVerName={#MyAppName} {#MyAppVersion} -AppPublisher={#MyAppPublisher} -AppPublisherURL={#MyAppURL} -AppSupportURL={#MyAppURL} -AppUpdatesURL={#MyAppURL} -DefaultDirName={pf}\{#MyAppName} -DisableProgramGroupPage=yes -LicenseFile=@CMAKE_CURRENT_SOURCE_DIR@/res/License.rtf -OutputDir=@CMAKE_RUNTIME_OUTPUT_DIRECTORY@/../installer-inno/bin -OutputBaseFilename=BarrierSetup-{#MyAppVersion} -SetupIconFile=@CMAKE_CURRENT_SOURCE_DIR@/res/barrier.ico -Compression=lzma -SolidCompression=yes -ArchitecturesInstallIn64BitMode=x64 ia64 - -#include "scripts\lang\english.iss" - -[Tasks] -Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked - -[Files] -Source: "@CMAKE_RUNTIME_OUTPUT_DIRECTORY@/Release/*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs -; NOTE: Don't use "Flags: ignoreversion" on any shared system files - -[Icons] -Name: "{commonprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" -Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon - -[Run] -Filename: {sys}\sc.exe; Parameters: "create {#MyAppServiceName} start= auto binPath= ""{app}\{#MyAppServiceExe}"""; Flags: runhidden -Filename: {sys}\sc.exe; Parameters: "description {#MyAppServiceName} ""{#MyAppServiceDesc}"""; Flags: runhidden -Filename: {sys}\sc.exe; Parameters: "start {#MyAppServiceName}"; Flags: runhidden -Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent - -[UninstallDelete] -Type: files; Name: "{app}\barrierd.log" - -[UninstallRun] -Filename: {sys}\sc.exe; Parameters: "stop {#MyAppServiceName}"; Flags: runhidden -Filename: {sys}\sc.exe; Parameters: "delete {#MyAppServiceName}"; Flags: runhidden - -[CustomMessages] -DependenciesDir="redist" - -; shared code for installing the products -#include "scripts\products.iss" -#include "scripts\products\stringversion.iss" -#include "scripts\products\winversion.iss" -#include "scripts\products\msiproduct.iss" -#include "scripts\products\vcredist2017.iss" - -[Code] -function InitializeSetup(): boolean; -begin - // initialize windows version - initwinversion(); - - vcredist2017('14'); // min allowed version is 14.0 - - Result := true; -end; diff --git a/dist/inno/scripts/isxdl/english.ini b/dist/inno/scripts/isxdl/english.ini deleted file mode 100644 index 0546ae4..0000000 --- a/dist/inno/scripts/isxdl/english.ini +++ /dev/null @@ -1,49 +0,0 @@ -[strings] -; General -100=File download -101=Do you want to cancel the download? -102=%1 (%2 of %3) -103=%1 KB -104=%1 KB of %2 KB (%3%) - -; Status information -110=Getting file information... -111=Redirecting to %1 -112=Sending request... -113=Resolving %1 -114=Connected to %1 -115=Receiving... -116=Connecting to %1 - -; Error messages -120=Error connecting to the internet.\n\n%1 -121=Error opening %1.\n\nThe server returned status code %2. -122=Error reading URL.\n\n%1 -123=Error writing file %1.\n\n%2 -124=Error opening file %1.\n\n%2 -125='%1' is an invalid URL. -126=Error opening %1.\n\n%2 -127=Error sending request.\n\n%1 -128=Unsupported protocol. Only HTTP and FTP protocols are supported. -129=Failed to connect to %1.\n\n%2 -130=Failed to query status code.\n\n%1 -131=Error requesting file.\n\n%1 - -; Other -144=About... -146=Download -147=Setup is now downloading additional files to your computer. - -; labels -160=File: -161=Speed: -162=Status: -163=Elapsed Time: -164=Remaining Time: -165=Current File: -166=Overall Progress: -167=Cancel -168=OK -169=User Name and Password -170=User Name: -171=Password: diff --git a/dist/inno/scripts/isxdl/isxdl.dll b/dist/inno/scripts/isxdl/isxdl.dll deleted file mode 100644 index d227bca..0000000 Binary files a/dist/inno/scripts/isxdl/isxdl.dll and /dev/null differ diff --git a/dist/inno/scripts/isxdl/isxdl.iss b/dist/inno/scripts/isxdl/isxdl.iss deleted file mode 100644 index 3c25d6d..0000000 --- a/dist/inno/scripts/isxdl/isxdl.iss +++ /dev/null @@ -1,14 +0,0 @@ -[Files] -Source: "scripts\isxdl\isxdl.dll"; Flags: dontcopy - -[Code] -procedure isxdl_AddFile(URL, Filename: PAnsiChar); -external 'isxdl_AddFile@files:isxdl.dll stdcall'; - -function isxdl_DownloadFiles(hWnd: Integer): Integer; -external 'isxdl_DownloadFiles@files:isxdl.dll stdcall'; - -function isxdl_SetOption(Option, Value: PAnsiChar): Integer; -external 'isxdl_SetOption@files:isxdl.dll stdcall'; - -[Setup] diff --git a/dist/inno/scripts/lang/english.iss b/dist/inno/scripts/lang/english.iss deleted file mode 100644 index fa32fc0..0000000 --- a/dist/inno/scripts/lang/english.iss +++ /dev/null @@ -1,18 +0,0 @@ -[Languages] -Name: "en"; MessagesFile: "compiler:Default.isl" - -[CustomMessages] -;http://www.microsoft.com/globaldev/reference/lcid-all.mspx -en.lcid=1033 -en.depdownload_msg=The following applications are required before setup can continue:%n%n%1%nDownload and install now? -en.depdownload_memo_title=Download dependencies -en.depinstall_memo_title=Install dependencies -en.depinstall_title=Installing dependencies -en.depinstall_description=Please wait while Setup installs dependencies on your computer. -en.depinstall_status=Installing %1... -en.depinstall_missing=%1 must be installed before setup can continue. Please install %1 and run Setup again. -en.depinstall_error=An error occured while installing the dependencies. Please restart the computer and run the setup again or install the following dependencies manually:%n - -en.isxdl_langfile= - -[Files] diff --git a/dist/inno/scripts/products.iss b/dist/inno/scripts/products.iss deleted file mode 100644 index 63cf4d1..0000000 --- a/dist/inno/scripts/products.iss +++ /dev/null @@ -1,6 +0,0 @@ -#include "isxdl\isxdl.iss" - -[Code] -#include "products.pas" - -[Setup] diff --git a/dist/inno/scripts/products.pas b/dist/inno/scripts/products.pas deleted file mode 100644 index d114c41..0000000 --- a/dist/inno/scripts/products.pas +++ /dev/null @@ -1,329 +0,0 @@ -{ - --- TYPES AND VARIABLES --- -} -type - TProduct = record - File: String; - Title: String; - Parameters: String; - ForceSuccess : boolean; - InstallClean : boolean; - MustRebootAfter : boolean; - end; - - InstallResult = (InstallSuccessful, InstallRebootRequired, InstallError); - -var - installMemo, downloadMessage: string; - products: array of TProduct; - delayedReboot, isForcedX86: boolean; - DependencyPage: TOutputProgressWizardPage; - -procedure AddProduct(filename, parameters, title, size, url: string; forceSuccess, installClean, mustRebootAfter : boolean); -{ - Adds a product to the list of products to download. - Parameters: - filename: the file name under which to save the file - parameters: the parameters with which to run the file - title: the product title - size: the file size - url: the URL to download from - forceSuccess: whether to continue in case of setup failure - installClean: whether the product needs a reboot before installing - mustRebootAfter: whether the product needs a reboot after installing -} -var - path: string; - i: Integer; -begin - installMemo := installMemo + '%1' + title + #13; - - path := ExpandConstant('{src}{\}') + CustomMessage('DependenciesDir') + '\' + filename; - if not FileExists(path) then begin - path := ExpandConstant('{tmp}{\}') + filename; - - if not FileExists(path) then begin - isxdl_AddFile(url, path); - - downloadMessage := downloadMessage + '%1' + title + ' (' + size + ')' + #13; - end; - end; - - i := GetArrayLength(products); - SetArrayLength(products, i + 1); - products[i].File := path; - products[i].Title := title; - products[i].Parameters := parameters; - products[i].ForceSuccess := forceSuccess; - products[i].InstallClean := installClean; - products[i].MustRebootAfter := mustRebootAfter; -end; - -function SmartExec(product : TProduct; var resultcode : Integer): boolean; -{ - Executes a product and returns the exit code. - Parameters: - product: the product to install - resultcode: the exit code -} -begin - if (LowerCase(Copy(product.File, Length(product.File) - 2, 3)) = 'exe') then begin - Result := Exec(product.File, product.Parameters, '', SW_SHOWNORMAL, ewWaitUntilTerminated, resultcode); - end else begin - Result := ShellExec('', product.File, product.Parameters, '', SW_SHOWNORMAL, ewWaitUntilTerminated, resultcode); - end; -end; - -function PendingReboot: boolean; -{ - Checks whether the machine has a pending reboot. -} -var names: String; -begin - if (RegQueryMultiStringValue(HKEY_LOCAL_MACHINE, 'SYSTEM\CurrentControlSet\Control\Session Manager', 'PendingFileRenameOperations', names)) then begin - Result := true; - end else if ((RegQueryMultiStringValue(HKEY_LOCAL_MACHINE, 'SYSTEM\CurrentControlSet\Control\Session Manager', 'SetupExecute', names)) and (names <> '')) then begin - Result := true; - end else begin - Result := false; - end; -end; - -function InstallProducts: InstallResult; -{ - Installs the downloaded products -} -var - resultCode, i, productCount, finishCount: Integer; -begin - Result := InstallSuccessful; - productCount := GetArrayLength(products); - - if productCount > 0 then begin - DependencyPage := CreateOutputProgressPage(CustomMessage('depinstall_title'), CustomMessage('depinstall_description')); - DependencyPage.Show; - - for i := 0 to productCount - 1 do begin - if (products[i].InstallClean and (delayedReboot or PendingReboot())) then begin - Result := InstallRebootRequired; - break; - end; - - DependencyPage.SetText(FmtMessage(CustomMessage('depinstall_status'), [products[i].Title]), ''); - DependencyPage.SetProgress(i, productCount); - - while true do begin - // set 0 as used code for shown error if SmartExec fails - resultCode := 0; - if SmartExec(products[i], resultCode) then begin - // setup executed; resultCode contains the exit code - if (products[i].MustRebootAfter) then begin - // delay reboot after install if we installed the last dependency anyways - if (i = productCount - 1) then begin - delayedReboot := true; - end else begin - Result := InstallRebootRequired; - end; - break; - end else if (resultCode = 0) or (products[i].ForceSuccess) then begin - finishCount := finishCount + 1; - break; - end else if (resultCode = 3010) then begin - // Windows Installer resultCode 3010: ERROR_SUCCESS_REBOOT_REQUIRED - delayedReboot := true; - finishCount := finishCount + 1; - break; - end; - end; - - case MsgBox(FmtMessage(SetupMessage(msgErrorFunctionFailed), [products[i].Title, IntToStr(resultCode)]), mbError, MB_ABORTRETRYIGNORE) of - IDABORT: begin - Result := InstallError; - break; - end; - IDIGNORE: begin - break; - end; - end; - end; - - if Result <> InstallSuccessful then begin - break; - end; - end; - - // only leave not installed products for error message - for i := 0 to productCount - finishCount - 1 do begin - products[i] := products[i+finishCount]; - end; - SetArrayLength(products, productCount - finishCount); - - DependencyPage.Hide; - end; -end; - -{ - -------------------- - INNO EVENT FUNCTIONS - -------------------- -} - -function PrepareToInstall(var NeedsRestart: boolean): String; -{ - Before the "preparing to install" page. - See: http://www.jrsoftware.org/ishelp/index.php?topic=scriptevents -} -var - i: Integer; - s: string; -begin - delayedReboot := false; - - case InstallProducts() of - InstallError: begin - s := CustomMessage('depinstall_error'); - - for i := 0 to GetArrayLength(products) - 1 do begin - s := s + #13 + ' ' + products[i].Title; - end; - - Result := s; - end; - InstallRebootRequired: begin - Result := products[0].Title; - NeedsRestart := true; - - // write into the registry that the installer needs to be executed again after restart - RegWriteStringValue(HKEY_CURRENT_USER, 'SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce', 'InstallBootstrap', ExpandConstant('{srcexe}')); - end; - end; -end; - -function NeedRestart : boolean; -{ - Checks whether a restart is needed at the end of install - See: http://www.jrsoftware.org/ishelp/index.php?topic=scriptevents -} -begin - Result := delayedReboot; -end; - -function UpdateReadyMemo(Space, NewLine, MemoUserInfoInfo, MemoDirInfo, MemoTypeInfo, MemoComponentsInfo, MemoGroupInfo, MemoTasksInfo: String): String; -{ - Just before the "ready" page. - See: http://www.jrsoftware.org/ishelp/index.php?topic=scriptevents -} -var - s: string; -begin - if downloadMessage <> '' then - s := s + CustomMessage('depdownload_memo_title') + ':' + NewLine + FmtMessage(downloadMessage, [Space]) + NewLine; - if installMemo <> '' then - s := s + CustomMessage('depinstall_memo_title') + ':' + NewLine + FmtMessage(installMemo, [Space]) + NewLine; - - if MemoDirInfo <> '' then - s := s + MemoDirInfo + NewLine + NewLine; - if MemoGroupInfo <> '' then - s := s + MemoGroupInfo + NewLine + NewLine; - if MemoTasksInfo <> '' then - s := s + MemoTasksInfo; - - Result := s -end; - -function NextButtonClick(CurPageID: Integer): boolean; -{ - At each "next" button click - See: http://www.jrsoftware.org/ishelp/index.php?topic=scriptevents -} -begin - Result := true; - - if CurPageID = wpReady then begin - if downloadMessage <> '' then begin - // change isxdl language only if it is not english because isxdl default language is already english - if (ActiveLanguage() <> 'en') then begin - ExtractTemporaryFile(CustomMessage('isxdl_langfile')); - isxdl_SetOption('language', ExpandConstant('{tmp}{\}') + CustomMessage('isxdl_langfile')); - end; - //isxdl_SetOption('title', FmtMessage(SetupMessage(msgSetupWindowTitle), [CustomMessage('appname')])); - - //if SuppressibleMsgBox(FmtMessage(CustomMessage('depdownload_msg'), [FmtMessage(downloadMessage, [''])]), mbConfirmation, MB_YESNO, IDYES) = IDNO then - // Result := false - //else if - if isxdl_DownloadFiles(StrToInt(ExpandConstant('{wizardhwnd}'))) = 0 then - Result := false; - end; - end; -end; - -{ - ----------------------------- - ARCHITECTURE HELPER FUNCTIONS - ----------------------------- -} - -function IsX86: boolean; -{ - Gets whether the computer is x86 (32 bits). -} -begin - Result := isForcedX86 or (ProcessorArchitecture = paX86) or (ProcessorArchitecture = paUnknown); -end; - -function IsX64: boolean; -{ - Gets whether the computer is x64 (64 bits). -} -begin - Result := (not isForcedX86) and Is64BitInstallMode and (ProcessorArchitecture = paX64); -end; - -function IsIA64: boolean; -{ - Gets whether the computer is IA64 (Itanium 64 bits). -} -begin - Result := (not isForcedX86) and Is64BitInstallMode and (ProcessorArchitecture = paIA64); -end; - -function GetString(x86, x64, ia64: String): String; -{ - Gets a string depending on the computer architecture. - Parameters: - x86: the string if the computer is x86 - x64: the string if the computer is x64 - ia64: the string if the computer is IA64 -} -begin - if IsX64() and (x64 <> '') then begin - Result := x64; - end else if IsIA64() and (ia64 <> '') then begin - Result := ia64; - end else begin - Result := x86; - end; -end; - -function GetArchitectureString(): String; -{ - Gets the "standard" architecture suffix string. - Returns either _x64, _ia64 or nothing. -} -begin - if IsX64() then begin - Result := '_x64'; - end else if IsIA64() then begin - Result := '_ia64'; - end else begin - Result := ''; - end; -end; - -procedure SetForceX86(value: boolean); -{ - Forces the setup to use X86 products -} -begin - isForcedX86 := value; -end; diff --git a/dist/inno/scripts/products/msiproduct.iss b/dist/inno/scripts/products/msiproduct.iss deleted file mode 100644 index 35a8d23..0000000 --- a/dist/inno/scripts/products/msiproduct.iss +++ /dev/null @@ -1,49 +0,0 @@ -[Code] -#ifdef UNICODE - #define AW "W" -#else - #define AW "A" -#endif - -type - INSTALLSTATE = Longint; -const - INSTALLSTATE_INVALIDARG = -2; // An invalid parameter was passed to the function. - INSTALLSTATE_UNKNOWN = -1; // The product is neither advertised or installed. - INSTALLSTATE_ADVERTISED = 1; // The product is advertised but not installed. - INSTALLSTATE_ABSENT = 2; // The product is installed for a different user. - INSTALLSTATE_DEFAULT = 5; // The product is installed for the current user. - -function MsiQueryProductState(szProduct: string): INSTALLSTATE; -external 'MsiQueryProductState{#AW}@msi.dll stdcall'; - -function MsiEnumRelatedProducts(szUpgradeCode: string; nReserved: dword; nIndex: dword; szProductCode: string): integer; -external 'MsiEnumRelatedProducts{#AW}@msi.dll stdcall'; - -function MsiGetProductInfo(szProductCode: string; szProperty: string; szValue: string; var nvalueSize: dword): integer; -external 'MsiGetProductInfo{#AW}@msi.dll stdcall'; - -function msiproduct(productID: string): boolean; -begin - Result := MsiQueryProductState(productID) = INSTALLSTATE_DEFAULT; -end; - -function msiproductupgrade(upgradeCode: string; minVersion: string): boolean; -var - productCode, version: string; - valueSize: dword; -begin - SetLength(productCode, 39); - Result := false; - - if (MsiEnumRelatedProducts(upgradeCode, 0, 0, productCode) = 0) then begin - SetLength(version, 39); - valueSize := Length(version); - - if (MsiGetProductInfo(productCode, 'VersionString', version, valueSize) = 0) then begin - Result := compareversion(version, minVersion) >= 0; - end; - end; -end; - -[Setup] diff --git a/dist/inno/scripts/products/stringversion.iss b/dist/inno/scripts/products/stringversion.iss deleted file mode 100644 index 4cb114f..0000000 --- a/dist/inno/scripts/products/stringversion.iss +++ /dev/null @@ -1,62 +0,0 @@ -[Code] -function stringtoversion(var temp: String): Integer; -var - part: String; - pos1: Integer; - -begin - if (Length(temp) = 0) then begin - Result := -1; - Exit; - end; - - pos1 := Pos('.', temp); - if (pos1 = 0) then begin - Result := StrToInt(temp); - temp := ''; - end else begin - part := Copy(temp, 1, pos1 - 1); - temp := Copy(temp, pos1 + 1, Length(temp)); - Result := StrToInt(part); - end; -end; - -function compareinnerversion(var x, y: String): Integer; -var - num1, num2: Integer; - -begin - num1 := stringtoversion(x); - num2 := stringtoversion(y); - if (num1 = -1) and (num2 = -1) then begin - Result := 0; - Exit; - end; - - if (num1 < 0) then begin - num1 := 0; - end; - if (num2 < 0) then begin - num2 := 0; - end; - - if (num1 < num2) then begin - Result := -1; - end else if (num1 > num2) then begin - Result := 1; - end else begin - Result := compareinnerversion(x, y); - end; -end; - -function compareversion(versionA, versionB: String): Integer; -var - temp1, temp2: String; - -begin - temp1 := versionA; - temp2 := versionB; - Result := compareinnerversion(temp1, temp2); -end; - -[Setup] diff --git a/dist/inno/scripts/products/vcredist2017.iss b/dist/inno/scripts/products/vcredist2017.iss deleted file mode 100644 index da20e03..0000000 --- a/dist/inno/scripts/products/vcredist2017.iss +++ /dev/null @@ -1,32 +0,0 @@ -; requires Windows 10, Windows 7 Service Pack 1, Windows 8, Windows 8.1, Windows Server 2003 Service Pack 2, Windows Server 2008 R2 SP1, Windows Server 2008 Service Pack 2, Windows Server 2012, Windows Vista Service Pack 2, Windows XP Service Pack 3 -; http://www.visualstudio.com/en-us/downloads/ - -[CustomMessages] -vcredist2017_title=Visual C++ 2017 Redistributable -vcredist2017_title_x64=Visual C++ 2017 64-Bit Redistributable - -vcredist2017_size=13.7 MB -vcredist2017_size_x64=14.5 MB - -[Code] -const - vcredist2017_url = 'http://download.microsoft.com/download/1/f/e/1febbdb2-aded-4e14-9063-39fb17e88444/vc_redist.x86.exe'; - vcredist2017_url_x64 = 'http://download.microsoft.com/download/3/b/f/3bf6e759-c555-4595-8973-86b7b4312927/vc_redist.x64.exe'; - - vcredist2017_upgradecode = '{65E5BD06-6392-3027-8C26-853107D3CF1A}'; - vcredist2017_upgradecode_x64 = '{36F68A90-239C-34DF-B58C-64B30153CE35}'; - -procedure vcredist2017(minVersion: string); -begin - if (not IsIA64()) then begin - if (not msiproductupgrade(GetString(vcredist2017_upgradecode, vcredist2017_upgradecode_x64, ''), minVersion)) then - AddProduct('vcredist2017' + GetArchitectureString() + '.exe', - '/passive /norestart', - CustomMessage('vcredist2017_title' + GetArchitectureString()), - CustomMessage('vcredist2017_size' + GetArchitectureString()), - GetString(vcredist2017_url, vcredist2017_url_x64, ''), - false, false, false); - end; -end; - -[Setup] diff --git a/dist/inno/scripts/products/winversion.iss b/dist/inno/scripts/products/winversion.iss deleted file mode 100644 index e1aff98..0000000 --- a/dist/inno/scripts/products/winversion.iss +++ /dev/null @@ -1,49 +0,0 @@ -[Code] -var - WindowsVersion: TWindowsVersion; - -procedure initwinversion(); -begin - GetWindowsVersionEx(WindowsVersion); -end; - -function exactwinversion(MajorVersion, MinorVersion: integer): boolean; -begin - Result := (WindowsVersion.Major = MajorVersion) and (WindowsVersion.Minor = MinorVersion); -end; - -function minwinversion(MajorVersion, MinorVersion: integer): boolean; -begin - Result := (WindowsVersion.Major > MajorVersion) or ((WindowsVersion.Major = MajorVersion) and (WindowsVersion.Minor >= MinorVersion)); -end; - -function maxwinversion(MajorVersion, MinorVersion: integer): boolean; -begin - Result := (WindowsVersion.Major < MajorVersion) or ((WindowsVersion.Major = MajorVersion) and (WindowsVersion.Minor <= MinorVersion)); -end; - -function exactwinspversion(MajorVersion, MinorVersion, SpVersion: integer): boolean; -begin - if exactwinversion(MajorVersion, MinorVersion) then - Result := WindowsVersion.ServicePackMajor = SpVersion - else - Result := true; -end; - -function minwinspversion(MajorVersion, MinorVersion, SpVersion: integer): boolean; -begin - if exactwinversion(MajorVersion, MinorVersion) then - Result := WindowsVersion.ServicePackMajor >= SpVersion - else - Result := true; -end; - -function maxwinspversion(MajorVersion, MinorVersion, SpVersion: integer): boolean; -begin - if exactwinversion(MajorVersion, MinorVersion) then - Result := WindowsVersion.ServicePackMajor <= SpVersion - else - Result := true; -end; - -[Setup] diff --git a/dist/macos/bundle/Barrier.app/Contents/Info.plist.in b/dist/macos/bundle/Barrier.app/Contents/Info.plist.in deleted file mode 100644 index b973f5e..0000000 --- a/dist/macos/bundle/Barrier.app/Contents/Info.plist.in +++ /dev/null @@ -1,32 +0,0 @@ - - - - CFBundleDevelopmentRegion - English - CFBundleDisplayName - Barrier - CFBundleExecutable - barrier.sh - CFBundleIconFile - Barrier.icns - CFBundleIdentifier - barrier - - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - Barrier - CFBundlePackageType - APPL - CFBundleSignature - SYN1 - CFBundleShortVersionString - @BARRIER_VERSION@ - CFBundleVersion - @BARRIER_VERSION@ - NSHumanReadableCopyright - © 2018 Debauchee Open Source Group - LSMinimumSystemVersion - 10.9.0 - - diff --git a/dist/macos/bundle/Barrier.app/Contents/PkgInfo b/dist/macos/bundle/Barrier.app/Contents/PkgInfo deleted file mode 100644 index 583e36a..0000000 --- a/dist/macos/bundle/Barrier.app/Contents/PkgInfo +++ /dev/null @@ -1 +0,0 @@ -APPLSYN1 \ No newline at end of file diff --git a/dist/macos/bundle/Barrier.app/Contents/Resources/Barrier.icns b/dist/macos/bundle/Barrier.app/Contents/Resources/Barrier.icns deleted file mode 100644 index 9f573da..0000000 Binary files a/dist/macos/bundle/Barrier.app/Contents/Resources/Barrier.icns and /dev/null differ diff --git a/dist/macos/bundle/build_installer.sh.in b/dist/macos/bundle/build_installer.sh.in deleted file mode 100755 index f939b77..0000000 --- a/dist/macos/bundle/build_installer.sh.in +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/sh - -# change this to rename the installer package -B_DMG="Barrier-@BARRIER_VERSION@.dmg" - -# sanity check so we don't distribute packages full of debug symbols -if [ "@CMAKE_BUILD_TYPE@" != "Release" ]; then - echo Will only build installers for Release builds - exit 1 -fi - -cd @CMAKE_CURRENT_SOURCE_DIR@/build/bundle || exit 1 - -B_REREF_SCRIPT=@CMAKE_CURRENT_SOURCE_DIR@/build/bundle/reref_dylibs.sh -if [ ! -x $B_REREF_SCRIPT ]; then - echo Missing script: $B_REREF_SCRIPT - exit 1 -fi - -# remove any old copies so there's no confusion about whether this -# process completes successfully or not -rm -rf temp.dmg $B_DMG - -cd Barrier.app/Contents 2>/dev/null -if [ $? -ne 0 ]; then - echo Please make sure that the build completed successfully - echo before trying to create the installer. - exit 1 -fi - -# MacOS folder holds the executables, non-system libraries, -# and the startup script -rm -rf MacOS -mkdir MacOS || exit 1 -cd MacOS || exit 1 - -# copy all executables -cp @CMAKE_RUNTIME_OUTPUT_DIRECTORY@/* . || exit 1 - -# copy the qt platform plugin -# TODO: this is hacky and will probably break if there is more than one qt -# version installed. need a better way to find this library -B_COCOA=$(find /usr/local/Cellar/qt -type f -name libqcocoa.dylib | head -1) -if [ $? -ne 0 ] || [ "x$B_COCOA" = "x" ]; then - echo "Could not find cocoa platform plugin" - exit 1 -fi -mkdir platforms -cp $B_COCOA platforms/ || exit 1 - -# make sure we can r/w all these binaries -chmod -R u+rw * || exit 1 - -# only one executable (barrier) needs non-system libraries although it's -# libraries can call each other. use a recursive script to handle the -# re-referencing -$B_REREF_SCRIPT barrier || exit 1 -# the cocoa platform plugin also needs to know where to find the qt libraries. -# because it exists in a subdirectory we append ../ to the relative path of the -# libraries in its metadata -$B_REREF_SCRIPT platforms/libqcocoa.dylib ../ || exit 1 - -# create a startup script that will change to the binary directory -# before starting barrier -printf "%s\n" "#!/bin/sh" "cd \$(dirname \$0)" "exec ./barrier" > barrier.sh -chmod +x barrier.sh - -# create the DMG to be distributed in build/bundle -cd ../../.. -hdiutil create -size 64m -fs HFS+ -volname "Barrier" temp.dmg || exit 1 -hdiutil attach temp.dmg -mountpoint mnt || exit 1 -cp -r Barrier.app mnt/ || exit 1 -hdiutil detach mnt || exit 1 -hdiutil convert temp.dmg -format UDZO -o $B_DMG || exit 1 -rm temp.dmg - -echo "Installer created successfully" diff --git a/dist/macos/bundle/reref_dylibs.sh b/dist/macos/bundle/reref_dylibs.sh deleted file mode 100755 index 15191bd..0000000 --- a/dist/macos/bundle/reref_dylibs.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh - -# $1 = binary (program or dylib) -B_TARGET=$1 -if [ "x$B_TARGET" = "x" ]; then - echo Which binary needs to be re-referenced? - exit 1 -fi - -cd $(dirname $B_TARGET) || exit 1 - -# where to find non-system libraries relative to target's directory. -# the vast majority of the time this should be empty -B_REL_PATH=$2 - -# we're in target's directory now. trim off the path -B_TARGET=$(basename $B_TARGET) - -# get a list of non-system libraries and make local copies -B_LIBS=$(otool -XL $B_TARGET | awk '{ print $1 }' | grep -Ev '^(/usr/lib|/System)') -[ $? -ne 0 ] && exit 1 -for B_LIB in $B_LIBS; do - B_LIB_NAME=$(basename $B_LIB) - - # ignore self-references - [ "$B_TARGET" = "$B_LIB_NAME" ] && continue - - B_DST=${B_REL_PATH}${B_LIB_NAME} - if [ ! -e $B_DST ]; then - cp $B_LIB $B_DST || exit 1 - chmod u+rw $B_DST || exit 1 - # recursively call this script on libraries purposefully not passing - # $B_REL_PATH so that it is only used explicitly - $0 $B_DST - fi - - # adjust the target's metadata to point to the local copy - # rather than the system-wide copy which would only exist on - # a development machine - install_name_tool -change $B_LIB @loader_path/$B_DST $B_TARGET || exit 1 -done diff --git a/dist/wix/Barrier.sln b/dist/wix/Barrier.sln deleted file mode 100644 index c163c62..0000000 --- a/dist/wix/Barrier.sln +++ /dev/null @@ -1,27 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Barrier", "Barrier.wixproj", "{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x86 = Debug|x86 - Debug|x64 = Debug|x64 - Release|x86 = Release|x86 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {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|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 -EndGlobal diff --git a/dist/wix/Barrier.wixproj b/dist/wix/Barrier.wixproj deleted file mode 100644 index ffc7701..0000000 --- a/dist/wix/Barrier.wixproj +++ /dev/null @@ -1,31 +0,0 @@ - - - - 3.10 - {d4ba9f39-6a35-4c8f-9cb2-67fcbe5cab17} - 2.0 - Barrier - 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 - - - - - - \ No newline at end of file diff --git a/dist/wix/Include.wxi.in b/dist/wix/Include.wxi.in deleted file mode 100644 index 652d203..0000000 --- a/dist/wix/Include.wxi.in +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dist/wix/Product.wxs b/dist/wix/Product.wxs deleted file mode 100644 index 1abc21e..0000000 --- a/dist/wix/Product.wxs +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - = 602)]]> - - - - - - - - - - - - - NOT Installed - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3