-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix(Installer) Differentiation of 32 and 64 bits installer
- Loading branch information
Showing
20 changed files
with
199 additions
and
75 deletions.
There are no files selected for viewing
Binary file not shown.
This file was deleted.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| <?xml version="1.0"?> | ||
| <!-- Change the product version at every update --> | ||
| <?define ProductVersion = "0.1.4"?> | ||
| <!-- Do not change the ProductUpgradeCode --> | ||
| <?define ProductUpgradeCode = "ab67ea4c-d2c3-4729-95eb-0ba451da5db2"?> | ||
| <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> | ||
| <Product Id="*" UpgradeCode="$(var.ProductUpgradeCode)" | ||
| Name="Toast TK Agent" Version="$(var.ProductVersion)" Manufacturer="TalanLabs" Language="1033"> | ||
|
|
||
| <Package InstallerVersion="200" Compressed="yes" Comments="Windows Installer Package for Toast TK Agent" | ||
| InstallScope='perUser' InstallPrivileges='limited' /> | ||
|
|
||
| <Media Id="1" Cabinet="product.cab" EmbedCab="yes"/> | ||
| <Icon Id="ProductIcon" SourceFile="homeIcon.ico"/> | ||
| <Property Id="ARPPRODUCTICON" Value="ProductIcon"/> | ||
| <Property Id="ARPHELPLINK" Value="http://www.toast-tk.io"/> | ||
| <Property Id="ARPURLINFOABOUT" Value="http://www.toast-tk.io"/> | ||
| <Property Id="ARPNOREPAIR" Value="1"/> | ||
|
|
||
| <Upgrade Id="$(var.ProductUpgradeCode)"> | ||
| <UpgradeVersion Minimum="$(var.ProductVersion)" OnlyDetect="yes" Property="NEWERVERSIONDETECTED"/> | ||
| <UpgradeVersion Minimum="0.0.0" Maximum="$(var.ProductVersion)" IncludeMinimum="yes" IncludeMaximum="no" | ||
| Property="OLDERVERSIONBEINGUPGRADED"/> | ||
| </Upgrade> | ||
| <Condition Message="A newer version of this software is already installed.">NOT NEWERVERSIONDETECTED</Condition> | ||
|
|
||
| <SetDirectory Id="USER_DIRECTORY" Value="C:\Users\[%USERNAME]\" /> | ||
| <SetDirectory Id="TTK_DIRECTORY" Value="C:\Users\[%USERNAME]\.toast\" /> | ||
| <SetDirectory Id="JAVALOCATION" Value="C:\Users\[%USERNAME]\.toast\Java\" /> | ||
| <SetDirectory Id="DESKTOPLOCATION" Value="C:\Users\[%USERNAME]\Desktop\" /> | ||
|
|
||
| <Directory Id="TARGETDIR" Name="SourceDir"> | ||
|
|
||
| <!-- source file in the TTK directory --> | ||
| <Directory Id="TTK_DIRECTORY"> | ||
| <Component Id="ApplicationSourceFiles" Guid="651b4f52-9256-4e56-a0c6-b7aa69482f7c"> | ||
| <File Id="ServerKeystoreFile" Source="resources\server-keystore.jks"/> | ||
| <File Id="AgentStandAloneFile" Source="resources\agent-1.0-fat.jar"/> | ||
| <File Id="ChromeDriverFile" Source="resources\chromedriver.exe"/> | ||
| </Component> | ||
|
|
||
| <Directory Id="PLUGINSDIR" Name="plugins"> | ||
| <Component Id="Plugins" Guid="796bc79c-40de-49e4-a37e-8da82dc15e4a"> | ||
| <CreateFolder /> | ||
| </Component> | ||
| </Directory> | ||
|
|
||
| <Directory Id="JAVALOCATION"> | ||
| <Component Id="Java32" Guid="42d4915e-0ab4-4d8d-bae2-1c4fb0584d77"> | ||
| <File Id="Java32" Source="resources_x82\java.exe"/> | ||
| </Component> | ||
| <Component Id="Javaw32" Guid="26020919-EA4E-4286-BF8B-0C4916106361"> | ||
| <File Id="Javaw32" Source="resources_x82\javaw.exe"/> | ||
| </Component> | ||
| </Directory> | ||
| </Directory> | ||
|
|
||
| <!-- launcher files in the directory choosed --> | ||
| <Directory Id="USER_DIRECTORY"> | ||
| <Directory Id="INSTALLDIR" Name="ToastTK"> | ||
| <Component Id="ApplicationLauncherFiles32" Guid="d1707b51-3439-4cfe-8509-b44ea8ba5ab2"> | ||
| <File Id="runAgent32" Source="resources_x82\Toast-Agent.exe"/> | ||
| <File Id="readme32" Source="resources_x82\README.txt"/> | ||
| </Component> | ||
| </Directory> | ||
| </Directory> | ||
|
|
||
| <!-- start menu entry --> | ||
| <Directory Id="ProgramMenuFolder"> | ||
| <Directory Id="ProgramMenuSubfolder" Name="Agent"> | ||
| <Component Id="ApplicationShortcuts" Guid="f78509dc-4c1f-48b2-97da-04e6b55834ee"> | ||
| <RegistryValue Root="HKCU" Key="Software\ToastTk\ToastTk-Agent" | ||
| Name="installed" Type="integer" Value="1" KeyPath="yes"/> | ||
| <Shortcut Id="ApplicationShortcut1" Name="ToastTkAgentLauncher" Description="ToastTk-Agent" | ||
| Target="[INSTALLDIR]AgentLauncher.exe" WorkingDirectory="INSTALLDIR"/> | ||
| <Shortcut Id="ApplicationShortcut2" Name="ToastTkAgentLauncher" Description="ToastTk-Agent" | ||
| Target="[INSTALLDIR]README.txt" WorkingDirectory="INSTALLDIR"/> | ||
| <RemoveFolder Id="ProgramMenuSubfolder" On="uninstall"/> | ||
| </Component> | ||
| </Directory> | ||
| </Directory> | ||
|
|
||
| <!-- shortcut in the desktop --> | ||
| <Directory Id="DESKTOPLOCATION"> | ||
| <Component Id="ApplicationShortcut32" Guid="997C1109-D1F2-4583-9BBA-718EB60628E3"> | ||
| <Shortcut Id="ApplicationStartMenuShortcut32" | ||
| Name="Toast-Agent" | ||
| Description="Toast TK Web Agent" | ||
| Target="[#runAgent32]" | ||
| WorkingDirectory="ProgramMenuSubfolder"/> | ||
| <RegistryValue Root="HKCU" Key="Software\Microsoft\MyApplicationName" Name="installed" Type="integer" Value="1" KeyPath="yes"/> | ||
| </Component> | ||
| </Directory> | ||
| </Directory> | ||
|
|
||
| <!-- Proprety modification from WixUI_InstallDir --> | ||
| <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"/> | ||
| <UIRef Id="WixUI_InstallDir" /> | ||
|
|
||
| <InstallExecuteSequence> | ||
| <RemoveExistingProducts After="InstallValidate"/> | ||
| </InstallExecuteSequence> | ||
|
|
||
| <Feature Id="DefaultFeature" Level="1"> | ||
| <ComponentRef Id="Java32"/> | ||
| <ComponentRef Id="Javaw32"/> | ||
| <ComponentRef Id="ApplicationSourceFiles"/> | ||
| <ComponentRef Id="Plugins"/> | ||
| <ComponentRef Id="ApplicationLauncherFiles32"/> | ||
| <ComponentRef Id="ApplicationShortcut32"/> | ||
| <ComponentRef Id="ApplicationShortcuts"/> | ||
| </Feature> | ||
|
|
||
| </Product> | ||
| </Wix> |
Large diffs are not rendered by default.
Oops, something went wrong.
Binary file renamed
BIN
+402 KB
build/SetupAgent/AgentInstaller.wixpdb → build/SetupAgent/AgentInstaller_64.wixpdb
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.