Changeset 8660 for branches/GP-MoveOperators/HeuristicLab

Timestamp:

09/14/12 18:58:15 (12 years ago)

Author:

gkronber

Message:

#1847 merged r8205:8635 from trunk into branch

Location:

branches/GP-MoveOperators

Files:

• . (modified) (2 props)
• HeuristicLab/3.3/Files.txt (modified) (1 diff)
• HeuristicLab/3.3/HeuristicLab-3.3.csproj (modified) (2 diffs)
• HeuristicLab/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)

branches/GP-MoveOperators

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll

branches/GP-MoveOperators/HeuristicLab/3.3/Files.txt

@@ -6 +6 @@
 *.dll
 *.txt
+mathjax.zip
+displayModelFrame.html

branches/GP-MoveOperators/HeuristicLab/3.3/HeuristicLab-3.3.csproj

@@ -198 +198 @@
   -->
   <PropertyGroup>
-    <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+   <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
 set ProjectDir=$(ProjectDir)
 set SolutionDir=$(SolutionDir)
 
 call PreBuildEvent.cmd</PreBuildEvent>
-    <PostBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+export ProjectDir=$(ProjectDir)
+export SolutionDir=$(SolutionDir)
+
+$SolutionDir/PreBuildEvent.sh
+</PreBuildEvent>
+<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
 set ProjectDir=$(ProjectDir)
 set SolutionDir=$(SolutionDir)
@@ -212 +218 @@
 call "$(SolutionDir)MergeConfigs.cmd"
 if exist "%25ProjectDir%25CustomPostBuild.cmd" call CustomPostBuild.cmd</PostBuildEvent>
+<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+export Outdir=$(Outdir)
+export ProjectDir=$(ProjectDir)
+export SolutionDir=$(SolutionDir)
+
+$SolutionDir/MergeConfigs.sh
+</PostBuildEvent>
   </PropertyGroup>
 </Project>

branches/GP-MoveOperators/HeuristicLab/3.3/Properties/AssemblyInfo.cs.frame

@@ -51 +51 @@
 //      Revision
 //
-[assembly: AssemblyVersion("3.3.6.$WCREV$")]
-[assembly: AssemblyFileVersion("3.3.6.$WCREV$")]
+[assembly: AssemblyVersion("3.3.7.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.7.$WCREV$")]

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll