Index: /branches/HeuristicLab.ExternalEvaluation Scientific/Build.cmd
===================================================================
--- /branches/HeuristicLab.ExternalEvaluation Scientific/Build.cmd (revision 9678)
+++ /branches/HeuristicLab.ExternalEvaluation Scientific/Build.cmd (revision 9678)
@@ -0,0 +1,104 @@
+@ECHO OFF
+
+SET CLEANBEFOREBUILD=
+
+SET SELECTED=
+SET CONFIGURATION=
+SET PLATFORM=
+
+IF "%~1"=="" GOTO :prompt_solution
+
+SET SELECTED=%1
+IF NOT EXIST %SELECTED% (
+ ECHO Solution file %SELECTED% could not be found.
+ GOTO :end
+)
+ECHO Building solution %SELECTED% ...
+GOTO :config_selection
+
+:prompt_solution
+SET /A COUNT=0
+FOR /F "tokens=*" %%A IN ('dir /B *.sln') DO (
+ CALL :forloopbody "%%A"
+)
+
+IF "%COUNT%"=="1" (
+ SET SELECTED=%SOLUTIONS.1%
+ ECHO Building %SOLUTIONS.1% as it is the only solution that was found ...
+ GOTO :config_selection
+)
+
+ECHO Found the following solutions:
+FOR /F "tokens=2* delims=.=" %%A IN ('SET SOLUTIONS.') DO ECHO %%A = %%B
+ECHO.
+SET /P SOLUTIONINDEX=Which solution to build? Type the number:
+
+SET SELECTED=""
+FOR /F "tokens=2* delims=.=" %%A IN ('SET SOLUTIONS.') DO (
+ IF "%%A"=="%SOLUTIONINDEX%" SET SELECTED=%%B
+)
+
+IF %SELECTED%=="" GOTO :eof
+
+:config_selection
+IF "%~2"=="" GOTO :prompt_config
+
+SET CONFIGURATION=%~2
+ECHO Building configuration %CONFIGURATION% ...
+GOTO :platform_selection
+
+:prompt_config
+SET /P CONFIGURATION=Which configuration to build [Release]:
+IF "%CONFIGURATION%"=="" SET CONFIGURATION=Release
+
+:platform_selection
+IF "%~3"=="" GOTO :prompt_platform
+
+SET PLATFORM=%~3
+ECHO Building platform %PLATFORM% ...
+GOTO :clean
+
+:prompt_platform
+SET /P PLATFORM=Which platform to build [Any CPU]:
+IF "%PLATFORM%"=="" SET PLATFORM=Any CPU
+
+:clean
+IF "%~4"=="" GOTO :prompt_clean
+
+SET CLEANBEFOREBUILD=%~4
+GOTO :main
+
+:prompt_clean
+SET /P CLEANBEFOREBUILD=Would you like to clean before building [n]:
+IF "%CLEANBEFOREBUILD%"=="" SET CLEANBEFOREBUILD=n
+
+:main
+REM First find the path to the msbuild.exe by performing a registry query
+FOR /F "tokens=1,3 delims= " %%A IN ('REG QUERY "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0"') DO (
+ IF "%%A"=="MSBuildToolsPath" SET MSBUILDPATH=%%B)
+
+REM Then execute msbuild to clean and build the solution
+REM Disable that msbuild creates a cache file of the solution
+SET MSBuildUseNoSolutionCache=1
+REM Run msbuild to clean and then build
+IF "%CLEANBEFOREBUILD%" NEQ "n" (
+ ECHO Cleaning ...
+ %MSBUILDPATH%msbuild.exe %SELECTED% /target:Clean /p:Configuration="%CONFIGURATION%",Platform="%PLATFORM%" /m:2 /nologo /verbosity:q /clp:ErrorsOnly
+)
+ECHO Building ...
+%MSBUILDPATH%msbuild.exe %SELECTED% /target:Build /p:Configuration="%CONFIGURATION%",Platform="%PLATFORM%" /m:2 /nologo /verbosity:q /clp:ErrorsOnly
+
+ECHO.
+ECHO DONE.
+
+:end
+
+PAUSE
+
+GOTO :eof
+
+REM This workaround is necessary so that COUNT gets reevaluated
+:forloopbody
+SET /A COUNT+=1
+SET SOLUTIONS.%COUNT%=%1
+GOTO :eof
Index: /branches/HeuristicLab.ExternalEvaluation Scientific/HeuristicLab.ExternalEvaluation.sln
===================================================================
--- /branches/HeuristicLab.ExternalEvaluation Scientific/HeuristicLab.ExternalEvaluation.sln (revision 9678)
+++ /branches/HeuristicLab.ExternalEvaluation Scientific/HeuristicLab.ExternalEvaluation.sln (revision 9678)
@@ -0,0 +1,37 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Optimization-3.3", "HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj", "{14AB8D24-25BC-400C-A846-4627AA945192}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8C4B275A-3C2B-4E9B-92EE-0B7F7F57314A}"
+ ProjectSection(SolutionItems) = preProject
+ PreBuildEvent.cmd = PreBuildEvent.cmd
+ EndProjectSection
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
+ Release|Any CPU = Release|Any CPU
+ Release|x64 = Release|x64
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {14AB8D24-25BC-400C-A846-4627AA945192}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {14AB8D24-25BC-400C-A846-4627AA945192}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {14AB8D24-25BC-400C-A846-4627AA945192}.Debug|x64.ActiveCfg = Debug|x64
+ {14AB8D24-25BC-400C-A846-4627AA945192}.Debug|x64.Build.0 = Debug|x64
+ {14AB8D24-25BC-400C-A846-4627AA945192}.Debug|x86.ActiveCfg = Debug|x86
+ {14AB8D24-25BC-400C-A846-4627AA945192}.Debug|x86.Build.0 = Debug|x86
+ {14AB8D24-25BC-400C-A846-4627AA945192}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {14AB8D24-25BC-400C-A846-4627AA945192}.Release|Any CPU.Build.0 = Release|Any CPU
+ {14AB8D24-25BC-400C-A846-4627AA945192}.Release|x64.ActiveCfg = Release|x64
+ {14AB8D24-25BC-400C-A846-4627AA945192}.Release|x64.Build.0 = Release|x64
+ {14AB8D24-25BC-400C-A846-4627AA945192}.Release|x86.ActiveCfg = Release|x86
+ {14AB8D24-25BC-400C-A846-4627AA945192}.Release|x86.Build.0 = Release|x86
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Index: /branches/HeuristicLab.ExternalEvaluation Scientific/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj
===================================================================
--- /branches/HeuristicLab.ExternalEvaluation Scientific/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj (revision 9677)
+++ /branches/HeuristicLab.ExternalEvaluation Scientific/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj (revision 9678)
@@ -41,5 +41,5 @@
full
false
- $(SolutionDir)\bin\
+ ..\..\..\..\trunk\sources\bin\
DEBUG;TRACE
prompt
@@ -50,5 +50,5 @@
pdbonly
true
- $(SolutionDir)\bin\
+ ..\..\..\..\trunk\sources\bin\
TRACE
prompt
@@ -99,4 +99,29 @@
+
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll
+
+
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll
+
+
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll
+
+
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll
+
+
+ False
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll
+
+
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll
+
+
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll
+
+
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll
+
@@ -213,46 +238,4 @@
-
- {958B43BC-CC5C-4FA2-8628-2B3B01D890B6}
- HeuristicLab.Collections-3.3
- False
-
-
- {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}
- HeuristicLab.Common.Resources-3.3
- False
-
-
- {A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}
- HeuristicLab.Common-3.3
- False
-
-
- {C36BD924-A541-4A00-AFA8-41701378DDC5}
- HeuristicLab.Core-3.3
- False
-
-
- {BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}
- HeuristicLab.Data-3.3
- False
-
-
- {56F9106A-079F-4C61-92F6-86A84C2D84B7}
- HeuristicLab.Parameters-3.3
- False
-
-
- {102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}
- HeuristicLab.Persistence-3.3
- False
-
-
- {94186A6A-5176-4402-AE83-886557B53CCA}
- HeuristicLab.PluginInfrastructure-3.3
- False
-
-
-
False
Index: /branches/HeuristicLab.ExternalEvaluation Scientific/PreBuildEvent.cmd
===================================================================
--- /branches/HeuristicLab.ExternalEvaluation Scientific/PreBuildEvent.cmd (revision 9678)
+++ /branches/HeuristicLab.ExternalEvaluation Scientific/PreBuildEvent.cmd (revision 9678)
@@ -0,0 +1,11 @@
+IF EXIST "%ProjectDir%\Properties\AssemblyInfo.cs.frame" SubWCRev "%ProjectDir%\" "%ProjectDir%\Properties\AssemblyInfo.cs.frame" "%ProjectDir%\Properties\AssemblyInfo.cs"
+IF %ERRORLEVEL% NEQ 0 GOTO Error_Handling
+IF EXIST "%ProjectDir%\Plugin.cs.frame" SubWCRev "%ProjectDir%\" "%ProjectDir%\Plugin.cs.frame" "%ProjectDir%\Plugin.cs"
+IF %ERRORLEVEL% NEQ 0 GOTO Error_Handling
+GOTO Done
+
+:Error_Handling
+ECHO There was an error while running subwcrev. Please verify that the *.cs.frame files have been correctly converted to *.cs files, otherwise HeuristicLab won't build.
+exit 0
+
+:Done