pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Aga.Controls now builds into the SharpDevelop/bin folder so it can be shared by the Class Diagram and the Debugger addin. Updated the installer to reflect this change. 

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@2402 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Matt Ward 19 years ago
parent
a885b558f3
commit
c0cd7a201c
3 changed files with 40 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      src/Libraries/TreeViewAdv/Aga.Controls/Aga.Controls.csproj
  2. 22
      src/Setup/Files.wxs
  3. 6
      src/Setup/Setup.wxs

24
src/Libraries/TreeViewAdv/Aga.Controls/Aga.Controls.csproj
Unescape View File

@ -19,12 +19,14 @@
</SccProvider> </SccProvider>
<SignAssembly>true</SignAssembly> <SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<NoStdLib>False</NoStdLib>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType> <DebugType>Full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath> <OutputPath>..\..\..\..\bin\</OutputPath>
<DefineConstants>TRACE;DEBUG;PERF_TEST</DefineConstants> <DefineConstants>TRACE;DEBUG;PERF_TEST</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
@ -32,13 +34,27 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType> <DebugType>PdbOnly</DebugType>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath> <OutputPath>..\..\..\..\bin\</OutputPath>
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DebugSymbols>false</DebugSymbols>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
<RegisterForComInterop>False</RegisterForComInterop>
<GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
<BaseAddress>4194304</BaseAddress>
<PlatformTarget>AnyCPU</PlatformTarget>
<FileAlignment>4096</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <Reference Include="System" />

22
src/Setup/Files.wxs
Unescape View File

@ -494,6 +494,9 @@
</Directory> </Directory>
</Directory> </Directory>
</Directory> </Directory>
<Component Guid="3730EF42-5257-4EB2-9DA1-57151E5EB5A3" Id="AgaControlsDll" DiskId="1">
<File Source="..\..\bin\Aga.Controls.dll" Name="AGACON.DLL" Id="Aga.Controls.dll" LongName="Aga.Controls.dll" Assembly=".net" AssemblyApplication="Aga.Controls.dll" AssemblyManifest="Aga.Controls.dll" KeyPath="yes" />
</Component>
</Directory> </Directory>
<Directory Id="DocFolder" Name="doc"> <Directory Id="DocFolder" Name="doc">
<Component Guid="370DE542-C4A9-48DA-ACF8-09949CDCD808" Id="SharpDevelopDocFiles" DiskId="1"> <Component Guid="370DE542-C4A9-48DA-ACF8-09949CDCD808" Id="SharpDevelopDocFiles" DiskId="1">
@ -973,13 +976,18 @@
<File Source="..\..\AddIns\AddIns\DisplayBindings\ClassDiagram\Resources\Bitmaps.resources" Name="BITMAPS.RES" Id="Bitmaps.resources" LongName="Bitmaps.resources" /> <File Source="..\..\AddIns\AddIns\DisplayBindings\ClassDiagram\Resources\Bitmaps.resources" Name="BITMAPS.RES" Id="Bitmaps.resources" LongName="Bitmaps.resources" />
</Component> </Component>
</Directory> </Directory>
<Component Guid="EC3D2661-177C-4059-90BF-1BB838F0A335" Id="ClassDiagramFiles" DiskId="1"> <Component Guid="A8619065-03F6-4AF0-A1F2-81D5C810D8A3" Id="ClassDiagramAddInFiles" DiskId="1">
<File Source="..\..\AddIns\AddIns\DisplayBindings\ClassDiagram\Aga.Controls.dll" Name="Aga.dll" Id="ClassDiagram.Aga.Controls.dll" LongName="Aga.Controls.dll" /> <File Source="..\..\AddIns\AddIns\DisplayBindings\ClassDiagram\ClassDiagramAddin.addin" Name="CLASSD.ADD" Id="ClassDiagram.ClassDiagramAddin.addin" LongName="ClassDiagramAddin.addin" />
<File Source="..\..\AddIns\AddIns\DisplayBindings\ClassDiagram\ClassCanvas.dll" Name="CLASSC_1.DLL" Id="ClassCanvas.dll" LongName="ClassCanvas.dll" /> <File Source="..\..\AddIns\AddIns\DisplayBindings\ClassDiagram\ClassDiagramAddin.dll" Name="CLSADDIN.DLL" Id="ClassDiagram.ClassDiagramAddin.dll" LongName="ClassDiagramAddin.dll" Assembly=".net" AssemblyApplication="ClassDiagram.ClassDiagramAddin.dll" AssemblyManifest="ClassDiagram.ClassDiagramAddin.dll" KeyPath="yes" />
<File Source="..\..\AddIns\AddIns\DisplayBindings\ClassDiagram\ClassDiagramAddin.addin" Name="CLASSD_1.ADD" Id="ClassDiagramAddin.addin" LongName="ClassDiagramAddin.addin" /> </Component>
<File Source="..\..\AddIns\AddIns\DisplayBindings\ClassDiagram\ClassDiagramAddin.dll" Name="CLASSD_1.DLL" Id="ClassDiagramAddin.dll" LongName="ClassDiagramAddin.dll" /> <Component Guid="5F09F966-5605-4381-B346-8231DA0B1C6B" Id="ClassCanvasDll" DiskId="1">
<File Source="..\..\AddIns\AddIns\DisplayBindings\ClassDiagram\ClassEditor.dll" Name="CLASSE_1.DLL" Id="ClassEditor.dll" LongName="ClassEditor.dll" /> <File Source="..\..\AddIns\AddIns\DisplayBindings\ClassDiagram\ClassCanvas.dll" Name="CLSCANV.DLL" Id="ClassDiagram.ClassCanvas.dll" LongName="ClassCanvas.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="ClassDiagram.ClassCanvas.dll" AssemblyManifest="ClassDiagram.ClassCanvas.dll" />
<File Source="..\..\AddIns\AddIns\DisplayBindings\ClassDiagram\Diagrams.dll" Name="Diagrams.dll" Id="Diagrams.dll" /> </Component>
<Component Guid="C315C474-B72D-4B12-8BB9-545E3A34DA59" Id="ClassEditorDll" DiskId="1">
<File Source="..\..\AddIns\AddIns\DisplayBindings\ClassDiagram\ClassEditor.dll" Name="CLSEDIT..DLL" Id="ClassDiagram.ClassEditor.dll" LongName="ClassEditor.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="ClassDiagram.ClassEditor.dll" AssemblyManifest="ClassDiagram.ClassEditor.dll" />
</Component>
<Component Guid="EF2B150B-B0C4-4884-800C-BE904E520CF4" Id="DiagramsDll" DiskId="1">
<File Source="..\..\AddIns\AddIns\DisplayBindings\ClassDiagram\Diagrams.dll" Name="Diagrams.dll" Id="ClassDiagram.Diagrams.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="ClassDiagram.Diagrams.dll" AssemblyManifest="ClassDiagram.Diagrams.dll" />
</Component> </Component>
</Directory> </Directory>
</Directory> </Directory>

6
src/Setup/Setup.wxs
Unescape View File

@ -178,6 +178,7 @@
<ComponentRef Id="ICSharpCodeSharpDevelopWidgets"/> <ComponentRef Id="ICSharpCodeSharpDevelopWidgets"/>
<ComponentRef Id="ICSharpCodeSharpDevelopSdaFiles"/> <ComponentRef Id="ICSharpCodeSharpDevelopSdaFiles"/>
<ComponentRef Id="ICSharpCodeTextEditorDll"/> <ComponentRef Id="ICSharpCodeTextEditorDll"/>
<ComponentRef Id="AgaControlsDll"/>
<ComponentRef Id="log4netDll"/> <ComponentRef Id="log4netDll"/>
<ComponentRef Id="MonoCecilDll"/> <ComponentRef Id="MonoCecilDll"/>
<ComponentRef Id="WeifenLuoWinFormsUIDockingDll"/> <ComponentRef Id="WeifenLuoWinFormsUIDockingDll"/>
@ -305,7 +306,10 @@
<ComponentRef Id="ResourceEditorFiles"/> <ComponentRef Id="ResourceEditorFiles"/>
<ComponentRef Id="SettingsEditorFiles"/> <ComponentRef Id="SettingsEditorFiles"/>
<ComponentRef Id="ClassDiagramResources"/> <ComponentRef Id="ClassDiagramResources"/>
<ComponentRef Id="ClassDiagramFiles"/> <ComponentRef Id="ClassDiagramAddInFiles"/>
<ComponentRef Id="ClassCanvasDll"/>
<ComponentRef Id="ClassEditorDll"/>
<ComponentRef Id="DiagramsDll"/>
<ComponentRef Id="XmlEditorFiles"/> <ComponentRef Id="XmlEditorFiles"/>
<ComponentRef Id="AddInManagerFiles"/> <ComponentRef Id="AddInManagerFiles"/>
<ComponentRef Id="AddInManagerSharpZipLibDll"/> <ComponentRef Id="AddInManagerSharpZipLibDll"/>

Write Preview
Loading…
Cancel
Save