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

Merge branch 'master' of http://SchreiberM@172.24.11.74:90/scm/git/RecordOrganizer

Browse Source
This commit is contained in:
SchreiberM
2017-02-02 17:13:23 +01:00
parent 20da19c9b0 ee5908a3de
commit f3c8415aa6
2 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/SetupWiX/Product.wxs
View File

@@ -87,6 +87,15 @@
</Component>
</Directory>
<Directory Id="VERSIONCHECKER" Name="VERSION_CHECKER">
<Component Id="RecordOrganizer_VersionChecker" Guid="37D17685-E588-4BC6-A15E-570DE749852A">
<File Id="VERSION_CHECKER.exe" Name="VERSION_CHECKER.exe" Source="VERSION_CHECKER.exe" />
<File Id="DD_LIB_Standards.dll" Name="DD_LIB_Standards.dll" Source="DD_LIB_Standards.dll" />
</Component>
</Directory>
</Directory>
<!-- Die DD-Record-Organizer.exe und Shortcuts für Desktop und Startmenü -->
@@ -104,12 +113,12 @@
<!-- 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="E:\SchreiberM\Visual Studio\GIT\DD3rdPartyLibs\Windream\Interop.OBJECTLISTCONTROLLib.dll" KeyPath="no" />
<File Id="WINDREAMLibDLL" Name="Interop.WINDREAMLib.dll" Source="Interop.WINDREAMLib.dll" KeyPath="no" />
<File Id="WMOTOOLLib" Name="Interop.WMOTOOLLib.dll" Source="E:\SchreiberM\Visual Studio\GIT\DD3rdPartyLibs\Windream\Interop.WMOTOOLLib.dll" KeyPath="no" />
<File Id="WMOBRWSLib" Name="Interop.WMOBRWSLib.dll" Source="E:\SchreiberM\Visual Studio\GIT\DD3rdPartyLibs\Windream\Interop.WMOBRWSLib.dll" KeyPath="no" />
<File Id="WMOSRCHLib" Name="Interop.WMOSRCHLib.dll" Source="E:\SchreiberM\Visual Studio\GIT\DD3rdPartyLibs\Windream\Interop.WMOSRCHLib.dll" KeyPath="no" />
<File Id="AxOBJECTLISTCONTROLLibDLL" Name="AxInterop.OBJECTLISTCONTROLLib.dll" Source="..\..\..\..\..\DD3rdPartyLibs\Windream\AxInterop.OBJECTLISTCONTROLLib.dll" KeyPath="no" />
<File Id="OBJECTLISTCONTROLLibDLL" Name="Interop.OBJECTLISTCONTROLLib.dll" Source="..\..\..\..\..\DD3rdPartyLibs\Windream\Interop.OBJECTLISTCONTROLLib.dll" KeyPath="no" />
<File Id="WINDREAMLibDLL" Name="Interop.WINDREAMLib.dll" Source="..\..\..\..\..\DD3rdPartyLibs\Windream\Interop.WINDREAMLib.dll" KeyPath="no" />
<File Id="WMOTOOLLib" Name="Interop.WMOTOOLLib.dll" Source="..\..\..\..\..\DD3rdPartyLibs\Windream\Interop.WMOTOOLLib.dll" KeyPath="no" />
<File Id="WMOBRWSLib" Name="Interop.WMOBRWSLib.dll" Source="..\..\..\..\..\DD3rdPartyLibs\Windream\Interop.WMOBRWSLib.dll" KeyPath="no" />
<File Id="WMOSRCHLib" Name="Interop.WMOSRCHLib.dll" Source="..\..\..\..\..\DD3rdPartyLibs\Windream\Interop.WMOSRCHLib.dll" KeyPath="no" />
</Component>
<!-- Oracle-Bibliothek -->
@@ -126,8 +135,8 @@
<Component Id="DDLibs" Guid="BA2979E3-3778-48B8-B0D8-4B77825B9293">
<File Id="SnapPanelLib" Name="SnapPanelControl.dll" Source="SnapPanelControl.dll" KeyPath="yes" />
<File Id="DLLLicenseManager" Name="DLLLicenseManager.dll" Source="DLLLicenseManager.dll" KeyPath="no" />
<File Id="DD_Rights" Name="DD_Rights.dll" Source="E:\SchreiberM\Visual Studio\GIT\DDLibraries\app\DD_Libraries\bin\Debug\DD_Rights.dll" KeyPath="no" />
<File Id="DD_LIB_Standards" Name="DD_LIB_Standards.dll" Source="E:\SchreiberM\Visual Studio\GIT\DDLibStandards\DD_LIB_Standards\bin\Debug\DD_LIB_Standards.dll" KeyPath="no" />
<File Id="DD_Rights" Name="DD_Rights.dll" Source="DD_Rights.dll" KeyPath="no" />
<File Id="DD_LIB_Standards" Name="DD_LIB_Standards.dll" Source="DD_LIB_Standards.dll" KeyPath="no" />
</Component>
<!-- DD Bibliotheken -->
@@ -280,6 +289,7 @@
<ComponentRef Id="Commandline" />
<ComponentRef Id="ERPConnectLibs" />
<ComponentRef Id="RecordOrganizer_RightManager"/>
<ComponentRef Id="RecordOrganizer_VersionChecker" />
</Feature>
<!-- Legt das Standard-Installationsverzeichnis fest-->

5
app/SetupWiX/SetupWiX.wixproj
View File

@@ -17,7 +17,10 @@
<OutputPath>bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
<DefineConstants>Debug</DefineConstants>
<LinkerAdditionalOptions>-b "$(SolutionDir)DD-Record-Organiser\bin\$(Configuration)" -b "$(SolutionDir)RecordOrganizer_RightManager\bin\$(Configuration)" -cultures:de-DE,en-GB,en-US</LinkerAdditionalOptions>
<LinkerAdditionalOptions>-b "$(SolutionDir)DD-Record-Organiser\bin\$(Configuration)"
-b "$(SolutionDir)RecordOrganizer_RightManager\bin\$(Configuration)"
-b "$(SolutionDir)VERSION_CHECKER\bin\$(Configuration)"
-cultures:de-DE,en-US</LinkerAdditionalOptions>
<CompilerAdditionalOptions>
</CompilerAdditionalOptions>
</PropertyGroup>