Fix for the "21727: [CEA 584] sending a Yacs graph from Windows to a cluster " issue.

diff --git a/src/Launcher/Launcher_Job.cxx b/src/Launcher/Launcher_Job.cxx
index ae7d4814e11fb15b684e94bfa34b6c38e45e9255..1307fbf2274d056c6e57c67214c623024126cddf 100644 (file)
--- a/src/Launcher/Launcher_Job.cxx
+++ b/src/Launcher/Launcher_Job.cxx
@@ -502,7 +502,11 @@ Launcher::Job::common_job_params()
     if (file.substr(0, 1) == std::string("/"))
       local_file = file;
     else
+#ifndef WIN32
       local_file = _local_directory + "/" + file;
+#else
+         local_file = file;
+#endif
     
     // remote file -> get only file name from in_files
     size_t found = file.find_last_of("/");

diff --git a/src/Launcher/Launcher_Job_SALOME.cxx b/src/Launcher/Launcher_Job_SALOME.cxx
index 5e80649d0cc71da5beef3d9d5d4ca3815977388d..b0c70f5b575aa7193047a980d0130976cfe44390 100644 (file)
--- a/src/Launcher/Launcher_Job_SALOME.cxx
+++ b/src/Launcher/Launcher_Job_SALOME.cxx
@@ -66,7 +66,12 @@ Launcher::Job_SALOME::buildSalomeScript(Batch::Parametre params)
 
   std::string launch_script = "/tmp/runSalome_" + _job_file_name + "_" + _launch_date + ".sh";
   std::ofstream launch_script_stream;
-  launch_script_stream.open(launch_script.c_str(), std::ofstream::out);
+  launch_script_stream.open(launch_script.c_str(), 
+                            std::ofstream::out
+#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;