modernize setup

This commit is contained in:
Jonathan Jenne
2019-06-28 11:50:03 +02:00
parent 2bd7ff9d2c
commit df2b0a6dd0
3 changed files with 215 additions and 162 deletions

10
SetupWix/Config.wxi Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Include>
<!-- TODO: Put your code here. -->
<?define ProgramName="Global_Indexer"?>
<?define ProductName="Global Indexer"?>
<?define Manufacturer="Digital Data"?>
<?define Description="Beschreibung des Programms"?>
<?define Comments="Kommentar wie Copyright-Hinweis"?>
<?define UpgradeCode="{930076B5-9D2B-455F-920F-9718ED091D0C}"?>
</Include>

View File

@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?> <?include Config.wxi?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"> xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
<Product Name="Global Indexer" Id="*" UpgradeCode="{930076B5-9D2B-455F-920F-9718ED091D0C}" Version="$(var.ProductVersion)" Manufacturer="Digital Data" Language="1031" Codepage="1252"> <Product Name="$(var.ProductName)" Id="*" UpgradeCode="{930076B5-9D2B-455F-920F-9718ED091D0C}" Version="$(var.ProductVersion)" Manufacturer="$(var.Manufacturer)" Language="1031" Codepage="1252">
<Package <Package
Id="*" Id="*"
Keywords="Installer" Keywords="Installer"
Description="Digital Data Global Indexer Setup" Description="$(var.Description)"
Comments="Global Indexer is a registered Trademark of Digital Data" Comments="$(var.Comments)"
Manufacturer="Digital Data" Manufacturer="$(var.Manufacturer)"
InstallerVersion="100" InstallerVersion="100"
Languages="1031" Languages="1031"
Compressed="yes" Compressed="yes"
@@ -35,7 +36,7 @@
/> />
<Property Id="PREVIOUSVERSIONSINSTALLED" Secure="yes" /> <Property Id="PREVIOUSVERSIONSINSTALLED" Secure="yes" />
<Upgrade Id="{930076B5-9D2B-455F-920F-9718ED091D0C}"> <Upgrade Id="$(var.UpgradeCode)">
<UpgradeVersion <UpgradeVersion
Minimum="1.0.0" Maximum="99.0.0" Minimum="1.0.0" Maximum="99.0.0"
Property="PREVIOUSVERSIONSINSTALLED" Property="PREVIOUSVERSIONSINSTALLED"
@@ -54,29 +55,47 @@
<RegistrySearch Key="Software\[Manufacturer]\[ProductName]" Root="HKCU" Type="raw" Id="APPLICATIONFOLDER_REGSEARCH" Name="Path" /> <RegistrySearch Key="Software\[Manufacturer]\[ProductName]" Root="HKCU" Type="raw" Id="APPLICATIONFOLDER_REGSEARCH" Name="Path" />
</Property> </Property>
<!-- Legt die Ordner Struktur fest -->
<Directory Id="TARGETDIR" Name="SourceDir"> <Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder" Name="Pfiles"> <Directory Id="ProgramFilesFolder">
<Directory Id="DD" Name="Digital Data"> <Directory Id="DDDIR" Name="$(var.Manufacturer)">
<!-- Speichert den Installationsort in der Registry --> <Directory Id="INSTALLDIR" Name="$(var.ProductName)"/>
<Component Id="RegistryEntries" Guid="57CCE36E-F152-4D17-81A0-CCAAEFA777A3"> </Directory>
<RegistryKey Root="HKCU" Key="Software\[Manufacturer]\[ProductName]"> </Directory>
<RegistryValue Type="string" Name="Path" Value="[INSTALLDIR]" KeyPath="yes" />
</RegistryKey> <Directory Id="ProgramMenuFolder">
<Directory Id="ApplicationProgramsFolder" Name="$(var.ProductName)"/>
</Directory>
<Directory Id="DesktopFolder" />
</Directory>
<DirectoryRef Id="ApplicationProgramsFolder">
<Component Id="ApplicationShortcut_StartMenu" Guid="f09edfce-71ac-4c79-ae46-8a5ae1a2b84c">
<Shortcut Id="ApplicationStartMenuShortcut_StartMenu"
Name="$(var.ProductName)"
Target="[INSTALLDIR]$(var.ProgramName).exe"
WorkingDirectory="INSTALLDIR"/>
<RemoveFolder Id="ApplicationProgramsFolder_StartMenu" On="uninstall"/>
<RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
</Component>
</DirectoryRef>
<DirectoryRef Id="DesktopFolder">
<Component Id="ApplicationShortcut_Desktop" Guid="e88a7cdb-00c7-4ecb-864e-d182e099eea2">
<Shortcut Id="ApplicationStartMenuShortcut_Desktop"
Name="$(var.ProductName)"
Target="[INSTALLDIR]$(var.ProgramName).exe"
WorkingDirectory="INSTALLDIR"/>
<RemoveFolder Id="ApplicationProgramsFolder_Desktop" On="uninstall"/>
<RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
</Component>
</DirectoryRef>
<DirectoryRef Id="INSTALLDIR">
<Component Id="MainApplicationExe" Guid="71B06048-F595-40CE-B429-79C2F2D6001B" KeyPath="yes">
<File Id="MainApplicationExe" Source="..\$(var.ProgramName)\bin\$(var.Configuration)\$(var.ProgramName).exe" Name="$(var.ProgramName).exe" KeyPath="no" Checksum="yes" />
</Component> </Component>
<!-- Das Installationsverzeichnis -->
<Directory Id="INSTALLDIR" Name="Global Indexer">
<!-- Die DD-Record-Organiser.exe und Shortcuts für Desktop und Startmenü -->
<Component Id="MainExecutable" Guid="EE8034F0-A2DE-4C38-A961-7F7668229416">
<File Id="GIEXE" Name="Global_Indexer.exe" Source="Global_Indexer.exe" KeyPath="yes">
<Shortcut Id="StartMenuShortcut" Directory="ProgramMenuDir" Name="Global Indexer" WorkingDirectory="INSTALLDIR" Icon="GlobalIndexer.exe" IconIndex="0" Advertise="yes" />
<Shortcut Id="DesktopShortcut" Directory="DesktopFolder" Name="Global Indexer" WorkingDirectory="INSTALLDIR" Icon="GlobalIndexer.exe" IconIndex="0" Advertise="yes" />
</File>
<!--Programmordner bei Deinstallation entfernen-->
<util:RemoveFolderEx Id="RemoveApplicationFolder" On="uninstall" Property="APPLICATIONFOLDER" />
</Component>
<!-- Die ReleaseNotes --> <!-- Die ReleaseNotes -->
<Component Id="ReleaseNotes" Guid="D1496E4D-98C2-4849-9914-DB47D47CC6BE"> <Component Id="ReleaseNotes" Guid="D1496E4D-98C2-4849-9914-DB47D47CC6BE">
<File Id="ReleaseNote" Name="Release Notes.txt" Source="P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DD_MODULE\DD GlobalIndexer\Release Notes.txt" KeyPath="yes"> <File Id="ReleaseNote" Name="Release Notes.txt" Source="P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DD_MODULE\DD GlobalIndexer\Release Notes.txt" KeyPath="yes">
@@ -128,6 +147,7 @@
<File Id="DevExpress.XtraTreeList.v15.2" Name="DevExpress.XtraTreeList.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraTreeList.v15.2.dll" KeyPath="no" /> <File Id="DevExpress.XtraTreeList.v15.2" Name="DevExpress.XtraTreeList.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraTreeList.v15.2.dll" KeyPath="no" />
<File Id="DevExpress.XtraLayout.v15.2" Name="DevExpress.XtraLayout.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraLayout.v15.2.dll" KeyPath="no" /> <File Id="DevExpress.XtraLayout.v15.2" Name="DevExpress.XtraLayout.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraLayout.v15.2.dll" KeyPath="no" />
</Component> </Component>
<!-- Lokalisierung für DEVEXPRESS Bibliotheken--> <!-- Lokalisierung für DEVEXPRESS Bibliotheken-->
<Directory Id="LOCALE_EN_US" Name="en-US"> <Directory Id="LOCALE_EN_US" Name="en-US">
<Component Id="GlobalIndexer.Locales.en_us" Guid="6FC6DC57-6D61-49EE-B490-CEE054BE911A"> <Component Id="GlobalIndexer.Locales.en_us" Guid="6FC6DC57-6D61-49EE-B490-CEE054BE911A">
@@ -188,27 +208,23 @@
<Component Id="Oracle" Guid="CF76DB5D-3263-450F-96C6-F02F5447A0A1"> <Component Id="Oracle" Guid="CF76DB5D-3263-450F-96C6-F02F5447A0A1">
<File Id="Oracle.ManagedDataAccess" Name="Oracle.ManagedDataAccess.dll" Source="Oracle.ManagedDataAccess.dll" KeyPath="yes" /> <File Id="Oracle.ManagedDataAccess" Name="Oracle.ManagedDataAccess.dll" Source="Oracle.ManagedDataAccess.dll" KeyPath="yes" />
</Component> </Component>
</Directory>
</Directory>
</Directory>
<!-- Startmenü Ordner --> <Component Id="RegistryKeys" Guid="92d8072d-172e-43e2-93e2-535715eb11ce">
<Directory Id="ProgramMenuFolder" Name="Programs"> <RegistryKey Root="HKLM" Key="Software">
<Directory Id="ProgramMenuDir" Name="Global Indexer"> <RegistryKey Key="[Manufacturer]">
<Component Id="ProgramMenuDir" Guid="5200DF59-FED6-4C5A-8393-90B8ED526432"> <RegistryKey Key="[ProductName]" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes" Id="REGKEYINSTALLDIR">
<RemoveFolder Id="ProgramMenuDir" On="uninstall" /> <RegistryValue Type="string" Value="[INSTALLDIR]" Name="Path" />
<RegistryValue Root="HKMU" Key="Software\[Manufacturer]\[ProductName]" Type="string" Value="" KeyPath="yes" /> </RegistryKey>
</RegistryKey>
</RegistryKey>
<util:RemoveFolderEx Id="RemoveApplicationFolder" On="uninstall" Property="APPLICATIONFOLDER" />
</Component> </Component>
</Directory> </DirectoryRef>
</Directory>
<!-- Desktop Ordner -->
<Directory Id="DesktopFolder" Name="Desktop" />
</Directory>
<!-- Installierte Features --> <!-- Installierte Features -->
<Feature Id="Complete" Level="1"> <Feature Id="Complete" Title="Main Application" Level="1">
<ComponentRef Id="MainExecutable" /> <ComponentRef Id="MainApplicationExe" />
<ComponentRef Id="ReleaseNotes"/> <ComponentRef Id="ReleaseNotes"/>
<ComponentRef Id="WindreamLibs" /> <ComponentRef Id="WindreamLibs" />
<ComponentRef Id="DDLibs" /> <ComponentRef Id="DDLibs" />
@@ -216,22 +232,32 @@
<ComponentRef Id="Microsoft.Office" /> <ComponentRef Id="Microsoft.Office" />
<ComponentRef Id="Oracle" /> <ComponentRef Id="Oracle" />
<ComponentRef Id="DevExpressLibs" /> <ComponentRef Id="DevExpressLibs" />
<ComponentRef Id="ProgramMenuDir"/> <ComponentRef Id="RegistryKeys"/>
<ComponentRef Id="RegistryEntries"/>
<ComponentRef Id="ApplicationIco"/> <ComponentRef Id="ApplicationIco"/>
<ComponentRef Id="GlobalIndexer.Locales.de" /> <ComponentRef Id="GlobalIndexer.Locales.de" />
<ComponentRef Id="GlobalIndexer.Locales.en"/> <ComponentRef Id="GlobalIndexer.Locales.en"/>
<ComponentRef Id="GlobalIndexer.Locales.en_us" /> <ComponentRef Id="GlobalIndexer.Locales.en_us" />
<ComponentRef Id="Scheduler.Locales" /> <ComponentRef Id="Scheduler.Locales" />
</Feature>
<Feature Id="DesktopShortcut" Title="Desktop Shortcut">
<Condition Level="0">DISABLE_DESKTOP_ICON</Condition>
<ComponentRef Id="ApplicationShortcut_Desktop"/>
</Feature>
<Feature Id="StartmenuShortcut" Title="Startmenu Shortcut">
<Condition Level="0">DISABLE_STARTMENU_ICON</Condition>
<ComponentRef Id="ApplicationShortcut_StartMenu" />
</Feature> </Feature>
<!-- Legt das Standard-Installationsverzeichnis fest--> <!-- Legt das Standard-Installationsverzeichnis fest-->
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" /> <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
<Property Id="_BrowseProperty" Value="INSTALLDIR" />
<!-- OBERFLÄCHE --> <!-- OBERFLÄCHE -->
<UI> <UI>
<UIRef Id="WixUI_InstallDir" /> <!--<UIRef Id="WixUI_InstallDir" />-->
<UIRef Id="WixUI_FeatureTree"/>
<UIRef Id="WixUI_ErrorProgressText" /> <UIRef Id="WixUI_ErrorProgressText" />
<Publish Dialog="WelcomeDlg" <Publish Dialog="WelcomeDlg"
Control="Next" Control="Next"
@@ -243,7 +269,21 @@
Event="NewDialog" Event="NewDialog"
Value="WelcomeDlg" Value="WelcomeDlg"
Order="2">1</Publish> Order="2">1</Publish>
<Publish Dialog="InstallDirDlg"
Control="Next"
Event="NewDialog"
Value="FeaturesDlg"
Order="2">1</Publish>
<Publish Dialog="InstallDirDlg"
Control="ChangeFolder"
Event="NewDialog"
Value="BrowseDlg"
Order="2">1</Publish>
<Publish Dialog="FeaturesDlg"
Control="Back"
Event="NewDialog"
Value="InstallDirDlg"
Order="2">1</Publish>
</UI> </UI>
<!-- OBERFLÄCHE END -->
</Product> </Product>
</Wix> </Wix>

View File

@@ -39,6 +39,9 @@
<Name>WixUIExtension</Name> <Name>WixUIExtension</Name>
</WixExtension> </WixExtension>
</ItemGroup> </ItemGroup>
<ItemGroup>
<Content Include="Config.wxi" />
</ItemGroup>
<Import Project="$(WixTargetsPath)" /> <Import Project="$(WixTargetsPath)" />
<!-- <!--
To modify your build process, add your task inside one of the targets below and uncomment it. To modify your build process, add your task inside one of the targets below and uncomment it.