Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
02/16/15 20:14:52 (9 years ago)
Author:
pfleck
Message:

#2269

  • merged trunk after 3.3.11 release
  • updated copyright and plugin version in ALPS plugin
  • removed old ALPS samples based on an userdefined alg
Location:
branches/ALPS
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/ALPS

  • branches/ALPS/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/HeuristicLab.Algorithms.ParameterlessPopulationPyramid-3.3.csproj

    r11961 r12018  
    148148      <Private>False</Private>
    149149    </ProjectReference>
    150     <ProjectReference Include="..\..\HeuristicLab.Problems.BinaryVector\3.3\HeuristicLab.Problems.BinaryVector-3.3.csproj">
     150    <ProjectReference Include="..\..\HeuristicLab.Problems.Binary\3.3\HeuristicLab.Problems.Binary-3.3.csproj">
    151151      <Project>{fc627be5-0f93-47d8-bd2e-530ea2b8aa5f}</Project>
    152       <Name>HeuristicLab.Problems.BinaryVector-3.3</Name>
     152      <Name>HeuristicLab.Problems.Binary-3.3</Name>
    153153      <Private>False</Private>
    154154    </ProjectReference>
     
    162162  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    163163  <PropertyGroup>
    164     <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    165 set ProjectDir=$(ProjectDir)
    166 set SolutionDir=$(SolutionDir)
    167 set Outdir=$(Outdir)
     164    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
     165      set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     166      set ProjectDir=$(ProjectDir)
     167      set SolutionDir=$(SolutionDir)
     168      set Outdir=$(Outdir)
    168169
    169 call PreBuildEvent.cmd</PreBuildEvent>
     170      call PreBuildEvent.cmd
     171    </PreBuildEvent>
     172    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     173      export ProjectDir=$(ProjectDir)
     174      export SolutionDir=$(SolutionDir)
     175
     176      $SolutionDir/PreBuildEvent.sh
     177    </PreBuildEvent>
    170178  </PropertyGroup>
    171179  <!-- 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.