Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
10/05/11 12:45:26 (13 years ago)
Author:
mkommend
Message:

#1653: Merged new HL solution into the trunk.

Location:
trunk/sources
Files:
2 deleted
3 edited
2 copied

Legend:

Unmodified
Added
Removed

  • trunk/sources

    • Property svn:ignore

      •  

        old new  
         1*.docstates
         2*.psess
        13*.resharper
        24*.suo
         5*.vsp
        36Google.ProtocolBuffers-0.9.1.dll
         7HeuristicLab 3.3.5.1.ReSharper.user
         8HeuristicLab 3.3.6.0.ReSharper.user
        49HeuristicLab.4.5.resharper.user
        510HeuristicLab.resharper.user
        … …  
        813_ReSharper.HeuristicLab
        914_ReSharper.HeuristicLab 3.3
         15_ReSharper.HeuristicLab.ExtLibs
         16bin
        1017protoc.exe
        11 HeuristicLab 3.3.5.1.ReSharper.user
        12 *.psess
        13 *.vsp
        14 *.docstates
        15 bin
        16 HeuristicLab 3.3.6.0.ReSharper.user
         18HeuristicLab.ExtLibs.6.0.ReSharper.user
    • Property svn:mergeinfo changed
      /branches/Restructure trunk solution (added)merged: 6828
      /branches/Trunk (added)merged: 6829,​6831-6833,​6842-6848,​6850,​6865

  • trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.LibSVM/1.6.3/HeuristicLab.LibSVM-1.6.3

    • Property svn:ignore

      •  

        old new  
        44HeuristicLabLibSVMPlugin.cs
        55*.vs10x
         6Plugin.cs

  • trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.LibSVM/1.6.3/HeuristicLab.LibSVM-1.6.3/HeuristicLab.LibSVM-1.6.3.csproj

    r5163 r6866  
    1212    <AssemblyName>HeuristicLab.LibSVM-1.6.3</AssemblyName>
    1313    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    14     <TargetFrameworkProfile></TargetFrameworkProfile>
     14    <TargetFrameworkProfile>
     15    </TargetFrameworkProfile>
    1516    <FileAlignment>512</FileAlignment>
    1617    <SignAssembly>true</SignAssembly>
    … …  
    4041    <DebugType>full</DebugType>
    4142    <Optimize>false</Optimize>
    42     <OutputPath>bin\Debug\</OutputPath>
     43    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4344    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4445    <ErrorReport>prompt</ErrorReport>
    … …  
    4950    <DebugType>pdbonly</DebugType>
    5051    <Optimize>true</Optimize>
    51     <OutputPath>bin\Release\</OutputPath>
     52    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5253    <DefineConstants>TRACE</DefineConstants>
    5354    <ErrorReport>prompt</ErrorReport>
    5455    <WarningLevel>4</WarningLevel>
    55     <DocumentationFile>bin\Release\HeuristicLab.LibSVM-1.6.3.XML</DocumentationFile>
     56    <DocumentationFile>
     57    </DocumentationFile>
    5658    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    5759  </PropertyGroup>
    5860  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    5961    <DebugSymbols>true</DebugSymbols>
    60     <OutputPath>bin\x64\Debug\</OutputPath>
     62    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6163    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6264    <DebugType>full</DebugType>
    … …  
    6668  </PropertyGroup>
    6769  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    68     <OutputPath>bin\x64\Release\</OutputPath>
     70    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6971    <DefineConstants>TRACE</DefineConstants>
    70     <DocumentationFile>bin\Release\HeuristicLab.LibSVM-1.6.3.XML</DocumentationFile>
     72    <DocumentationFile>
     73    </DocumentationFile>
    7174    <Optimize>true</Optimize>
    7275    <DebugType>pdbonly</DebugType>
    … …  
    7780  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    7881    <DebugSymbols>true</DebugSymbols>
    79     <OutputPath>bin\x86\Debug\</OutputPath>
     82    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8083    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8184    <DebugType>full</DebugType>
    … …  
    8588  </PropertyGroup>
    8689  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    87     <OutputPath>bin\x86\Release\</OutputPath>
     90    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8891    <DefineConstants>TRACE</DefineConstants>
    89     <DocumentationFile>bin\Release\HeuristicLab.LibSVM-1.6.3.XML</DocumentationFile>
     92    <DocumentationFile>
     93    </DocumentationFile>
    9094    <Optimize>true</Optimize>
    9195    <DebugType>pdbonly</DebugType>
    … …  
    109113  </ItemGroup>
    110114  <ItemGroup>
    111     <None Include="HeuristicLabLibSVMPlugin.cs.frame" />
    112     <Compile Include="HeuristicLabLibSVMPlugin.cs" />
     115    <None Include="Plugin.cs.frame" />
     116    <Compile Include="Plugin.cs" />
    113117    <Compile Include="Properties\AssemblyInfo.cs" />
    114118  </ItemGroup>
    … …  
    120124  <ItemGroup>
    121125    <None Include="HeuristicLab.snk" />
    122     <None Include="Properties\AssemblyInfo.frame" />
     126    <None Include="Properties\AssemblyInfo.cs.frame" />
    123127  </ItemGroup>
    124128  <ItemGroup>
    … …  
    130134      <Project>{A16F23B5-FB62-499E-A831-26953AA56FE2}</Project>
    131135      <Name>LibSVM-1.6.3</Name>
     136      <Private>False</Private>
    132137    </ProjectReference>
    133138  </ItemGroup>
    … …  
    164169
    165170call PreBuildEvent.cmd
    166 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabLibSVMPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabLibSVMPlugin.cs"</PreBuildEvent>
     171</PreBuildEvent>
    167172  </PropertyGroup>
    168173</Project>
Note: See TracChangeset for help on using the changeset viewer.