Changeset 10600

Timestamp:

03/17/14 13:43:43 (11 years ago)

Author:

mkommend

Message:

#2082: Updated HL Scilab coupling (license, config, plugin, ...).

Location:

branches/HeuristicLab.ExternalEvaluation Scientific

Files:

• DotNetScilab/dotnetsci/DotNet-Component-Scilab License.txt (added)
• DotNetScilab/dotnetsci/DotNetScilab.csproj (modified) (1 diff)
• HeuristicLab.Problems.ExternalEvaluation.Scilab/3.3/DotNet-Component-Scilab.dll.config (deleted)
• HeuristicLab.Problems.ExternalEvaluation.Scilab/3.3/HeuristicLab.Problems.ExternalEvaluation.Scilab-3.3.csproj (modified) (1 diff)
• HeuristicLab.Problems.ExternalEvaluation.Scilab/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Problems.ExternalEvaluation.Scilab/3.3/Scilab License.txt (deleted)

branches/HeuristicLab.ExternalEvaluation Scientific/DotNetScilab/dotnetsci/DotNetScilab.csproj

@@ -112 +112 @@
     <None Include="HeuristicLab.snk" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="DotNet-Component-Scilab License.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

branches/HeuristicLab.ExternalEvaluation Scientific/HeuristicLab.Problems.ExternalEvaluation.Scilab/3.3/HeuristicLab.Problems.ExternalEvaluation.Scilab-3.3.csproj

@@ -148 +148 @@
   </ItemGroup>
   <ItemGroup>
-    <None Include="DotNet-Component-Scilab.dll.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
     <None Include="HeuristicLab.snk" />
     <None Include="Plugin.cs.frame" />
     <None Include="Properties\AssemblyInfo.cs.frame" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Scilab License.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
   </ItemGroup>
   <ItemGroup>

branches/HeuristicLab.ExternalEvaluation Scientific/HeuristicLab.Problems.ExternalEvaluation.Scilab/3.3/Plugin.cs.frame

@@ -32 +32 @@
   [PluginFile("DotNet-Component-Scilab.dll",PluginFileType.Assembly)]
   [PluginFile("DotNet-Component-Scilab.dll.config",PluginFileType.Data)]
-  [PluginFile("Scilab License.txt", PluginFileType.License)]
+  [PluginFile("DotNet-Component-Scilab License.txt", PluginFileType.License)]
   [PluginDependency("HeuristicLab.Collections", "3.3")]
   [PluginDependency("HeuristicLab.Common", "3.3")]