Commit 8ec391dd authored by Dmitri Fix's avatar Dmitri Fix
Browse files

Merge branch 'servant' into 'master'

Hotfix v0.8.1

See merge request eclipse/simopenpass/simopenpass!68
parents a0ad26ab e7876653
...@@ -20,7 +20,7 @@ set(CMAKE_AUTOUIC ON) ...@@ -20,7 +20,7 @@ set(CMAKE_AUTOUIC ON)
set(CMAKE_CXX_FLAGS "${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}") set(CMAKE_CXX_FLAGS "${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
# add definitions: this needs to be in a certain gloabl file TODO # add definitions: this needs to be in a certain gloabl file TODO
add_definitions(-DAPPLICATION_NAME="openPASS" -DAPPLICATION_VERSION="0.7") add_definitions(-DAPPLICATION_NAME="openPASS" -DAPPLICATION_VERSION="0.8")
add_definitions(${Qt5Widgets_DEFINITIONS}) add_definitions(${Qt5Widgets_DEFINITIONS})
# include QtWidgets package # include QtWidgets package
......
<?xml version="1.0" encoding="UTF-8"?>
<opSimulationManager>
<logLevel>2</logLevel>
<logFileMaster>opSimulationManager.log</logFileMaster>
<slave>opSimulation.exe</slave>
<libraries>modules</libraries>
<slaveConfigs>
<slaveConfig>
<configurations>result_pcm/1000232/0-0-0/Default/configs</configurations>
<logFileSlave>result_pcm/1000232/0-0-0/Default/opSimulation.log</logFileSlave>
<results>result_pcm/1000232/0-0-0/Default/results</results>
</slaveConfig>
</slaveConfigs>
</opSimulationManager>
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<logLevel>2</logLevel> <logLevel>2</logLevel>
<logFileSimulationManager>opSimulationManager.log</logFileSimulationManager> <logFileSimulationManager>opSimulationManager.log</logFileSimulationManager>
<simulation>opSimulation.exe</simulation> <simulation>opSimulation.exe</simulation>
<libraries>./lib</libraries> <libraries>./modules</libraries>
<simulationConfigs> <simulationConfigs>
<simulationConfig> <simulationConfig>
<configurations>result_pcm/1000232/0-0-0/Default/configs</configurations> <configurations>result_pcm/1000232/0-0-0/Default/configs</configurations>
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
</Environment> </Environment>
<Observations> <Observations>
<Observation> <Observation>
<Library>Observation_Log</Library> <Library>Observation_LogAgent</Library>
<Parameters> <Parameters>
<String Key="OutputFilename" Value="simulationOutput.xml"/> <String Key="OutputFilename" Value="simulationOutput.xml"/>
<Bool Key="LoggingCyclicsToCsv" Value="true"/> <Bool Key="LoggingCyclicsToCsv" Value="true"/>
......
<opSimulationManager>
<logLevel>0</logLevel>
<logFileMaster>opSimulationManager.log</logFileMaster>
<slave>opSimulation.exe</slave>
<libraries>modules</libraries>
<slaveConfigs>
<slaveConfig>
<logFileSlave>opSimulation.log</logFileSlave>
<configurations>configs</configurations>
<results>results</results>
</slaveConfig>
</slaveConfigs>
</opSimulationManager>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment