MS20072015_1

2015-07-20 13:28:46 +02:00
parent 7f0028d22c
commit e715df0477
28 changed files with 442 additions and 228 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.2.4.0" Manufacturer="Digital Data" Language="1031" Codepage="1252">
+  <Product Name="Global Indexer" Id="*" UpgradeCode="{930076B5-9D2B-455F-920F-9718ED091D0C}" Version="1.7.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! -->
@@ -33,7 +33,7 @@
    <!-- UPGRADE END -->

    <!-- Legt das Icon fest -->
-    <Icon Id="GlobalIndexer.exe" SourceFile="Global_Indexer.exe" />
+    <Icon Id="GlobalIndexer.exe" SourceFile="E:\SchreiberM\Visual Studio\GIT\GlobalIndexer\Global_Indexer\bin\Debug\Global_Indexer.exe" />

    <!-- Zeige Icon in Systemsteuerung > Programme entfernen -->
    <Property Id="ARPPRODUCTICON" Value="GlobalIndexer.exe" />
@@ -56,48 +56,77 @@
          </Component>

          <!-- Das Installationsverzeichnis -->
-          <Directory Id="INSTALLDIR" Name="Global Indexer 1.0">
+          <Directory Id="INSTALLDIR" Name="Global Indexer">

            <!-- Die DD-Record-Organiser.exe und Shortcuts für Desktop und Startmenü -->
-            <Component Id="MainExecutable" Guid="9CC5D446-F056-4A09-995D-9DF53A7F0E38">
-              <File Id="GIEXE" Name="Global_Indexer.exe" Source="Global_Indexer.exe" KeyPath="yes">
+            <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">
                <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 -->
+            <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\GlobalIndexer\Release Notes.txt" KeyPath="yes">
+              </File>
+            </Component>

-            <!-- WINDREAM Bibliotheken -->
+             <!--WINDREAM Bibliotheken--> 
            <Component Id="WindreamLibs" Guid="4D11FC99-50D9-4E54-B18A-8885C9112646">
-              <File Id="INDEXLibDLL" Name="AxInterop.INDEXLib.dll" Source="AxInterop.INDEXLib.dll" KeyPath="yes" />
-              <File Id="AxOBJECTLISTCONTROLLibDLL" Name="AxInterop.OBJECTLISTCONTROLLib.dll" Source="AxInterop.OBJECTLISTCONTROLLib.dll" KeyPath="no" />
-              <File Id="OBJECTLISTCONTROLLibDDL" Name="Interop.OBJECTLISTCONTROLLib.dll" Source="Interop.OBJECTLISTCONTROLLib.dll" KeyPath="no" />
-              <File Id="WINDREAMLibDLL" Name="Interop.WINDREAMLib.dll" Source="Interop.WINDREAMLib.dll" KeyPath="no" />
+              <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" />
+              <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" />
            </Component>

            <!-- MAIL.NET Bibliothek -->
            <Component Id="IndependentsoftLibs" Guid="C3B3BB48-DB41-4419-A4B8-0E4DC5E8856B">
-              <File Id="MSGLib" Name="Independentsoft.Msg.dll" Source="Independentsoft.Msg.dll" KeyPath="yes" />
+              <File Id="MSGLib" Name="Independentsoft.Msg.dll" Source="\\dd-sto01\DD-STO01-A2\Projekte\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\Independentsoft.Msg.dll" KeyPath="yes" />
            </Component>

            <!-- DEVEXPRESS Bibliotheken -->
            <Component Id="DevExpressLibs" Guid="CB40DAAE-348E-4BD3-B275-9A526EB8F191">
-              <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="yes" />
-              <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" />
-              <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" />
-              <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" />
-              <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" />
-              <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" />
-              <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" />
-              <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" />
-              <File Id="DevExpress.XtraLayout.v14.2" Name="DevExpress.XtraLayout.v14.2.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.XtraLayout.v14.2.dll" />
-              <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" />
-              <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" />
-              <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" />
-              <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" />
-              <File Id="DevExpress.XtraVerticalGrid.v14.2" Name="DevExpress.XtraVerticalGrid.v14.2.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.XtraVerticalGrid.v14.2.dll" />
-              <File Id="DevExpress.XtraWizard.v14.2" Name="DevExpress.XtraWizard.v14.2.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.XtraWizard.v14.2.dll" />
+              <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" />
+            </Component>
+            
+             <!-- 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" />
+            </Component>
+            
+           <!-- Office-Bibliotheken -->
+            <Component Id="Microsoft.Office" Guid="D600FF38-E549-4CBA-BB33-09B0BD0C8C26">
+              <File Id="Office" Name="Office.dll" Source="C:\Windows\assembly\GAC_MSIL\Office\15.0.0.0__71e9bce111e9429c\Office.dll" KeyPath="yes" />
+              <File Id="Microsoft.Office.Interop.Outlook" Name="Microsoft.Office.Interop.Outlook.dll" Source="C:\Windows\assembly\GAC_MSIL\Microsoft.Office.Interop.Outlook\15.0.0.0__71e9bce111e9429c\Microsoft.Office.Interop.Outlook.dll" KeyPath="no" />
+            </Component>
+          
+           <!-- Oracle-Bibliothek -->
+            <Component Id="Oracle" Guid="CF76DB5D-3263-450F-96C6-F02F5447A0A1">
+              <File Id="Oracle.ManagedDataAccess" Name="Oracle.ManagedDataAccess.dll" Source="D:\Programme\DB\Oracle\ora12.1\Client\ODP.NET\managed\common\Oracle.ManagedDataAccess.dll" KeyPath="yes" />
            </Component>
          </Directory>
        </Directory>
@@ -122,10 +151,12 @@
    <!-- Installierte Features -->
    <Feature Id="Complete" Level="1">
      <ComponentRef Id="MainExecutable" />
+      <ComponentRef Id="ReleaseNotes"/>
      <ComponentRef Id="WindreamLibs" />
      <ComponentRef Id="DDLibs" />
      <ComponentRef Id="IndependentsoftLibs" />
-      <ComponentRef Id="Scheduler.Locales" />
+      <ComponentRef Id="Microsoft.Office" />
+      <ComponentRef Id="Oracle" />
      <ComponentRef Id="DevExpressLibs" />
      <ComponentRef Id="ProgramMenuDir"/>
      <ComponentRef Id="RegistryEntries"/>
--- a/SetupWix/SetupWix.wixproj
+++ b/SetupWix/SetupWix.wixproj
@@ -6,7 +6,7 @@
    <ProductVersion>3.8</ProductVersion>
    <ProjectGuid>5bf6646d-6f46-45e5-8806-8783f030f311</ProjectGuid>
    <SchemaVersion>2.0</SchemaVersion>
-    <OutputName>SetupWix</OutputName>
+    <OutputName>GlobalIndexer</OutputName>
    <OutputType>Package</OutputType>
    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
@@ -23,6 +23,16 @@
  <ItemGroup>
    <Compile Include="Product.wxs" />
  </ItemGroup>
+  <ItemGroup>
+    <WixExtension Include="WixUtilExtension">
+      <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
+      <Name>WixUtilExtension</Name>
+    </WixExtension>
+    <WixExtension Include="WixUIExtension">
+      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
+      <Name>WixUIExtension</Name>
+    </WixExtension>
+  </ItemGroup>
  <Import Project="$(WixTargetsPath)" />
  <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.