Changeset 13172


Ignore:
Timestamp:
11/16/15 14:20:27 (4 years ago)
Author:
ascheibe
Message:

#2475 merged r13008 and r13016 into stable

Location:
stable
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.ExtLibs

  • stable/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/2.4.1/ProtobufCS/src/ProtoGen/ProtoGen-2.4.1.473.csproj

    r12007 r13172  
    195195  </PostBuildEvent>
    196196    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    197     cp "$(TargetPath)" "$(SolutionDir)"
     197    cp "$(TargetPath)*" "$(SolutionDir)"
    198198    cp "$(TargetDir)Google.ProtocolBuffers-2.4.1.473.dll" "$(SolutionDir)"
    199     cp "$(ProjectDir)..\..\lib\protoc.exe" "$(SolutionDir)"
     199    cp "$(ProjectDir)../../lib/protoc.exe" "$(SolutionDir)"
    200200  </PostBuildEvent>
    201   </PropertyGroup> 
     201  </PropertyGroup>
    202202  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    203203       Other similar extension points exist, see Microsoft.Common.targets.
  • stable/HeuristicLab.ExtLibs/HeuristicLab.WinFormsUI/2.7.0/WinFormsUI-2.7.0/WinFormsUI-2.7.0.csproj

    r11920 r13172  
    134134      <SubType>Component</SubType>
    135135    </Compile>
    136     <Compile Include="Docking\DockPanel.cs">
    137       <SubType>Component</SubType>
    138     </Compile>
     136    <Compile Include="Docking\DockPanel.cs" />
    139137    <Compile Include="Docking\DockPanel.DockDragHandler.cs">
    140138      <SubType>Component</SubType>
  • stable/HeuristicLab.Problems.Instances.Orienteering/3.3/HeuristicLab.Problems.Instances.Orienteering-3.3.csproj

    r12721 r13172  
    110110  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    111111  <PropertyGroup>
    112     <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    113 set ProjectDir=$(ProjectDir)
    114 set SolutionDir=$(SolutionDir)
    115 set Outdir=$(Outdir)
     112    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
     113      set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     114      set ProjectDir=$(ProjectDir)
     115      set SolutionDir=$(SolutionDir)
     116      set Outdir=$(Outdir)
    116117
    117 call PreBuildEvent.cmd</PreBuildEvent>
     118      call PreBuildEvent.cmd
     119    </PreBuildEvent>
     120    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     121      export ProjectDir=$(ProjectDir)
     122      export SolutionDir=$(SolutionDir)
     123
     124      $SolutionDir/PreBuildEvent.sh
     125    </PreBuildEvent>
    118126  </PropertyGroup>
    119127  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
  • stable/HeuristicLab.Problems.Orienteering.Views/3.3/HeuristicLab.Problems.Orienteering.Views-3.3.csproj

    r12721 r13172  
    180180  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    181181  <PropertyGroup>
    182     <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    183 set ProjectDir=$(ProjectDir)
    184 set SolutionDir=$(SolutionDir)
    185 set Outdir=$(Outdir)
     182    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
     183      set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     184      set ProjectDir=$(ProjectDir)
     185      set SolutionDir=$(SolutionDir)
     186      set Outdir=$(Outdir)
    186187
    187 call PreBuildEvent.cmd
    188 </PreBuildEvent>
     188      call PreBuildEvent.cmd
     189    </PreBuildEvent>
     190    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     191      export ProjectDir=$(ProjectDir)
     192      export SolutionDir=$(SolutionDir)
     193
     194      $SolutionDir/PreBuildEvent.sh
     195    </PreBuildEvent>
    189196  </PropertyGroup>
    190197  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
  • stable/HeuristicLab.Problems.Orienteering/3.3/HeuristicLab.Problems.Orienteering-3.3.csproj

    r12721 r13172  
    176176  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    177177  <PropertyGroup>
    178     <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    179 set ProjectDir=$(ProjectDir)
    180 set SolutionDir=$(SolutionDir)
    181 set Outdir=$(Outdir)
     178    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
     179      set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     180      set ProjectDir=$(ProjectDir)
     181      set SolutionDir=$(SolutionDir)
     182      set Outdir=$(Outdir)
    182183
    183 call PreBuildEvent.cmd
    184 </PreBuildEvent>
     184      call PreBuildEvent.cmd
     185    </PreBuildEvent>
     186    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     187      export ProjectDir=$(ProjectDir)
     188      export SolutionDir=$(SolutionDir)
     189
     190      $SolutionDir/PreBuildEvent.sh
     191    </PreBuildEvent>
    185192  </PropertyGroup>
    186193  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
  • stable/prepareProjectsForMono.sh

    r12729 r13172  
    1515   awk '/ICSharpCode.AvalonEdit-5.0.1|HeuristicLab.AvalonEdit-5.0.1/ {while (/ICSharpCode.AvalonEdit-5.0.1|HeuristicLab.AvalonEdit-5.0.1/ && getline>0) ; next} 1' HeuristicLab.ExtLibs.sln > tmp
    1616   mv tmp HeuristicLab.ExtLibs.sln
     17
    1718   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
    1819   mv tmp "HeuristicLab 3.3.sln"
     20
     21   #remove code from HeuristicLab.CodeEditor that depends on WPF and therefore does not work with Mono
     22   sed -e '/ITextMarker.cs/d' -e '/MethodDefinitionReadOnlySectionProvider.cs/d' -e '/GoToLineDialog/{N;N;d;}' -e '/TextMarkerService.cs/d' -e '/Compile Include\=\"LanguageFeatures/d' -e '/AvalonEditWrapper.xaml.cs/{N;N;d;}' -e '/AvalonEditWrapper.xaml/{N;N;N;d;}' -e '/CodeViewer/{N;N;d;}' -e '/\"CodeEditor.cs\"/{N;N;d;}' -e '/\"CodeEditor.Designer.cs/{N;N;d;}' HeuristicLab.CodeEditor/3.4/HeuristicLab.CodeEditor-3.4.csproj > tmp
     23   mv tmp HeuristicLab.CodeEditor/3.4/HeuristicLab.CodeEditor-3.4.csproj
     24
    1925elif [[ "$unamestr" == 'Linux' ]]; then
    2026   sed -e '/ICSharpCode.AvalonEdit-5.0.1/,+1d' -e '/HeuristicLab.AvalonEdit-5.0.1/,+1d' HeuristicLab.ExtLibs.sln > tmp
     
    2228   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
    2329   mv tmp "HeuristicLab 3.3.sln"
     30
     31   #remove code from HeuristicLab.CodeEditor that depends on WPF and therefore does not work with Mono
     32   sed -e '/ITextMarker.cs/d' -e '/MethodDefinitionReadOnlySectionProvider.cs/d' -e '/GoToLineDialog/,+2d' -e '/TextMarkerService.cs/d' -e '/Compile Include\=\"LanguageFeatures/d' -e '/AvalonEditWrapper.xaml.cs/,+2d' -e '/AvalonEditWrapper.xaml/,+3d' -e '/CodeViewer/,+2d' -e '/\"CodeEditor.cs/,+2d' -e '/\"CodeEditor.Designer.cs/,+2d' HeuristicLab.CodeEditor/3.4/HeuristicLab.CodeEditor-3.4.csproj > tmp
     33   mv tmp HeuristicLab.CodeEditor/3.4/HeuristicLab.CodeEditor-3.4.csproj
     34
    2435else
    2536   echo "Unsupported operating system, compiling HeuristicLab may not work!"
    2637fi
    27 
    28 #remove code from HeuristicLab.CodeEditor that depends on WPF and therefore does not work with Mono
    29 sed -e '/ITextMarker.cs/d' -e '/MethodDefinitionReadOnlySectionProvider.cs/d' -e '/GoToLineDialog/,+2d' -e '/TextMarkerService.cs/d' -e '/Compile Include\=\"LanguageFeatures/d' -e '/AvalonEditWrapper.xaml.cs/,+2d' -e '/AvalonEditWrapper.xaml/,+3d' -e '/CodeViewer/,+2d' -e '/\"CodeEditor.cs/,+2d' -e '/\"CodeEditor.Designer.cs/,+2d' HeuristicLab.CodeEditor/3.4/HeuristicLab.CodeEditor-3.4.csproj > tmp
    30 mv tmp HeuristicLab.CodeEditor/3.4/HeuristicLab.CodeEditor-3.4.csproj
    31 
    3238
    3339# switch to MultiDocument MainForm type as Docking doesn't properly work on Linux
Note: See TracChangeset for help on using the changeset viewer.