Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
09/03/13 15:46:01 (11 years ago)
Author:
ascheibe
Message:

#1730 merged r9587,r9590, r9600, r9607, r9626, r9658, r9659, r9699, r9906 into stable

Location:
stable
Files:
3 edited
1 copied

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab.ExtLibs

    • Property svn:mergeinfo set to (toggle deleted branches)
      /branches/ExportSymbolicDataAnalysisSolutions/HeuristicLab.ExtLibsmergedeligible
      /trunk/sources/HeuristicLab.ExtLibsmergedeligible
      /branches/Algorithms.GradientDescent/HeuristicLab.ExtLibs5516-5520
      /branches/Benchmarking/sources/HeuristicLab.ExtLibs6917-7005
      /branches/CloningRefactoring/HeuristicLab.ExtLibs4656-4721
      /branches/DataAnalysis Refactoring/HeuristicLab.ExtLibs5471-5808
      /branches/DataAnalysis SolutionEnsembles/HeuristicLab.ExtLibs5815-6180
      /branches/DataAnalysis/HeuristicLab.ExtLibs4458-4459,​4462,​4464
      /branches/GP.Grammar.Editor/HeuristicLab.ExtLibs6284-6795
      /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.ExtLibs5060
      /branches/NET40/sources/HeuristicLab.ExtLibs5138-5162
      /branches/ParallelEngine/HeuristicLab.ExtLibs5175-5192
      /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.ExtLibs7568-7810
      /branches/QAPAlgorithms/HeuristicLab.ExtLibs6350-6627
      /branches/Restructure trunk solution/HeuristicLab.ExtLibs6828
      /branches/RuntimeOptimizer/HeuristicLab.ExtLibs8943-9078
      /branches/ScatterSearch (trunk integration)/HeuristicLab.ExtLibs7787-8333
      /branches/SlaveShutdown/HeuristicLab.ExtLibs8944-8956
      /branches/SuccessProgressAnalysis/HeuristicLab.ExtLibs5370-5682
      /branches/Trunk/HeuristicLab.ExtLibs6829-6865
      /branches/UnloadJobs/HeuristicLab.ExtLibs9168-9215
      /branches/VNS/HeuristicLab.ExtLibs5594-5752
      /branches/histogram/HeuristicLab.ExtLibs5959-6341

  • stable/HeuristicLab.ExtLibs/HeuristicLab.EPPlus/3.1.3/HeuristicLab.EPPlus-3.1.3/HeuristicLab.EPPlus-3.1.3.csproj

    r9587 r9931  
    1818    <DebugType>full</DebugType>
    1919    <Optimize>false</Optimize>
    20     <OutputPath>..\..\..\..\..\..\trunk\sources\bin\</OutputPath>
     20    <OutputPath>..\..\..\..\bin\</OutputPath>
    2121    <DefineConstants>DEBUG;TRACE</DefineConstants>
    2222    <ErrorReport>prompt</ErrorReport>
    … …  
    2626    <DebugType>pdbonly</DebugType>
    2727    <Optimize>true</Optimize>
    28     <OutputPath>..\..\..\..\..\..\trunk\sources\bin\</OutputPath>
     28    <OutputPath>..\..\..\..\bin\</OutputPath>
    2929    <DefineConstants>TRACE</DefineConstants>
    3030    <ErrorReport>prompt</ErrorReport>
    … …  
    9292      <Project>{94186a6a-5176-4402-ae83-886557b53cca}</Project>
    9393      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     94      <Private>False</Private>
    9495    </ProjectReference>
    9596    <ProjectReference Include="..\EPPlus-3.1.3\EPPlus-3.1.3.csproj">
    … …  
    105106  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    106107  <PropertyGroup>
    107     <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     108    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    108109set ProjectDir=$(ProjectDir)
    109110set SolutionDir=$(SolutionDir)
    110111set Outdir=$(Outdir)
    111112
    112 call PreBuildEvent.cmd</PreBuildEvent>
     113call PreBuildEvent.cmd
     114</PreBuildEvent>
     115    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     116export ProjectDir=$(ProjectDir)
     117export SolutionDir=$(SolutionDir)
     118
     119$SolutionDir/PreBuildEvent.sh
     120</PreBuildEvent>
    113121  </PropertyGroup>
    114122  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Note: See TracChangeset for help on using the changeset viewer.