Changeset 15294


Ignore:
Timestamp:
07/28/17 17:00:42 (2 years ago)
Author:
jkarder
Message:

#2664: merged r14273, r14882, r15135 and r15288 into stable

Location:
stable
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Clients.Hive.Slave.TrayIcon/3.3/HeuristicLab.Clients.Hive.Slave.TrayIcon-3.3.csproj

    r13306 r15294  
    121121      <SubType>Form</SubType>
    122122    </Compile>
    123     <Compile Include="MainWindow.designer.cs">
     123    <Compile Include="MainWindow.Designer.cs">
    124124      <DependentUpon>MainWindow.cs</DependentUpon>
    125125    </Compile>
  • stable/HeuristicLab.Clients.Hive.Slave/3.3/HeuristicLab.Clients.Hive.Slave-3.3.csproj

    r14211 r15294  
    187187  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    188188  <PropertyGroup>
    189     <PostBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    190 set ProjectDir=$(ProjectDir)
    191 set SolutionDir=$(SolutionDir)
    192 set Outdir=$(Outdir)
    193 set TargetDir=$(TargetDir)
    194 set Platform=$(PlatformName)
    195 set Configuration=$(ConfigurationName)
    196 
    197 call "$(SolutionDir)MergeConfigs.cmd"</PostBuildEvent>
    198   </PropertyGroup>
    199   <PropertyGroup>
    200189    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    201190set ProjectDir=$(ProjectDir)
     
    209198
    210199$SolutionDir/PreBuildEvent.sh
    211 </PreBuildEvent>
     200    </PreBuildEvent>
     201    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
     202      set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     203      set ProjectDir=$(ProjectDir)
     204      set SolutionDir=$(SolutionDir)
     205      set OutDir=$(OutDir)
     206      set TargetDir=$(TargetDir)
     207      set Platform=$(PlatformName)
     208      set Configuration=$(ConfigurationName)
     209
     210      call "$(SolutionDir)MergeConfigs.cmd"
     211    </PostBuildEvent>
     212    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     213export OutDir=$(OutDir)
     214export ProjectDir=$(ProjectDir)
     215export SolutionDir=$(SolutionDir)
     216export TargetDir=$(TargetDir)
     217
     218$SolutionDir/MergeConfigs.sh
     219    </PostBuildEvent>
    212220  </PropertyGroup>
    213221  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
  • stable/HeuristicLab.Problems.BinPacking

  • stable/HeuristicLab.Problems.BinPacking.Views

  • stable/HeuristicLab.Problems.BinPacking.Views/3.3/HeuristicLab.Problems.BinPacking.Views-3.3.csproj

    r15278 r15294  
    170170  </ItemGroup>
    171171  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
     172  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
     173       Other similar extension points exist, see Microsoft.Common.targets.
     174  <Target Name="BeforeBuild">
     175  </Target>
     176  <Target Name="AfterBuild">
     177  </Target>
     178  -->
    172179  <PropertyGroup>
    173180    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     
    185192</PreBuildEvent>
    186193  </PropertyGroup>
    187   <PropertyGroup>
    188     <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    189 set ProjectDir=$(ProjectDir)
    190 set SolutionDir=$(SolutionDir)
    191 set Outdir=$(Outdir)
    192 
    193 call PreBuildEvent.cmd
    194 </PreBuildEvent>
    195   </PropertyGroup>
    196   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    197        Other similar extension points exist, see Microsoft.Common.targets.
    198   <Target Name="BeforeBuild">
    199   </Target>
    200   <Target Name="AfterBuild">
    201   </Target>
    202   -->
    203194</Project>
  • stable/HeuristicLab.Problems.BinPacking/3.3/HeuristicLab.Problems.BinPacking-3.3.csproj

    r15278 r15294  
    235235  </ItemGroup>
    236236  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    237   <PropertyGroup>
    238     <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    239 set ProjectDir=$(ProjectDir)
    240 set SolutionDir=$(SolutionDir)
    241 set Outdir=$(Outdir)
    242 
    243 call PreBuildEvent.cmd
    244 </PreBuildEvent>
    245   </PropertyGroup>
    246237  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    247238       Other similar extension points exist, see Microsoft.Common.targets.
     
    251242  </Target>
    252243  -->
     244  <PropertyGroup>
     245    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     246set ProjectDir=$(ProjectDir)
     247set SolutionDir=$(SolutionDir)
     248set Outdir=$(Outdir)
     249
     250call PreBuildEvent.cmd
     251</PreBuildEvent>
     252    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     253export ProjectDir=$(ProjectDir)
     254export SolutionDir=$(SolutionDir)
     255
     256$SolutionDir/PreBuildEvent.sh
     257</PreBuildEvent>
     258  </PropertyGroup>
    253259</Project>
  • stable/HeuristicLab/3.3/HeuristicLab-3.3.csproj

    r15128 r15294  
    232232</PostBuildEvent>
    233233  </PropertyGroup>
    234   <PropertyGroup>
    235     <PostBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    236 set ProjectDir=$(ProjectDir)
    237 set SolutionDir=$(SolutionDir)
    238 set OutDir=$(OutDir)
    239 set TargetDir=$(TargetDir)
    240 set Platform=$(PlatformName)
    241 set Configuration=$(ConfigurationName)
    242 
    243 call "$(SolutionDir)MergeConfigs.cmd"</PostBuildEvent>
    244   </PropertyGroup>
    245234</Project>
  • stable/prepareProjectsForMono.sh

    r14193 r15294  
    1616   mv tmp HeuristicLab.ExtLibs.sln
    1717
    18    awk '/HeuristicLab.Problems.ExternalEvaluation-3.4|HeuristicLab.Problems.ExternalEvaluation.GP-3.5|HeuristicLab.Problems.ExternalEvaluation.Views-3.4|HeuristicLab.Problems.ExternalEvaluation.Matlab-3.3/ {while (/HeuristicLab.Problems.ExternalEvaluation-3.4|HeuristicLab.Problems.ExternalEvaluation.GP-3.5|HeuristicLab.Problems.ExternalEvaluation.Views-3.4|HeuristicLab.Problems.ExternalEvaluation.Matlab-3.3/ && getline>0) ; next} 1' "HeuristicLab 3.3.sln" > tmp
     18   awk '/HeuristicLab.Problems.BinPacking.Views-3.3|HeuristicLab.Problems.ExternalEvaluation-3.4|HeuristicLab.Problems.ExternalEvaluation.GP-3.5|HeuristicLab.Problems.ExternalEvaluation.Views-3.4|HeuristicLab.Problems.ExternalEvaluation.Matlab-3.3/ {while (/HeuristicLab.Problems.BinPacking.Views-3.3|HeuristicLab.Problems.ExternalEvaluation-3.4|HeuristicLab.Problems.ExternalEvaluation.GP-3.5|HeuristicLab.Problems.ExternalEvaluation.Views-3.4|HeuristicLab.Problems.ExternalEvaluation.Matlab-3.3/ && getline>0) ; next} 1' "HeuristicLab 3.3.sln" > tmp
    1919   mv tmp "HeuristicLab 3.3.sln"
    2020
     
    2626   sed -e '/ICSharpCode.AvalonEdit-5.0.1/,+1d' -e '/HeuristicLab.SharpDX-2.6.3/,+1d' HeuristicLab.ExtLibs.sln > tmp
    2727   mv tmp HeuristicLab.ExtLibs.sln
    28    sed -e '/HeuristicLab.Problems.ExternalEvaluation-3.4/,+1d' -e '/HeuristicLab.Problems.ExternalEvaluation.GP-3.5/,+1d' -e '/HeuristicLab.Problems.ExternalEvaluation.Views-3.4/,+1d' -e '/HeuristicLab.Problems.ExternalEvaluation.Matlab-3.3/,+1d' "HeuristicLab 3.3.sln" > tmp
     28   sed -e '/HeuristicLab.Problems.BinPacking.Views-3.3/,+1d' -e '/HeuristicLab.Problems.ExternalEvaluation-3.4/,+1d' -e '/HeuristicLab.Problems.ExternalEvaluation.GP-3.5/,+1d' -e '/HeuristicLab.Problems.ExternalEvaluation.Views-3.4/,+1d' -e '/HeuristicLab.Problems.ExternalEvaluation.Matlab-3.3/,+1d' "HeuristicLab 3.3.sln" > tmp
    2929   mv tmp "HeuristicLab 3.3.sln"
    3030
Note: See TracChangeset for help on using the changeset viewer.