From: Renaud Barate Date: Fri, 9 Jan 2015 09:37:12 +0000 (+0100) Subject: Use new SALOME launch commands in Launcher service X-Git-Tag: V7_6_0a1~5 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=af2be6dd5fe77fa754b37ad8acf20a2b36839363;p=modules%2Fkernel.git Use new SALOME launch commands in Launcher service --- diff --git a/src/Launcher/Launcher_Job_PythonSALOME.cxx b/src/Launcher/Launcher_Job_PythonSALOME.cxx index 4b0f6cb2e..da64993d1 100644 --- a/src/Launcher/Launcher_Job_PythonSALOME.cxx +++ b/src/Launcher/Launcher_Job_PythonSALOME.cxx @@ -26,7 +26,7 @@ Launcher::Job_PythonSALOME::Job_PythonSALOME() {_job_type = "python_salome";} Launcher::Job_PythonSALOME::~Job_PythonSALOME() {} -void +void Launcher::Job_PythonSALOME::setJobFile(const std::string & job_file) { Launcher::Job::setJobFile(job_file); diff --git a/src/Launcher/Launcher_Job_SALOME.cxx b/src/Launcher/Launcher_Job_SALOME.cxx index c3b79b3f5..caaccead7 100644 --- a/src/Launcher/Launcher_Job_SALOME.cxx +++ b/src/Launcher/Launcher_Job_SALOME.cxx @@ -35,7 +35,7 @@ Launcher::Job_SALOME::Job_SALOME() {} Launcher::Job_SALOME::~Job_SALOME() {} -void +void Launcher::Job_SALOME::setResourceDefinition(const ParserResourcesType & resource_definition) { // Check resource_definition @@ -58,7 +58,7 @@ Launcher::Job_SALOME::update_job() } #ifdef WITH_LIBBATCH -std::string +std::string Launcher::Job_SALOME::buildSalomeScript(Batch::Parametre params) { // parameters @@ -66,13 +66,13 @@ Launcher::Job_SALOME::buildSalomeScript(Batch::Parametre params) std::string launch_script = Kernel_Utils::GetTmpDir() + "runSalome_" + _job_file_name + "_" + _launch_date + ".sh"; std::ofstream launch_script_stream; - launch_script_stream.open(launch_script.c_str(), + launch_script_stream.open(launch_script.c_str(), std::ofstream::out -#ifdef WIN32 +#ifdef WIN32 | std::ofstream::binary //rnv: to avoid CL+RF end of line on windows #endif ); - + // Begin of script launch_script_stream << "#!/bin/sh -f" << std::endl; launch_script_stream << "cd " << work_directory << std::endl; @@ -148,4 +148,3 @@ Launcher::Job_SALOME::buildSalomeScript(Batch::Parametre params) return launch_script; } #endif - diff --git a/src/Launcher/Launcher_Job_YACSFile.cxx b/src/Launcher/Launcher_Job_YACSFile.cxx index b1bda42c5..7462e8b0c 100644 --- a/src/Launcher/Launcher_Job_YACSFile.cxx +++ b/src/Launcher/Launcher_Job_YACSFile.cxx @@ -23,7 +23,7 @@ #include -Launcher::Job_YACSFile::Job_YACSFile() +Launcher::Job_YACSFile::Job_YACSFile() { _job_type = "yacs_file"; _dumpState = -1; @@ -31,7 +31,7 @@ Launcher::Job_YACSFile::Job_YACSFile() Launcher::Job_YACSFile::~Job_YACSFile() {} -void +void Launcher::Job_YACSFile::setJobFile(const std::string & job_file) { Launcher::Job::setJobFile(job_file);