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

#1653: Merged new HL solution into the trunk.

Location:
trunk/sources
Files:
3 deleted
3 edited
1 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/3.3/HeuristicLab-3.3.csproj

    r6208 r6866  
    4545    <DebugType>full</DebugType>
    4646    <Optimize>false</Optimize>
    47     <OutputPath>bin\Debug\</OutputPath>
     47    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4848    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4949    <ErrorReport>prompt</ErrorReport>
     
    5454    <DebugType>pdbonly</DebugType>
    5555    <Optimize>true</Optimize>
    56     <OutputPath>bin\Release\</OutputPath>
     56    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5757    <DefineConstants>TRACE</DefineConstants>
    5858    <ErrorReport>prompt</ErrorReport>
    5959    <WarningLevel>4</WarningLevel>
    60     <DocumentationFile>bin\Release\HeuristicLab 3.3.xml</DocumentationFile>
     60    <DocumentationFile>
     61    </DocumentationFile>
    6162    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    6263  </PropertyGroup>
    6364  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    6465    <DebugSymbols>true</DebugSymbols>
    65     <OutputPath>bin\x86\Debug\</OutputPath>
     66    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6667    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6768    <DebugType>full</DebugType>
     
    7172  </PropertyGroup>
    7273  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    73     <OutputPath>bin\x86\Release\</OutputPath>
     74    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7475    <DefineConstants>TRACE</DefineConstants>
    7576    <Optimize>true</Optimize>
     
    7778    <PlatformTarget>x86</PlatformTarget>
    7879    <ErrorReport>prompt</ErrorReport>
    79     <DocumentationFile>bin\x86\Release\HeuristicLab 3.3.xml</DocumentationFile>
     80    <DocumentationFile>
     81    </DocumentationFile>
    8082    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    8183  </PropertyGroup>
    8284  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    8385    <DebugSymbols>true</DebugSymbols>
    84     <OutputPath>bin\x64\Debug\</OutputPath>
     86    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8587    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8688    <DebugType>full</DebugType>
     
    9092  </PropertyGroup>
    9193  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    92     <OutputPath>bin\x64\Release\</OutputPath>
     94    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    9395    <DefineConstants>TRACE</DefineConstants>
    9496    <Optimize>true</Optimize>
     
    9698    <PlatformTarget>x64</PlatformTarget>
    9799    <ErrorReport>prompt</ErrorReport>
    98     <DocumentationFile>bin\x64\Release\HeuristicLab 3.3.xml</DocumentationFile>
     100    <DocumentationFile>
     101    </DocumentationFile>
    99102    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    100103  </PropertyGroup>
     
    133136    </None>
    134137    <None Include="CustomPostBuild.cmd" />
    135     <None Include="CopyAssemblies.cmd" />
    136138    <None Include="CustomPostBuildTemplate_UpdateLocalInstallation.cmd" />
    137139    <None Include="HeuristicLab.snk" />
    138140    <None Include="MergeConfigs.cmd" />
    139     <None Include="Properties\AssemblyInfo.frame" />
     141    <None Include="Properties\AssemblyInfo.cs.frame" />
    140142    <None Include="Properties\Settings.settings">
    141143      <Generator>SettingsSingleFileGenerator</Generator>
     
    152154      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    153155      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     156      <Private>False</Private>
    154157    </ProjectReference>
    155158  </ItemGroup>
     
    198201set ProjectDir=$(ProjectDir)
    199202set SolutionDir=$(SolutionDir)
    200 set Outdir=$(Outdir)
    201 set Configuration=$(ConfigurationName)
    202203
    203204call PreBuildEvent.cmd</PreBuildEvent>
     
    210211
    211212call MergeConfigs.cmd
    212 call CopyAssemblies.cmd
    213213if exist "%25ProjectDir%25CustomPostBuild.cmd" call CustomPostBuild.cmd</PostBuildEvent>
    214214  </PropertyGroup>
  • trunk/sources/HeuristicLab/3.3/MergeConfigs.cmd

    r4387 r6866  
    1 ConfigMerger "%SolutionDir%\HeuristicLab.PluginInfrastructure\3.3\%Outdir%\HeuristicLab.PluginInfrastructure-3.3.dll.config" "HeuristicLab 3.3.exe.config"
    2 ConfigMerger "%SolutionDir%\HeuristicLab.Clients.Common\3.3\%Outdir%\HeuristicLab.Clients.Common-3.3.dll.config" "HeuristicLab 3.3.exe.config"
    3 ConfigMerger "%SolutionDir%\HeuristicLab.Optimizer\3.3\%Outdir%\HeuristicLab.Optimizer-3.3.dll.config" "HeuristicLab 3.3.exe.config"
    4 ConfigMerger "%SolutionDir%\HeuristicLab.Persistence\3.3\%Outdir%\HeuristicLab.Persistence-3.3.dll.config" "HeuristicLab 3.3.exe.config"
    5 ConfigMerger "%SolutionDir%\HeuristicLab.Tracing\3.3\%Outdir%\HeuristicLab.Tracing-3.3.dll.config" "HeuristicLab 3.3.exe.config"
     1ConfigMerger "%Outdir%HeuristicLab.PluginInfrastructure-3.3.dll.config" "HeuristicLab 3.3.exe.config"
     2ConfigMerger "%Outdir%HeuristicLab.Clients.Common-3.3.dll.config" "HeuristicLab 3.3.exe.config"
     3ConfigMerger "%Outdir%HeuristicLab.Optimizer-3.3.dll.config" "HeuristicLab 3.3.exe.config"
     4ConfigMerger "%Outdir%HeuristicLab.Persistence-3.3.dll.config" "HeuristicLab 3.3.exe.config"
     5ConfigMerger "%Outdir%HeuristicLab.Tracing-3.3.dll.config" "HeuristicLab 3.3.exe.config"
Note: See TracChangeset for help on using the changeset viewer.