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.Problems.ExternalEvaluation.GP/3.3

    • Property svn:ignore

      •  

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

  • trunk/sources/HeuristicLab.Problems.ExternalEvaluation.GP/3.3/HeuristicLab.Problems.ExternalEvaluation.GP-3.3.csproj

    r5881 r6866  
    4141    <DebugType>full</DebugType>
    4242    <Optimize>false</Optimize>
    43     <OutputPath>bin\Debug\</OutputPath>
     43    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4444    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4545    <ErrorReport>prompt</ErrorReport>
    … …  
    5050    <DebugType>pdbonly</DebugType>
    5151    <Optimize>true</Optimize>
    52     <OutputPath>bin\Release\</OutputPath>
     52    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5353    <DefineConstants>TRACE</DefineConstants>
    5454    <ErrorReport>prompt</ErrorReport>
    … …  
    5858  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    5959    <DebugSymbols>true</DebugSymbols>
    60     <OutputPath>bin\x86\Debug\</OutputPath>
     60    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6161    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6262    <DebugType>full</DebugType>
    … …  
    6666  </PropertyGroup>
    6767  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    68     <OutputPath>bin\x86\Release\</OutputPath>
     68    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6969    <DefineConstants>TRACE</DefineConstants>
    7070    <Optimize>true</Optimize>
    … …  
    7676  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    7777    <DebugSymbols>true</DebugSymbols>
    78     <OutputPath>bin\x64\Debug\</OutputPath>
     78    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7979    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8080    <DebugType>full</DebugType>
    … …  
    8484  </PropertyGroup>
    8585  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    86     <OutputPath>bin\x64\Release\</OutputPath>
     86    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8787    <DefineConstants>TRACE</DefineConstants>
    8888    <Optimize>true</Optimize>
    … …  
    9393  </PropertyGroup>
    9494  <ItemGroup>
     95    <Reference Include="Google.ProtocolBuffers-0.9.1, Version=0.9.0.0, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48, processorArchitecture=MSIL">
     96      <HintPath>..\..\bin\Google.ProtocolBuffers-0.9.1.dll</HintPath>
     97    </Reference>
    9598    <Reference Include="System" />
    9699    <Reference Include="System.Core">
    … …  
    107110  </ItemGroup>
    108111  <ItemGroup>
    109     <None Include="HeuristicLabProblemsExternalEvaluationGPPlugin.cs.frame" />
     112    <None Include="Plugin.cs.frame" />
    110113    <Compile Include="Grammar\FullFunctionalExpressionGrammar.cs" />
    111114    <Compile Include="Grammar\TypeCoherentExpressionGrammar.cs" />
    112     <Compile Include="HeuristicLabProblemsExternalEvaluationGPPlugin.cs" />
    113115    <Compile Include="Interpretation\ITreeInterpreter.cs" />
     116    <Compile Include="Plugin.cs" />
    114117    <Compile Include="Properties\AssemblyInfo.cs" />
    115118    <Compile Include="Interpretation\TreeInterpreter.cs" />
    116     <None Include="Properties\AssemblyInfo.frame" />
     119    <None Include="Properties\AssemblyInfo.cs.frame" />
    117120    <Compile Include="SymbolicExpressionTreeBinaryConverter.cs" />
    118121    <Compile Include="SymbolicExpressionTreeConverter.cs" />
    … …  
    143146      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    144147      <Name>HeuristicLab.Collections-3.3</Name>
     148      <Private>False</Private>
    145149    </ProjectReference>
    146150    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    147151      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    148152      <Name>HeuristicLab.Common-3.3</Name>
     153      <Private>False</Private>
    149154    </ProjectReference>
    150155    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    151156      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    152157      <Name>HeuristicLab.Core-3.3</Name>
     158      <Private>False</Private>
    153159    </ProjectReference>
    154160    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj">
    155161      <Project>{125D3006-67F5-48CB-913E-73C0548F17FA}</Project>
    156162      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3</Name>
    157     </ProjectReference>
    158     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ProtobufCS\0.9.1\HeuristicLab.ProtobufCS\HeuristicLab.ProtobufCS-0.9.1.csproj">
    159       <Project>{236459CE-80CF-4991-972F-DE74C826BCCC}</Project>
    160       <Name>HeuristicLab.ProtobufCS-0.9.1 %28HeuristicLab.ExtLibs\HeuristicLab.ProtobufCS\HeuristicLab.ProtobufCS-0.9.1\HeuristicLab.ProtobufCS-0.9.1%29</Name>
    161     </ProjectReference>
    162     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ProtobufCS\0.9.1\ProtobufCS\src\ProtocolBuffers\ProtocolBuffers.csproj">
    163       <Project>{6908BDCE-D925-43F3-94AC-A531E6DF2591}</Project>
    164       <Name>ProtocolBuffers</Name>
     163      <Private>False</Private>
    165164    </ProjectReference>
    166165    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    167166      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    168167      <Name>HeuristicLab.Persistence-3.3</Name>
     168      <Private>False</Private>
    169169    </ProjectReference>
    170170    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    171171      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    172172      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     173      <Private>False</Private>
    173174    </ProjectReference>
    174175    <ProjectReference Include="..\..\HeuristicLab.Problems.ExternalEvaluation\3.3\HeuristicLab.Problems.ExternalEvaluation-3.3.csproj">
    175176      <Project>{25735DB4-8E54-4A2C-83E3-A60C76565E55}</Project>
    176177      <Name>HeuristicLab.Problems.ExternalEvaluation-3.3</Name>
     178      <Private>False</Private>
    177179    </ProjectReference>
    178180    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
    179181      <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
    180182      <Name>HeuristicLab.Random-3.3</Name>
     183      <Private>False</Private>
    181184    </ProjectReference>
    182185  </ItemGroup>
    … …  
    216219set ProjectDir=$(ProjectDir)
    217220set SolutionDir=$(SolutionDir)
    218 call "$(ProjectDir)Protos\ProcessProtos.cmd"
    219221
    220222call PreBuildEvent.cmd
    221 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabProblemsExternalEvaluationGPPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabProblemsExternalEvaluationGPPlugin.cs"</PreBuildEvent>
     223</PreBuildEvent>
    222224  </PropertyGroup>
    223225</Project>
Note: See TracChangeset for help on using the changeset viewer.