Changeset 12750

Timestamp:

07/12/15 16:30:14 (6 years ago)

Author:

ascheibe

Message:

#2317

• merged missing commit r12675 from #2420
• hopefully fixed conflict with SymbolicDataAnalysisPopulationDiversityAnalyzer and SymbolicDataAnalysisExpressionTreeSimilarityCalculator. This is probably also a missing commit.
• merged r12015-r12744 to update merge info

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.ExtLibs (modified) (1 prop)
• HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.0.7/HeuristicLab.SimSharp-3.0.7/HeuristicLab.SimSharp-3.0.7.csproj (modified) (1 diff)
• HeuristicLab.Problems.ArtificialAnt (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis (modified) (1 prop)
• HeuristicLab.Problems.GrammaticalEvolution (modified) (1 prop)
• HeuristicLab.Problems.LawnMower (modified) (1 prop)

stable/HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.0.7/HeuristicLab.SimSharp-3.0.7/HeuristicLab.SimSharp-3.0.7.csproj

@@ -104 +104 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
-set ProjectDir=$(ProjectDir)
-set SolutionDir=$(SolutionDir)
-set Outdir=$(Outdir)
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+      set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+      set ProjectDir=$(ProjectDir)
+      set SolutionDir=$(SolutionDir)
+      set Outdir=$(Outdir)
 
-call PreBuildEvent.cmd
-</PreBuildEvent>
+      call PreBuildEvent.cmd
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+      export ProjectDir=$(ProjectDir)
+      export SolutionDir=$(SolutionDir)
+
+      $SolutionDir/PreBuildEvent.sh
+    </PreBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.