Salome HOME
projects
/
tools
/
libbatch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bug on ccrt + eris
[tools/libbatch.git]
/
src
/
Core
/
Batch_CommunicationProtocol.cxx
diff --git
a/src/Core/Batch_CommunicationProtocol.cxx
b/src/Core/Batch_CommunicationProtocol.cxx
index cb67afbfd7f25a39a22644cc1ca28539a66645e1..8a3ef6ada2b5c7591028c54e8208c5305b1ba94a 100644
(file)
--- a/
src/Core/Batch_CommunicationProtocol.cxx
+++ b/
src/Core/Batch_CommunicationProtocol.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
0
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-30,12
+30,18
@@
#include <iostream>
#include <stdlib.h>
#include <iostream>
#include <stdlib.h>
-#include
"Batch_config.h"
+#include
<Batch_config.h>
#include "Batch_CommunicationProtocol.hxx"
#include "Batch_CommunicationProtocol.hxx"
-#include "Batch_CommunicationProtocolRSH.hxx"
-#include "Batch_CommunicationProtocolSH.hxx"
-#include "Batch_CommunicationProtocolSSH.hxx"
+#ifdef HAS_RSH
+ #include "Batch_CommunicationProtocolRSH.hxx"
+#endif
+#ifdef HAS_SH
+ #include "Batch_CommunicationProtocolSH.hxx"
+#endif
+#ifdef HAS_SSH
+ #include "Batch_CommunicationProtocolSSH.hxx"
+#endif
#include "Batch_APIInternalFailureException.hxx"
#include "Batch_RunTimeException.hxx"
#include "Batch_APIInternalFailureException.hxx"
#include "Batch_RunTimeException.hxx"
@@
-145,11
+151,7
@@
namespace Batch {
// if the argument contains spaces, we surround it with simple quotes (Linux)
// or double quotes (Windows)
if (commandArgs[i].find(' ') != string::npos) {
// if the argument contains spaces, we surround it with simple quotes (Linux)
// or double quotes (Windows)
if (commandArgs[i].find(' ') != string::npos) {
-#ifdef WIN32
commandStr += string("\"") + commandArgs[i] + "\"";
commandStr += string("\"") + commandArgs[i] + "\"";
-#else
- commandStr += string("\'") + commandArgs[i] + "\'";
-#endif
} else {
commandStr += commandArgs[i];
}
} else {
commandStr += commandArgs[i];
}