-// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016 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
std::string python_exe;
python_exe = std::string("python");
-#ifdef WIN32
- #ifdef _DEBUG_
- python_exe += std::string("_d");
- #endif
-#endif
if ( !portNumber.empty() )
{
- std::string cmd = ("from salome_utils import killOmniNames; ");
+ std::string cmd;
+
+ cmd = std::string("from salome_utils import killOmniNames; ");
cmd += std::string("killOmniNames(") + portNumber + "); ";
cmd = python_exe + std::string(" -c \"") + cmd +"\"";
MESSAGE(cmd);
system( cmd.c_str() );
- cmd = ("from killSalomeWithPort import cleanApplication; ");
+ cmd = std::string("from killSalomeWithPort import cleanApplication; ");
cmd += std::string("cleanApplication(") + portNumber + "); ";
- //cmd = python_exe + std::string(" -c \"") + cmd +"\" > /dev/null 2> /dev/null";
cmd = python_exe + std::string(" -c \"") + cmd +"\"";
MESSAGE(cmd);
system( cmd.c_str() );
}
-#ifdef WITH_PORTMANAGER
// shutdown portmanager
if ( !portNumber.empty() )
{
- std::string cmd = ("from PortManager import releasePort; ");
+ std::string cmd;
+
+ cmd = std::string("from PortManager import releasePort; ");
cmd += std::string("releasePort(") + portNumber + "); ";
- //cmd = python_exe + std::string(" -c \"") + cmd +"\" > /dev/null 2> /dev/null";
cmd = python_exe + std::string(" -c \"") + cmd +"\"";
MESSAGE(cmd);
system( cmd.c_str() );
}
-#endif
}
//=============================================================================