MS24112015

2015-11-24 11:13:04 +01:00
parent 80247e18dd
commit ad1308fe18
47 changed files with 5379 additions and 1570 deletions
--- a/SetupWix/Product.wxs
+++ b/SetupWix/Product.wxs
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-  <Product Name="Global Indexer" Id="*" UpgradeCode="{930076B5-9D2B-455F-920F-9718ED091D0C}" Version="1.7.7.0" Manufacturer="Digital Data" Language="1031" Codepage="1252">
+  <Product Name="Global Indexer" Id="*" UpgradeCode="{930076B5-9D2B-455F-920F-9718ED091D0C}" Version="1.9.0.0" Manufacturer="Digital Data" Language="1031" Codepage="1252">
    <Package Id="*" Keywords="Installer" Description="Digital Data Global Indexer Setup" Comments="Global Indexer is a registered Trademark of Digital Data" Manufacturer="Digital Data" InstallerVersion="100" Languages="1031" Compressed="yes" SummaryCodepage="1252"/>

    <!-- Nicht entfernen! -->
@@ -71,8 +71,13 @@
              <File Id="ReleaseNote" Name="Release Notes.txt" Source="P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DD_MODULE\GlobalIndexer\Release Notes.txt" KeyPath="yes">
              </File>
            </Component>
+            <!-- Die ApplicationIco -->
+            <Component Id="ApplicationIco" Guid="5C2EEA18-0718-41E9-A8C6-38D3C622921B">
+              <File Id="ApplicationIco" Name="DD_Icons_ICO_GLOBIX_128.ico" Source="S:\DIGITAL DATA\DIGITAL DATA - Produkte\ico\DD_Icons_ICO_GLOBIX_128.ico" KeyPath="yes">
+              </File>
+            </Component>

-             <!--WINDREAM Bibliotheken--> 
+            <!--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="WMOTOOLLib" Name="Interop.WMOTOOLLib.dll" Source="\\dd-sto01\DD-STO01-A2\Projekte\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll" KeyPath="no" />
@@ -87,29 +92,29 @@

            <!-- DEVEXPRESS Bibliotheken -->
            <Component Id="DevExpressLibs" Guid="CB40DAAE-348E-4BD3-B275-9A526EB8F191">
-              <File Id="DevExpress.Charts.v14.2.Core" Name="DevExpress.Charts.v14.2.Core.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.Charts.v14.2.Core.dll" KeyPath="yes" />
-              <File Id="DevExpress.Data.v14.2" Name="DevExpress.Data.v14.2.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.Data.v14.2.dll" KeyPath="no" />
-              <File Id="DevExpress.DataAccess.v14.2" Name="DevExpress.DataAccess.v14.2.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.DataAccess.v14.2.dll" KeyPath="no" />
-              <File Id="DevExpress.DataAccess.v14.2.UI.dll" Name="DevExpress.DataAccess.v14.2.UI.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.DataAccess.v14.2.UI.dll" KeyPath="no" />
-              <File Id="DevExpress.Office.v14.2.Core" Name="DevExpress.Office.v14.2.Core.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.Office.v14.2.Core.dll" KeyPath="no"/>
-              <File Id="DevExpress.Pdf.v14.2.Core" Name="DevExpress.Pdf.v14.2.Core.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.Pdf.v14.2.Core.dll" KeyPath="no"/>
-              <File Id="DevExpress.Pdf.v14.2.Drawing" Name="DevExpress.Pdf.v14.2.Drawing.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.Pdf.v14.2.Drawing.dll" KeyPath="no" />
-              <File Id="DevExpress.Printing.v14.2.Core" Name="DevExpress.Printing.v14.2.Core.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.Printing.v14.2.Core.dll" KeyPath="no" />
-              <File Id="DevExpress.RichEdit.v14.2.Core" Name="DevExpress.RichEdit.v14.2.Core.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.RichEdit.v14.2.Core.dll" KeyPath="no" />
-              <File Id="DevExpress.Sparkline.v14.2.Core" Name="DevExpress.Sparkline.v14.2.Core.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.Sparkline.v14.2.Core.dll" KeyPath="no" />
-              <File Id="DevExpress.Spreadsheet.v14.2.Core" Name="DevExpress.Spreadsheet.v14.2.Core.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.Spreadsheet.v14.2.Core.dll" KeyPath="no" />
-              <File Id="DevExpress.Utils.v14.2" Name="DevExpress.Utils.v14.2.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.Utils.v14.2.dll" KeyPath="no" />
-              <File Id="DevExpress.Utils.v14.2.UI" Name="DevExpress.Utils.v14.2.UI.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.Utils.v14.2.UI.dll" KeyPath="no" />
-              <File Id="DevExpress.XtraCharts.v14.2" Name="DevExpress.XtraCharts.v14.2.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.XtraCharts.v14.2.dll" KeyPath="no" />
-              <File Id="DevExpress.XtraBars.v14.2" Name="DevExpress.XtraBars.v14.2.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.XtraBars.v14.2.dll" KeyPath="no" />
-              <File Id="DevExpress.XtraEditors.v14.2" Name="DevExpress.XtraEditors.v14.2.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.XtraEditors.v14.2.dll" KeyPath="no" />
-              <File Id="DevExpress.XtraGrid.v14.2" Name="DevExpress.XtraGrid.v14.2.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.XtraGrid.v14.2.dll" KeyPath="no" />
-              <File Id="DevExpress.XtraNavBar.v14.2" Name="DevExpress.XtraNavBar.v14.2.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.XtraNavBar.v14.2.dll" KeyPath="no" />
-              <File Id="DevExpress.XtraPdfViewer.v14.2" Name="DevExpress.XtraPdfViewer.v14.2.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.XtraPdfViewer.v14.2.dll" KeyPath="no" />
-              <File Id="DevExpress.XtraPrinting.v14.2" Name="DevExpress.XtraPrinting.v14.2.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.XtraPrinting.v14.2.dll" KeyPath="no" />
-              <File Id="DevExpress.XtraRichEdit.v14.2" Name="DevExpress.XtraRichEdit.v14.2.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.XtraRichEdit.v14.2.dll" KeyPath="no" />
-              <File Id="DevExpress.XtraSpreadsheet.v14.2" Name="DevExpress.XtraSpreadsheet.v14.2.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.XtraSpreadsheet.v14.2.dll" KeyPath="no" />
-              <File Id="DevExpress.XtraTreeList.v14.2" Name="DevExpress.XtraTreeList.v14.2.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.XtraTreeList.v14.2.dll" KeyPath="no" />
+              <File Id="DevExpress.Charts.v15.1.Core" 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" 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" 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.UI.dll" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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>
            
             <!-- Digital-Data DLLS -->
@@ -157,6 +162,7 @@
      <ComponentRef Id="DevExpressLibs" />
      <ComponentRef Id="ProgramMenuDir"/>
      <ComponentRef Id="RegistryEntries"/>
+      <ComponentRef Id="ApplicationIco"/>
    </Feature>

    <!-- Legt das Standard-Installationsverzeichnis fest-->