AppStd/FileFlow
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jj 29.02.2016 Installer fixen

Browse Source
This commit is contained in:
JenneJ
2016-02-29 12:41:26 +01:00
parent b0a74d2e94
commit 515e65ffec
3 changed files with 49 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Global_Indexer/Global_Indexer.vbproj
View File

@@ -81,14 +81,14 @@
<Reference Include="DevExpress.XtraTreeList.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DLLLicenseManager, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Bibliotheken\DLL\DLLLicenseManager.dll</HintPath>
<HintPath>P:\Visual Studio Projekte\Bibliotheken\DLLLicenseManager.dll</HintPath>
</Reference>
<Reference Include="Independentsoft.Msg, Version=2.0.140.29929, Culture=neutral, PublicKeyToken=76be97fe952f1ec7, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\Independentsoft.Msg.dll</HintPath>
</Reference>
<Reference Include="Interop.WINDREAMLib">
<HintPath>..\..\..\Bibliotheken\DLL\windreamDLL\64bit\Interop.WINDREAMLib.dll</HintPath>
<HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll</HintPath>
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
<Reference Include="Interop.WMOTOOLLib">

71
SetupWix/Product.wxs
View File

@@ -33,7 +33,7 @@
<!-- UPGRADE END -->
<!-- Legt das Icon fest -->
<Icon Id="GlobalIndexer.exe" SourceFile="E:\SchreiberM\Visual Studio\GIT\GlobalIndexer\Global_Indexer\bin\Debug\Global_Indexer.exe" />
<Icon Id="GlobalIndexer.exe" SourceFile="$(var.Global_Indexer.TargetPath)" />
<!-- Zeige Icon in Systemsteuerung > Programme entfernen -->
<Property Id="ARPPRODUCTICON" Value="GlobalIndexer.exe" />
@@ -59,7 +59,7 @@
<!-- 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="E:\SchreiberM\Visual Studio\GIT\GlobalIndexer\Global_Indexer\bin\Debug\Global_Indexer.exe" KeyPath="yes">
<File Id="GIEXE" Name="Global_Indexer.exe" Source="$(var.Global_Indexer.TargetDir)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>
@@ -79,10 +79,10 @@
<!--WINDREAM Bibliotheken-->
<Component Id="WindreamLibs" Guid="4D11FC99-50D9-4E54-B18A-8885C9112646">
<File Id="WINDREAMLibDLL" Name="Interop.WINDREAMLib.dll" Source="E:\SchreiberM\Visual Studio\Bibliotheken\DLL\windreamDLL\64bit\Interop.WINDREAMLib.dll" KeyPath="yes" />
<File Id="WINDREAMLibDLL" Name="Interop.WINDREAMLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll" KeyPath="yes" />
<File Id="WMOTOOLLib" Name="Interop.WMOTOOLLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll" KeyPath="no" />
<File Id="WMOBRWSLib" Name="Interop.WMOBRWSLib.dll" Source="E:\SchreiberM\Visual Studio\GIT\GlobalIndexer\Global_Indexer\obj\Debug\Interop.WMOBRWSLib.dll" KeyPath="no" />
<File Id="WMOSRCHLib" Name="Interop.WMOSRCHLib.dll" Source="E:\SchreiberM\Visual Studio\GIT\GlobalIndexer\Global_Indexer\obj\Debug\Interop.WMOSRCHLib.dll" KeyPath="no" />
<File Id="WMOBRWSLib" Name="Interop.WMOBRWSLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOBRWSLib.dll" KeyPath="no" />
<File Id="WMOSRCHLib" Name="Interop.WMOSRCHLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOSRCHLib.dll" KeyPath="no" />
</Component>
<!-- MAIL.NET Bibliothek -->
@@ -116,48 +116,48 @@
<File Id="DevExpress.XtraSpreadsheet.v15.1" Name="DevExpress.XtraSpreadsheet.v15.1.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\DevExpress.XtraSpreadsheet.v15.1.dll" KeyPath="no" />
<File Id="DevExpress.XtraTreeList.v15.1" Name="DevExpress.XtraTreeList.v15.1.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\DevExpress.XtraTreeList.v15.1.dll" KeyPath="no" />
</Component>
<!-- Lokalisierung für DEVEXPRESS Bibliotheken-->
<Directory Id="LOCALE_EN_US" Name="en-US">
<Component Id="GlobalIndexer.Locales.en_us" Guid="6FC6DC57-6D61-49EE-B490-CEE054BE911A">
<File Id="Global_Indexer.resources.en_us" Name="Global_Indexer.resources.dll" Source="en-US\Global_Indexer.resources.dll"></File>
<File Id="Global_Indexer.resources.en_us" Name="Global_Indexer.resources.dll" Source="$(var.Global_Indexer.TargetDir)en-US\Global_Indexer.resources.dll"></File>
</Component>
</Directory>
<Directory Id="LOCALE_DE" Name="de">
<Component Id="GlobalIndexer.Locales.de" Guid="9E7F8C29-44DF-4D38-AD7B-D64B74990CDB">
<File Id="Global_Indexer.resources.de" Name="Global_Indexer.resources.dll" Source="de-DE\Global_Indexer.resources.dll"></File>
<Directory Id="LOCALE_DE" Name="de-DE">
<Component Id="GlobalIndexer.Locales.de_de" Guid="9E7F8C29-44DF-4D38-AD7B-D64B74990CDB">
<File Id="Global_Indexer.resources.de_de" Name="Global_Indexer.resources.dll" Source="$(var.Global_Indexer.TargetDir)de-DE\Global_Indexer.resources.dll"></File>
</Component>
<Component Id="Scheduler.Locales" Guid="84335DB2-F5D2-496B-9318-2BD1B1ACA391">
<File Id="DevExpress.Charts.v15.1.Core.resources" Name="DevExpress.Charts.v15.1.Core.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\DevExpress.Charts.v15.1.Core.dll" KeyPath="yes" />
<File Id="DevExpress.Data.v15.1.resources" Name="DevExpress.Data.v15.1.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\DevExpress.Data.v15.1.dll" KeyPath="no" />
<File Id="DevExpress.DataAccess.v15.1.resources" Name="DevExpress.DataAccess.v15.1.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\DevExpress.DataAccess.v15.1.dll" KeyPath="no" />
<File Id="DevExpress.DataAccess.v15.1..resources" Name="DevExpress.DataAccess.v15.1.UI.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\DevExpress.DataAccess.v15.1.UI.dll" KeyPath="no" />
<File Id="DevExpress.Office.v15.1.Core.resources" Name="DevExpress.Office.v15.1.Core.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\DevExpress.Office.v15.1.Core.dll" KeyPath="no"/>
<File Id="DevExpress.Pdf.v15.1.Core.resources" Name="DevExpress.Pdf.v15.1.Core.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\DevExpress.Pdf.v15.1.Core.dll" KeyPath="no"/>
<File Id="DevExpress.Pdf.v15.1.Drawing.resources" Name="DevExpress.Pdf.v15.1.Drawing.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\DevExpress.Pdf.v15.1.Drawing.dll" KeyPath="no" />
<File Id="DevExpress.Printing.v15.1.Core.resources" Name="DevExpress.Printing.v15.1.Core.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\DevExpress.Printing.v15.1.Core.dll" KeyPath="no" />
<File Id="DevExpress.RichEdit.v15.1.Core.resources" Name="DevExpress.RichEdit.v15.1.Core.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\DevExpress.RichEdit.v15.1.Core.dll" KeyPath="no" />
<File Id="DevExpress.Sparkline.v15.1.Core.resources" Name="DevExpress.Sparkline.v15.1.Core.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\DevExpress.Sparkline.v15.1.Core.dll" KeyPath="no" />
<File Id="DevExpress.Spreadsheet.v15.1.Core.resources" Name="DevExpress.Spreadsheet.v15.1.Core.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\DevExpress.Spreadsheet.v15.1.Core.dll" KeyPath="no" />
<File Id="DevExpress.Utils.v15.1.resources" Name="DevExpress.Utils.v15.1.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\DevExpress.Utils.v15.1.dll" KeyPath="no" />
<File Id="DevExpress.Utils.v15.1.UI.resources" Name="DevExpress.Utils.v15.1.UI.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\DevExpress.Utils.v15.1.UI.dll" KeyPath="no" />
<File Id="DevExpress.XtraCharts.v15.1.resources" Name="DevExpress.XtraCharts.v15.1.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\DevExpress.XtraCharts.v15.1.dll" KeyPath="no" />
<File Id="DevExpress.XtraBars.v15.1.resources" Name="DevExpress.XtraBars.v15.1.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\DevExpress.XtraBars.v15.1.dll" KeyPath="no" />
<File Id="DevExpress.XtraEditors.v15.1.resources" Name="DevExpress.XtraEditors.v15.1.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\DevExpress.XtraEditors.v15.1.dll" KeyPath="no" />
<File Id="DevExpress.XtraGrid.v15.1.resources" Name="DevExpress.XtraGrid.v15.1.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\DevExpress.XtraGrid.v15.1.dll" KeyPath="no" />
<File Id="DevExpress.XtraNavBar.v15.1.resources" Name="DevExpress.XtraNavBar.v15.1.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\DevExpress.XtraNavBar.v15.1.dll" KeyPath="no" />
<File Id="DevExpress.XtraPdfViewer.v15.1.resources" Name="DevExpress.XtraPdfViewer.v15.1.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\DevExpress.XtraPdfViewer.v15.1.dll" KeyPath="no" />
<File Id="DevExpress.XtraPrinting.v15.1.resources" Name="DevExpress.XtraPrinting.v15.1.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\DevExpress.XtraPrinting.v15.1.dll" KeyPath="no" />
<File Id="DevExpress.XtraRichEdit.v15.1.resources" Name="DevExpress.XtraRichEdit.v15.1.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\DevExpress.XtraRichEdit.v15.1.dll" KeyPath="no" />
<File Id="DevExpress.XtraSpreadsheet.v15.1.resources" Name="DevExpress.XtraSpreadsheet.v15.1.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\DevExpress.XtraSpreadsheet.v15.1.dll" KeyPath="no" />
<File Id="DevExpress.XtraTreeList.v15.1.resources" Name="DevExpress.XtraTreeList.v15.1.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\DevExpress.XtraTreeList.v15.1.dll" KeyPath="no" />
<Component Id="DevExpress.Locales.de_de" Guid="84335DB2-F5D2-496B-9318-2BD1B1ACA391">
<File Id="DevExpress.Charts.Designer.v15.1.resources" Name="DevExpress.Charts.Designer.v15.1.resources.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\de\DevExpress.Charts.Designer.v15.1.resources.dll" KeyPath="yes" />
<File Id="DevExpress.Data.v15.1.resources" Name="DevExpress.Data.v15.1.resources.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\de\DevExpress.Data.v15.1.resources.dll" KeyPath="no" />
<File Id="DevExpress.DataAccess.v15.1.resources" Name="DevExpress.DataAccess.v15.1.resources.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\de\DevExpress.DataAccess.v15.1.resources.dll" KeyPath="no" />
<File Id="DevExpress.DataAccess.v15.1..resources" Name="DevExpress.DataAccess.v15.1.UI.resources.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\de\DevExpress.DataAccess.v15.1.UI.resources.dll" KeyPath="no" />
<File Id="DevExpress.Office.v15.1.Core.resources" Name="DevExpress.Office.v15.1.Core.resources.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\de\DevExpress.Office.v15.1.Core.resources.dll" KeyPath="no"/>
<File Id="DevExpress.Pdf.v15.1.Core.resources" Name="DevExpress.Pdf.v15.1.Core.resources.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\de\DevExpress.Pdf.v15.1.Core.resources.dll" KeyPath="no"/>
<File Id="DevExpress.Printing.v15.1.Core.resources" Name="DevExpress.Printing.v15.1.Core.resources.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\de\DevExpress.Printing.v15.1.Core.resources.dll" KeyPath="no" />
<File Id="DevExpress.RichEdit.v15.1.Core.resources" Name="DevExpress.RichEdit.v15.1.Core.resources.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\de\DevExpress.RichEdit.v15.1.Core.resources.dll" KeyPath="no" />
<File Id="DevExpress.Sparkline.v15.1.Core.resources" Name="DevExpress.Sparkline.v15.1.Core.resources.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\de\DevExpress.Sparkline.v15.1.Core.resources.dll" KeyPath="no" />
<File Id="DevExpress.Spreadsheet.v15.1.Core.resources" Name="DevExpress.Spreadsheet.v15.1.Core.resources.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\de\DevExpress.Spreadsheet.v15.1.Core.resources.dll" KeyPath="no" />
<File Id="DevExpress.Utils.v15.1.resources" Name="DevExpress.Utils.v15.1.resources.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\de\DevExpress.Utils.v15.1.resources.dll" KeyPath="no" />
<File Id="DevExpress.Utils.v15.1.UI.resources" Name="DevExpress.Utils.v15.1.UI.resources.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\de\DevExpress.Utils.v15.1.UI.resources.dll" KeyPath="no" />
<File Id="DevExpress.XtraCharts.v15.1.resources" Name="DevExpress.XtraCharts.v15.1.resources.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\de\DevExpress.XtraCharts.v15.1.resources.dll" KeyPath="no" />
<File Id="DevExpress.XtraBars.v15.1.resources" Name="DevExpress.XtraBars.v15.1.resources.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\de\DevExpress.XtraBars.v15.1.resources.dll" KeyPath="no" />
<File Id="DevExpress.XtraEditors.v15.1.resources" Name="DevExpress.XtraEditors.v15.1.resources.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\de\DevExpress.XtraEditors.v15.1.resources.dll" KeyPath="no" />
<File Id="DevExpress.XtraGrid.v15.1.resources" Name="DevExpress.XtraGrid.v15.1.resources.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\de\DevExpress.XtraGrid.v15.1.resources.dll" KeyPath="no" />
<File Id="DevExpress.XtraNavBar.v15.1.resources" Name="DevExpress.XtraNavBar.v15.1.resources.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\de\DevExpress.XtraNavBar.v15.1.resources.dll" KeyPath="no" />
<File Id="DevExpress.XtraPdfViewer.v15.1.resources" Name="DevExpress.XtraPdfViewer.v15.1.resources.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\de\DevExpress.XtraPdfViewer.v15.1.resources.dll" KeyPath="no" />
<File Id="DevExpress.XtraPrinting.v15.1.resources" Name="DevExpress.XtraPrinting.v15.1.resources.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\de\DevExpress.XtraPrinting.v15.1.resources.dll" KeyPath="no" />
<File Id="DevExpress.XtraRichEdit.v15.1.resources" Name="DevExpress.XtraRichEdit.v15.1.resources.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\de\DevExpress.XtraRichEdit.v15.1.resources.dll" KeyPath="no" />
<File Id="DevExpress.XtraSpreadsheet.v15.1.resources" Name="DevExpress.XtraSpreadsheet.v15.1.resources.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\de\DevExpress.XtraSpreadsheet.v15.1.resources.dll" KeyPath="no" />
<File Id="DevExpress.XtraTreeList.v15.1.resources" Name="DevExpress.XtraTreeList.v15.1.resources.dll" Source="D:\Programme\Sprachen\DevExpress 15.1\Components\Bin\Framework\de\DevExpress.XtraTreeList.v15.1.resources.dll" KeyPath="no" />
</Component>
</Directory>
<!-- Digital-Data DLLS -->
<Component Id="DDLibs" Guid="BA2979E3-3778-48B8-B0D8-4B77825B9293">
<File Id="DLLLicenseManager" Name="DLLLicenseManager.dll" Source="E:\SchreiberM\Visual Studio\Kunden - Produktiv\PROCESSMANAGER\DD-ProcessManagerWindream\DD_PM_WINDREAM\DD_PM_WINDREAM\bin\Debug\DLLLicenseManager.dll" KeyPath="yes" />
<File Id="DLLLicenseManager" Name="DLLLicenseManager.dll" Source="P:\Visual Studio Projekte\Bibliotheken\DLLLicenseManager.dll" KeyPath="yes" />
</Component>
<!-- Office-Bibliotheken -->
@@ -201,6 +201,9 @@
<ComponentRef Id="ProgramMenuDir"/>
<ComponentRef Id="RegistryEntries"/>
<ComponentRef Id="ApplicationIco"/>
<ComponentRef Id="GlobalIndexer.Locales.en_us"/>
<ComponentRef Id="GlobalIndexer.Locales.de_de"/>
<ComponentRef Id="DevExpress.Locales.de_de"/>
</Feature>
<!-- Legt das Standard-Installationsverzeichnis fest-->

10
SetupWix/SetupWix.wixproj
View File

@@ -33,6 +33,16 @@
<Name>WixUIExtension</Name>
</WixExtension>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Global_Indexer\Global_Indexer.vbproj">
<Name>Global_Indexer</Name>
<Project>{7474b1d2-49a4-4d12-b544-c8674d3f7231}</Project>
<Private>True</Private>
<DoNotHarvest>True</DoNotHarvest>
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference>
</ItemGroup>
<Import Project="$(WixTargetsPath)" />
<!--
To modify your build process, add your task inside one of the targets below and uncomment it.