Changeset 12729
- Timestamp:
- 07/11/15 17:31:14 (10 years ago)
- Location:
- stable
- Files:
-
- 5 deleted
- 8 edited
- 6 copied
Legend:
- Unmodified
- Added
- Removed
-
stable
- Property svn:mergeinfo changed
/trunk/sources merged: 12463-12465,12470-12472,12474,12728
- Property svn:mergeinfo changed
-
stable/HeuristicLab.ExtLibs
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.ExtLibs merged: 12463-12464,12472,12728
- Property svn:mergeinfo changed
-
stable/HeuristicLab.ExtLibs/HeuristicLab.EPPlus/4.0.3/EPPlus-4.0.3/ExcelWorkbook.cs
r12074 r12729 337 337 { 338 338 var font = Styles.Fonts[0]; 339 #if __MonoCS__ 340 _standardFontWidth = (int)(font.Size * (2D / 3D)); //Aprox for Calibri. 341 #else 339 342 try 340 343 { … … 374 377 _standardFontWidth = (int)(font.Size * (2D / 3D)); //Aprox for Calibri. 375 378 } 379 #endif 376 380 } 377 381 return _standardFontWidth; -
stable/HeuristicLab.ExtLibs/HeuristicLab.EPPlus/4.0.3/HeuristicLab.EPPlus-4.0.3/HeuristicLab.EPPlus-4.0.3.csproj
r12707 r12729 88 88 </ItemGroup> 89 89 <ItemGroup> 90 <None Include="epplus-4.0.3 memory improvement.diff" />90 <None Include="epplus-4.0.3-Mono.patch" /> 91 91 <None Include="Plugin.cs.frame" /> 92 92 <Compile Include="Plugin.cs" /> -
stable/HeuristicLab.ExtLibs/HeuristicLab.MathJax/1.1/HeuristicLab.MathJax-1.1/Plugin.cs.frame
r12686 r12729 35 35 public override void OnLoad() { 36 36 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()) { 38 38 ZipFile.ExtractToDirectory(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "mathjax.zip"), AppDomain.CurrentDomain.BaseDirectory); 39 39 } -
stable/HeuristicLab.Problems.Programmable.Views/3.3/HeuristicLab.Problems.Programmable.Views-3.3.csproj
r12005 r12729 187 187 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 188 188 <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) 193 194 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> 195 203 </PropertyGroup> 196 204 <!-- 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 190 190 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 191 191 <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) 196 197 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> 198 206 </PropertyGroup> 199 207 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. -
stable/prepareProjectsForMono.sh
r9960 r12729 13 13 unamestr=`uname` 14 14 if [[ "$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 17 16 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 20 18 mv tmp "HeuristicLab 3.3.sln" 21 22 19 elif [[ "$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 > tmp20 sed -e '/ICSharpCode.AvalonEdit-5.0.1/,+1d' -e '/HeuristicLab.AvalonEdit-5.0.1/,+1d' HeuristicLab.ExtLibs.sln > tmp 24 21 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 27 23 mv tmp "HeuristicLab 3.3.sln" 28 24 else 29 25 echo "Unsupported operating system, compiling HeuristicLab may not work!" 30 26 fi 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 31 32 32
Note: See TracChangeset
for help on using the changeset viewer.