Changeset 12729


Ignore:
Timestamp:
07/11/15 17:31:14 (6 years ago)
Author:
ascheibe
Message:

#2399 r12463, r12464, r12465, r12470, r12471, r12472, r12474, r12728

Location:
stable
Files:
5 deleted
8 edited
6 copied

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.ExtLibs

  • stable/HeuristicLab.ExtLibs/HeuristicLab.EPPlus/4.0.3/EPPlus-4.0.3/ExcelWorkbook.cs

    r12074 r12729  
    337337        {
    338338          var font = Styles.Fonts[0];
     339#if __MonoCS__
     340    _standardFontWidth = (int)(font.Size * (2D / 3D)); //Aprox for Calibri.
     341#else
    339342                    try
    340343                    {
     
    374377                        _standardFontWidth = (int)(font.Size * (2D / 3D)); //Aprox for Calibri.
    375378                    }
     379#endif
    376380        }
    377381        return _standardFontWidth;
  • stable/HeuristicLab.ExtLibs/HeuristicLab.EPPlus/4.0.3/HeuristicLab.EPPlus-4.0.3/HeuristicLab.EPPlus-4.0.3.csproj

    r12707 r12729  
    8888  </ItemGroup>
    8989  <ItemGroup>
    90     <None Include="epplus-4.0.3 memory improvement.diff" />
     90    <None Include="epplus-4.0.3-Mono.patch" />
    9191    <None Include="Plugin.cs.frame" />
    9292    <Compile Include="Plugin.cs" />
  • stable/HeuristicLab.ExtLibs/HeuristicLab.MathJax/1.1/HeuristicLab.MathJax-1.1/Plugin.cs.frame

    r12686 r12729  
    3535    public override void OnLoad() {
    3636      base.OnLoad();
    37       if (!Directory.EnumerateFiles(AppDomain.CurrentDomain.BaseDirectory, "mathjax.js", SearchOption.TopDirectoryOnly).Any()) {
     37      if (!Directory.EnumerateFiles(AppDomain.CurrentDomain.BaseDirectory, "MathJax.js", SearchOption.TopDirectoryOnly).Any()) {
    3838        ZipFile.ExtractToDirectory(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "mathjax.zip"), AppDomain.CurrentDomain.BaseDirectory);
    3939      }
  • stable/HeuristicLab.Problems.Programmable.Views/3.3/HeuristicLab.Problems.Programmable.Views-3.3.csproj

    r12005 r12729  
    187187  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    188188  <PropertyGroup>
    189     <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    190 set ProjectDir=$(ProjectDir)
    191 set SolutionDir=$(SolutionDir)
    192 set Outdir=$(Outdir)
     189    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
     190      set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     191      set ProjectDir=$(ProjectDir)
     192      set SolutionDir=$(SolutionDir)
     193      set Outdir=$(Outdir)
    193194
    194 call PreBuildEvent.cmd</PreBuildEvent>
     195      call PreBuildEvent.cmd
     196    </PreBuildEvent>
     197    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     198      export ProjectDir=$(ProjectDir)
     199      export SolutionDir=$(SolutionDir)
     200
     201      $SolutionDir/PreBuildEvent.sh
     202    </PreBuildEvent>
    195203  </PropertyGroup>
    196204  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
  • stable/HeuristicLab.Problems.Programmable/3.3/HeuristicLab.Problems.Programmable-3.3.csproj

    r12005 r12729  
    190190  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    191191  <PropertyGroup>
    192     <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    193 set ProjectDir=$(ProjectDir)
    194 set SolutionDir=$(SolutionDir)
    195 set Outdir=$(Outdir)
     192    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
     193      set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     194      set ProjectDir=$(ProjectDir)
     195      set SolutionDir=$(SolutionDir)
     196      set Outdir=$(Outdir)
    196197
    197 call PreBuildEvent.cmd</PreBuildEvent>
     198      call PreBuildEvent.cmd
     199    </PreBuildEvent>
     200    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     201      export ProjectDir=$(ProjectDir)
     202      export SolutionDir=$(SolutionDir)
     203
     204      $SolutionDir/PreBuildEvent.sh
     205    </PreBuildEvent>
    198206  </PropertyGroup>
    199207  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
  • stable/prepareProjectsForMono.sh

    r9960 r12729  
    1313unamestr=`uname`
    1414if [[ "$unamestr" == 'Darwin' ]]; then
    15    
    16    awk '/ProtocolBuffers-2.4.1.473|ProtoGen-2.4.1.473|HeuristicLab.ProtobufCS-2.4.1.473/ {while (/ProtocolBuffers-2.4.1.473|ProtoGen-2.4.1.473|HeuristicLab.ProtobufCS-2.4.1.473/ && getline>0) ; next} 1' HeuristicLab.ExtLibs.sln > tmp
     15   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
    1716   mv tmp HeuristicLab.ExtLibs.sln
    18 
    19    awk '/HeuristicLab.Problems.ExternalEvaluation-3.3|HeuristicLab.Problems.ExternalEvaluation.GP-3.4|HeuristicLab.Problems.ExternalEvaluation.Views-3.3/ {while (/HeuristicLab.Problems.ExternalEvaluation-3.3|HeuristicLab.Problems.ExternalEvaluation.GP-3.4|HeuristicLab.Problems.ExternalEvaluation.Views-3.3/ && getline>0) ; next} 1' "HeuristicLab 3.3.sln" > tmp
     17   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
    2018   mv tmp "HeuristicLab 3.3.sln"
    21 
    2219elif [[ "$unamestr" == 'Linux' ]]; then
    23    sed -e '/ProtocolBuffers-2.4.1.473/,+1d' -e '/ProtoGen-2.4.1.473/,+1d' -e '/HeuristicLab.ProtobufCS-2.4.1.473/,+1d' HeuristicLab.ExtLibs.sln > tmp
     20   sed -e '/ICSharpCode.AvalonEdit-5.0.1/,+1d' -e '/HeuristicLab.AvalonEdit-5.0.1/,+1d' HeuristicLab.ExtLibs.sln > tmp
    2421   mv tmp HeuristicLab.ExtLibs.sln
    25 
    26    sed -e '/HeuristicLab.Problems.ExternalEvaluation-3.3/,+1d' -e '/HeuristicLab.Problems.ExternalEvaluation.GP-3.4/,+1d' -e '/HeuristicLab.Problems.ExternalEvaluation.Views-3.3/,+1d' "HeuristicLab 3.3.sln" > tmp
     22   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
    2723   mv tmp "HeuristicLab 3.3.sln"
    2824else
    2925   echo "Unsupported operating system, compiling HeuristicLab may not work!"
    3026fi
     27
     28#remove code from HeuristicLab.CodeEditor that depends on WPF and therefore does not work with Mono
     29sed -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
     30mv tmp HeuristicLab.CodeEditor/3.4/HeuristicLab.CodeEditor-3.4.csproj
    3131
    3232
Note: See TracChangeset for help on using the changeset viewer.