Skip to content
Snippets Groups Projects
Commit eaf409d6 authored by Andreas Traczyk's avatar Andreas Traczyk
Browse files

msi-installer: reformat xml 

Switches formatter to one not dependant on JDK
- https://github.com/DotJoshJohnson/vscode-xml
- {
      "xmlTools.xmlFormatterImplementation": "v2",
      "xmlTools.splitAttributesOnFormat": true,
  }

Gitlab: #1453
Gitlab: #1865
Change-Id: I82e65d3097ac366f7873ac4c0e1d5beed3ee486e
parent 42e3eeab
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
JamiInstaller/JamiInstaller.wax
+ 2
− 1
View file @ eaf409d6
<?xml version="1.0" encoding="utf-16"?> <?xml version="1.0" encoding="utf-16"?>
<Configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> <Configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<DeployedProjects /> <DeployedProjects />
<DirectoryMappings /> <DirectoryMappings />
<FileMappings /> <FileMappings />
......
JamiInstaller/Localization.wxl
+ 10
− 2
View file @ eaf409d6
...@@ -2,6 +2,14 @@ ...@@ -2,6 +2,14 @@
<WixLocalization Culture="en-us" <WixLocalization Culture="en-us"
xmlns="http://schemas.microsoft.com/wix/2006/localization"> xmlns="http://schemas.microsoft.com/wix/2006/localization">
<String Id="AdvancedWelcomeEulaDlgDescriptionPerMachine">By installing this software you agree to the terms in the license agreement</String> <String Id="AdvancedWelcomeEulaDlgDescriptionPerMachine">By installing this software you agree to the terms in the license agreement</String>
<UI Dialog="ExitDialog" Control="OptionalCheckBox" Width="10" Height="10" X="135" Y="110" /> <UI Dialog="ExitDialog"
<UI Dialog="ExitDialog" Control="OptionalText" X="150" Y="110" /> Control="OptionalCheckBox"
Width="10"
Height="10"
X="135"
Y="110" />
<UI Dialog="ExitDialog"
Control="OptionalText"
X="150"
Y="110" />
</WixLocalization> </WixLocalization>
JamiInstaller/Product.wxs
+ 212
− 83
View file @ eaf409d6
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?include Config.wxi?> <?include Config.wxi?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="*" Name="$(var.Name)" Language="1033" Version="$(fun.AutoVersion(1.0))" Manufacturer="$(var.Manufacturer)" UpgradeCode="7c45b52b-0390-4fe8-947a-3f13e82dd346"> <Product Id="*"
<Package InstallerVersion="301" Compressed="yes" InstallScope="perMachine" /> Name="$(var.Name)"
Language="1033"
Version="$(fun.AutoVersion(1.0))"
Manufacturer="$(var.Manufacturer)"
UpgradeCode="7c45b52b-0390-4fe8-947a-3f13e82dd346">
<Package InstallerVersion="301"
Compressed="yes"
InstallScope="perMachine" />
<MajorUpgrade Schedule="afterInstallInitialize" AllowDowngrades="yes"/> <MajorUpgrade Schedule="afterInstallInitialize"
<MediaTemplate EmbedCab="yes" CompressionLevel="high" MaximumUncompressedMediaSize="4" /> AllowDowngrades="yes"/>
<MediaTemplate EmbedCab="yes"
CompressionLevel="high"
MaximumUncompressedMediaSize="4" />
<!--Disables interaction of the package with the Restart Manager.--> <!--Disables interaction of the package with the Restart Manager.-->
<Property Id="MSIRESTARTMANAGERCONTROL" Value="Disable" /> <Property Id="MSIRESTARTMANAGERCONTROL"
Value="Disable" />
<!--Icon File should be in release folder(not wix project), otherwise cannot be read--> <!--Icon File should be in release folder(not wix project), otherwise cannot be read-->
<Icon Id="icon.ico" SourceFile="$(var.ReleaseDir)\jami.ico" /> <Icon Id="icon.ico"
<Property Id="ARPPRODUCTICON" Value="icon.ico" /> SourceFile="$(var.ReleaseDir)\jami.ico" />
<Property Id="ARPNOMODIFY" Value="1" /> <Property Id="ARPPRODUCTICON"
Value="icon.ico" />
<Property Id="ARPNOMODIFY"
Value="1" />
<!-- It seems that QtWebEngineProcess.exe versioning requires us to force reinstall. --> <!-- It seems that QtWebEngineProcess.exe versioning requires us to force reinstall. -->
<Property Id="REINSTALLMODE" Value="dms" /> <Property Id="REINSTALLMODE"
Value="dms" />
<Feature Id="ProductFeature" Title="Main" Level="1" Absent="disallow"> <Feature Id="ProductFeature"
<ComponentGroupRef Id="MainExecutable" Primary="yes" /> Title="Main"
Level="1"
Absent="disallow">
<ComponentGroupRef Id="MainExecutable"
Primary="yes" />
<ComponentGroupRef Id="HeatGenerated" /> <ComponentGroupRef Id="HeatGenerated" />
<ComponentRef Id="ApplicationShortcutDesktop" /> <ComponentRef Id="ApplicationShortcutDesktop" />
<ComponentRef Id="ApplicationShortcutStartMenu" /> <ComponentRef Id="ApplicationShortcutStartMenu" />
...@@ -29,37 +48,61 @@ ...@@ -29,37 +48,61 @@
<!--Visual C++ Redist merge module--> <!--Visual C++ Redist merge module-->
<DirectoryRef Id="TARGETDIR"> <DirectoryRef Id="TARGETDIR">
<Merge Id="VCRedist" SourceFile="$(env.VCRedistMergeModule)" DiskId="1" Language="0" /> <Merge Id="VCRedist"
SourceFile="$(env.VCRedistMergeModule)"
DiskId="1"
Language="0" />
</DirectoryRef> </DirectoryRef>
<Feature Id="VCRedist" Title="Visual C++ Runtime" AllowAdvertise="no" Display="hidden" Level="1"> <Feature Id="VCRedist"
Title="Visual C++ Runtime"
AllowAdvertise="no"
Display="hidden"
Level="1">
<MergeRef Id="VCRedist"/> <MergeRef Id="VCRedist"/>
</Feature> </Feature>
<SetProperty After="FindRelatedProducts" Id="FirstInstall" Value="true"> <SetProperty After="FindRelatedProducts"
Id="FirstInstall"
Value="true">
NOT Installed AND NOT WIX_UPGRADE_DETECTED AND NOT WIX_DOWNGRADE_DETECTED NOT Installed AND NOT WIX_UPGRADE_DETECTED AND NOT WIX_DOWNGRADE_DETECTED
</SetProperty> </SetProperty>
<SetProperty After="SetFirstInstall" Id="Upgrading" Value="true"> <SetProperty After="SetFirstInstall"
Id="Upgrading"
Value="true">
WIX_UPGRADE_DETECTED AND NOT (REMOVE="ALL") WIX_UPGRADE_DETECTED AND NOT (REMOVE="ALL")
</SetProperty> </SetProperty>
<SetProperty After="RemoveExistingProducts" Id="RemovingForUpgrade" Sequence="execute" Value="true"> <SetProperty After="RemoveExistingProducts"
(REMOVE="ALL") AND UPGRADINGPRODUCTCODE Id="RemovingForUpgrade"
Sequence="execute"
Value="true"> (REMOVE="ALL") AND UPGRADINGPRODUCTCODE
</SetProperty> </SetProperty>
<SetProperty After="SetUpgrading" Id="Uninstalling" Value="true"> <SetProperty After="SetUpgrading"
Id="Uninstalling"
Value="true">
Installed AND (REMOVE="ALL") AND NOT (WIX_UPGRADE_DETECTED OR UPGRADINGPRODUCTCODE) Installed AND (REMOVE="ALL") AND NOT (WIX_UPGRADE_DETECTED OR UPGRADINGPRODUCTCODE)
</SetProperty> </SetProperty>
<SetProperty After="SetUninstalling" Id="Maintenance" Value="true"> <SetProperty After="SetUninstalling"
Id="Maintenance"
Value="true">
Installed AND NOT Upgrading AND NOT Uninstalling AND NOT UPGRADINGPRODUCTCODE Installed AND NOT Upgrading AND NOT Uninstalling AND NOT UPGRADINGPRODUCTCODE
</SetProperty> </SetProperty>
<!--SetDirectory of APPLICATIONFOLDER --> <!--SetDirectory of APPLICATIONFOLDER -->
<SetDirectory Id="APPLICATIONFOLDER" Value="[ProgramFiles64Folder][ApplicationFolderName]">APPLICATIONFOLDER=""</SetDirectory> <SetDirectory Id="APPLICATIONFOLDER"
<SetProperty Id="ARPINSTALLLOCATION" Value="[APPLICATIONFOLDER]" After="CostFinalize" /> Value="[ProgramFiles64Folder][ApplicationFolderName]">APPLICATIONFOLDER=""</SetDirectory>
<SetProperty Id="ARPINSTALLLOCATION"
Value="[APPLICATIONFOLDER]"
After="CostFinalize" />
<UIRef Id="CustomUI" /> <UIRef Id="CustomUI" />
<WixVariable Id="WixUIInfoIcon" Value="icon.ico"/> <WixVariable Id="WixUIInfoIcon"
<WixVariable Id="WixUIBannerBmp" Value="top-banner.bmp" /> Value="icon.ico"/>
<WixVariable Id="WixUIDialogBmp" Value="main-banner.bmp" /> <WixVariable Id="WixUIBannerBmp"
<WixVariable Id="WixUISupportPerUser" Value="0" /> Value="top-banner.bmp" />
<WixVariable Id="WixUIDialogBmp"
Value="main-banner.bmp" />
<WixVariable Id="WixUISupportPerUser"
Value="0" />
<CustomAction Id="RemoveOldJamiFiles" <CustomAction Id="RemoveOldJamiFiles"
Directory="APPLICATIONFOLDER" Directory="APPLICATIONFOLDER"
...@@ -79,15 +122,19 @@ ...@@ -79,15 +122,19 @@
</Product> </Product>
<Fragment Id="DirectoryStructure"> <Fragment Id="DirectoryStructure">
<Directory Id="TARGETDIR" Name="SourceDir"> <Directory Id="TARGETDIR"
Name="SourceDir">
<Directory Id="ProgramFiles64Folder"> <Directory Id="ProgramFiles64Folder">
<Directory Id="APPLICATIONFOLDER" Name="$(var.Name)" /> <Directory Id="APPLICATIONFOLDER"
Name="$(var.Name)" />
</Directory> </Directory>
<Directory Id="DesktopFolder" Name="Desktop" /> <Directory Id="DesktopFolder"
Name="Desktop" />
<Directory Id="ProgramMenuFolder"> <Directory Id="ProgramMenuFolder">
<Directory Id="ApplicationProgramsFolder" /> <Directory Id="ApplicationProgramsFolder" />
</Directory> </Directory>
<Directory Id="WindowsFolder" Name="WINDOWS"/> <Directory Id="WindowsFolder"
Name="WINDOWS"/>
</Directory> </Directory>
</Fragment> </Fragment>
...@@ -105,42 +152,83 @@ ...@@ -105,42 +152,83 @@
<Fragment Id="Shortcuts"> <Fragment Id="Shortcuts">
<DirectoryRef Id="DesktopFolder"> <DirectoryRef Id="DesktopFolder">
<Component Id="ApplicationShortcutDesktop" Guid="*" Win64="yes"> <Component Id="ApplicationShortcutDesktop"
<Shortcut Id="ApplicationShortcutDesktop" Name="$(var.Name)" Description="Launch $(var.Name)" Target="[#fileMain.exe]" WorkingDirectory="INSTALLFOLDER" /> Guid="*"
<RemoveFolder Id="DesktopFolder" On="uninstall" /> Win64="yes">
<RegistryValue Root="HKCU" Key="Software\jami.net\$(var.Name)" Name="desktop" Type="integer" Value="1" KeyPath="yes" /> <Shortcut Id="ApplicationShortcutDesktop"
Name="$(var.Name)"
Description="Launch $(var.Name)"
Target="[#fileMain.exe]"
WorkingDirectory="INSTALLFOLDER" />
<RemoveFolder Id="DesktopFolder"
On="uninstall" />
<RegistryValue Root="HKCU"
Key="Software\jami.net\$(var.Name)"
Name="desktop"
Type="integer"
Value="1"
KeyPath="yes" />
<Condition>FirstInstall</Condition> <Condition>FirstInstall</Condition>
</Component> </Component>
</DirectoryRef> </DirectoryRef>
<DirectoryRef Id="ApplicationProgramsFolder"> <DirectoryRef Id="ApplicationProgramsFolder">
<Component Id="ApplicationShortcutStartMenu" Guid="*" Win64="yes"> <Component Id="ApplicationShortcutStartMenu"
<Shortcut Id="ApplicationShortcutStartMenu" Name="$(var.Name)" Description="Launch $(var.Name)" Target="[#fileMain.exe]" WorkingDirectory="INSTALLFOLDER" /> Guid="*"
<RemoveFolder Id="StartMenuFolder" On="uninstall" /> Win64="yes">
<RegistryValue Root="HKCU" Key="Software\jami.net\$(var.Name)" Name="startmenu" Type="integer" Value="1" KeyPath="yes" /> <Shortcut Id="ApplicationShortcutStartMenu"
Name="$(var.Name)"
Description="Launch $(var.Name)"
Target="[#fileMain.exe]"
WorkingDirectory="INSTALLFOLDER" />
<RemoveFolder Id="StartMenuFolder"
On="uninstall" />
<RegistryValue Root="HKCU"
Key="Software\jami.net\$(var.Name)"
Name="startmenu"
Type="integer"
Value="1"
KeyPath="yes" />
</Component> </Component>
</DirectoryRef> </DirectoryRef>
</Fragment> </Fragment>
<Fragment Id="OtherRegistryEntries"> <Fragment Id="OtherRegistryEntries">
<DirectoryRef Id="TARGETDIR"> <DirectoryRef Id="TARGETDIR">
<Component Id="RegistryEntries" Guid="*" Win64="yes"> <Component Id="RegistryEntries"
<RegistryValue Root="HKCU" Key="Software\jami.net\$(var.AppName)" Name="hasRun" Type="integer" Value="0" KeyPath="yes" /> Guid="*"
Win64="yes">
<RegistryValue Root="HKCU"
Key="Software\jami.net\$(var.AppName)"
Name="hasRun"
Type="integer"
Value="0"
KeyPath="yes" />
</Component> </Component>
</DirectoryRef> </DirectoryRef>
</Fragment> </Fragment>
<Fragment Id="URLProtocol"> <Fragment Id="URLProtocol">
<DirectoryRef Id="TARGETDIR"> <DirectoryRef Id="TARGETDIR">
<Component Id="URLProtocolRegistryEntries" Guid="*" Win64="yes"> <Component Id="URLProtocolRegistryEntries"
<RegistryKey Root="HKCR" Key="jami" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes"> Guid="*"
<RegistryValue Type="string" Name="URL Protocol" Value="" /> Win64="yes">
<RegistryValue Type="string" Value="URL:jami"/> <RegistryKey Root="HKCR"
Key="jami"
ForceCreateOnInstall="yes"
ForceDeleteOnUninstall="yes">
<RegistryValue Type="string"
Name="URL Protocol"
Value="" />
<RegistryValue Type="string"
Value="URL:jami"/>
<RegistryKey Key="DefaultIcon"> <RegistryKey Key="DefaultIcon">
<RegistryValue Type="string" Value="[APPLICATIONFOLDER]$(var.ExeName).exe" /> <RegistryValue Type="string"
Value="[APPLICATIONFOLDER]$(var.ExeName).exe" />
</RegistryKey> </RegistryKey>
<RegistryKey Key="shell\open\command"> <RegistryKey Key="shell\open\command">
<RegistryValue Type="string" Value='"[APPLICATIONFOLDER]$(var.ExeName).exe" "%1"' /> <RegistryValue Type="string"
Value='"[APPLICATIONFOLDER]$(var.ExeName).exe" "%1"' />
</RegistryKey> </RegistryKey>
</RegistryKey> </RegistryKey>
</Component> </Component>
...@@ -149,47 +237,88 @@ ...@@ -149,47 +237,88 @@
<Fragment Id="UI"> <Fragment Id="UI">
<UI Id="CustomUI"> <UI Id="CustomUI">
<Property Id="WixAppFolder" Value="WixPerMachineFolder" /> <Property Id="WixAppFolder"
Value="WixPerMachineFolder" />
<!--APPLICATIONFOLDER required by WixUI_Advanced, ApplicationFolderName reset APPLICATIONFOLDER path--> <!--APPLICATIONFOLDER required by WixUI_Advanced, ApplicationFolderName reset APPLICATIONFOLDER path-->
<Property Id="ApplicationFolderName" Value="$(var.Manufacturer)\$(var.AppName)" /> <Property Id="ApplicationFolderName"
Value="$(var.Manufacturer)\$(var.AppName)" />
<UIRef Id="WixUI_Advanced" /> <UIRef Id="WixUI_Advanced" />
<!--Remove User Exit Dialog--> <!--Remove User Exit Dialog-->
<Publish Dialog="AdvancedWelcomeEulaDlg" Control="Cancel" Property="AbortInstall" Value="1">1</Publish> <Publish Dialog="AdvancedWelcomeEulaDlg"
<Publish Dialog="InstallDirDlg" Control="Cancel" Property="AbortInstall" Value="1">1</Publish> Control="Cancel"
<Publish Dialog="FeaturesDlg" Control="Cancel" Property="AbortInstall" Value="1">1</Publish> Property="AbortInstall"
<Publish Dialog="MaintenanceWelcomeDlg" Control="Cancel" Property="AbortInstall" Value="1">1</Publish> Value="1">1</Publish>
<Publish Dialog="MaintenanceTypeDlg" Control="Cancel" Property="AbortInstall" Value="1">1</Publish> <Publish Dialog="InstallDirDlg"
Control="Cancel"
Property="AbortInstall"
Value="1">1</Publish>
<Publish Dialog="FeaturesDlg"
Control="Cancel"
Property="AbortInstall"
Value="1">1</Publish>
<Publish Dialog="MaintenanceWelcomeDlg"
Control="Cancel"
Property="AbortInstall"
Value="1">1</Publish>
<Publish Dialog="MaintenanceTypeDlg"
Control="Cancel"
Property="AbortInstall"
Value="1">1</Publish>
<!--Launch Program If Checkbox is clicked--> <!--Launch Program If Checkbox is clicked-->
<Publish Dialog="ExitDialog" Control="Finish" Event="DoAction" Value="LaunchApplication">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish> <Publish Dialog="ExitDialog"
Control="Finish"
Event="DoAction"
Value="LaunchApplication">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish>
<InstallUISequence> <InstallUISequence>
<Show Dialog="UserExit" OnExit="cancel">NOT AbortInstall = 1</Show> <Show Dialog="UserExit"
<Custom Action="Overwrite_WixSetDefaultPerMachineFolder" After="WixSetDefaultPerMachineFolder" /> OnExit="cancel">NOT AbortInstall = 1</Show>
<Custom Action="Overwrite_WixSetDefaultPerMachineFolder"
After="WixSetDefaultPerMachineFolder" />
</InstallUISequence> </InstallUISequence>
</UI> </UI>
<InstallExecuteSequence> <InstallExecuteSequence>
<Custom Action='TerminateAppProcess' Before='InstallValidate'/> <Custom Action='TerminateAppProcess'
<Custom Action="RemoveOldJamiFiles" After="RemoveFiles" /> Before='InstallValidate'/>
<Custom Action="LaunchApplication_nonUI" After="InstallFinalize"> WIXNONUILAUNCH </Custom> <Custom Action="RemoveOldJamiFiles"
<Custom Action="Overwrite_WixSetDefaultPerMachineFolder" After="WixSetDefaultPerMachineFolder" /> After="RemoveFiles" />
<Custom Action="LaunchApplication_nonUI"
After="InstallFinalize"> WIXNONUILAUNCH </Custom>
<Custom Action="Overwrite_WixSetDefaultPerMachineFolder"
After="WixSetDefaultPerMachineFolder" />
</InstallExecuteSequence> </InstallExecuteSequence>
<!--License check box text, Launch check box text (auto check)--> <!--License check box text, Launch check box text (auto check)-->
<Property Id="WIXUI_EXITDIALOGOPTIONALTEXT" Value="Launch $(var.Name)" /> <Property Id="WIXUI_EXITDIALOGOPTIONALTEXT"
<Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Launch $(var.Name)" /> Value="Launch $(var.Name)" />
<Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT"
Value="Launch $(var.Name)" />
<!--CheckBox Default Set to One--> <!--CheckBox Default Set to One-->
<Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOX" Value="1"/> <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOX"
<Property Id="LicenseAccepted" Value="1"/> Value="1"/>
<Property Id="LicenseAccepted"
Value="1"/>
<Property Id="WixShellExecTarget" Value="[#fileMain.exe]" /> <Property Id="WixShellExecTarget"
<CustomAction Id="LaunchApplication" BinaryKey="WixCA" DllEntry="WixShellExec" Impersonate="yes" /> Value="[#fileMain.exe]" />
<CustomAction Id="LaunchApplication_nonUI" BinaryKey="WixCA" DllEntry="WixShellExec" Impersonate="yes"/> <CustomAction Id="LaunchApplication"
<CustomAction Id="Overwrite_WixSetDefaultPerMachineFolder" Property="WixPerMachineFolder" Value="[ProgramFiles64Folder][ApplicationFolderName]" Execute="immediate" /> BinaryKey="WixCA"
DllEntry="WixShellExec"
Impersonate="yes" />
<CustomAction Id="LaunchApplication_nonUI"
BinaryKey="WixCA"
DllEntry="WixShellExec"
Impersonate="yes"/>
<CustomAction Id="Overwrite_WixSetDefaultPerMachineFolder"
Property="WixPerMachineFolder"
Value="[ProgramFiles64Folder][ApplicationFolderName]"
Execute="immediate" />
<!--License File--> <!--License File-->
<WixVariable Id="WixUILicenseRtf" Value="$(var.ReleaseDir)\License.rtf"/> <WixVariable Id="WixUILicenseRtf"
Value="$(var.ReleaseDir)\License.rtf"/>
</Fragment> </Fragment>
</Wix> </Wix>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment