summaryrefslogtreecommitdiff
path: root/source/core/unix
diff options
context:
space:
mode:
authorjsmall-nvidia <jsmall@nvidia.com>2019-06-12 14:28:16 -0400
committerGitHub <noreply@github.com>2019-06-12 14:28:16 -0400
commit7931adac99a78fd5488f665578fba858b34bc8a6 (patch)
treea1d44db6f6e0e53f6064017f109840be6de78e37 /source/core/unix
parent9d514e65f00dde0e309f33591f31fbf7f132a005 (diff)
Visual Studio compilation working in test harness (#979)
* Work in progress to be able to invoke VS from within code. * First pass at windows version of refactor of OSProcessSpawner * Closer to getting VS path lookup working. * Make OSString assignable/ctor able * Work out program files directory directly, so don't have to expand %%. * WIP: Improve handling of process spawning. * Add support for splitting input by line. * * Correctly locates visual studio install * Added functionality to invoke vs via cmd * Add option to execute the command line. * Handle in ProcessUtil for windows -> WinHandle. * Rename files slang-win-visual-studio-util.cpp/.h and slang-process-util.h * First pass at unix/linux version of ProcessUtil. * Fix reading Visual Studio path from the registry. * Get compiling on linux with. * Fix vcvarsall.bat name * Use ProcessUtil to execute external code. * Remove OSProcessSpawner. * Remove includes for "os.h" where no longer needed. * Fix tabbing issue in premake5.lua Remove test code from slang-test-main.cpp * Fix premake4.lua tabbing issue. * Small fixes to slang-process-util.h Init ExecuteResult on Win execute. * Improve comments. * Fix bug in StringUtil::calcLines - with oddly terminated source input being able to read past end. Make slang-generate use StringUtil over it's own impl. * Fix off by one bug in working out Visual Studio version. * Fix bug in calculating Visual Studio Version * Fix compilation on linux with string parameter being passed to messageFormat. * Remove erroneous use of kOSError codes - use Result. * First effort to generate standard compiler options. * Initial efforts in compiling source code in test framework for VisualStudio. * Testing compiling c code on VisualStudio on Windows. * Fix warning on linux. * Fix clang on linux warning (and therefore failing) returning a StringBuilder as String. * Disable return-std-move on clang.
Diffstat (limited to 'source/core/unix')
-rw-r--r--source/core/unix/slang-unix-process-util.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/core/unix/slang-unix-process-util.cpp b/source/core/unix/slang-unix-process-util.cpp
index 7795463b7..ee61cbc85 100644
--- a/source/core/unix/slang-unix-process-util.cpp
+++ b/source/core/unix/slang-unix-process-util.cpp
@@ -23,9 +23,9 @@ namespace Slang {
return UnownedStringSlice::fromLiteral("");
}
-static void _appendEscaped(const UnownedStringSlice& slice, StringBuilder& out)
+/* static */void ProcessUtil::appendCommandLineEscaped(const UnownedStringSlice& slice, StringBuilder& out)
{
- // TODO(JS): This escaping is not complete... !
+ // TODO(JS): This escaping is not complete... !
if (slice.indexOf(' ') >= 0 || slice.indexOf('"') >= 0)
{
out << "\"";
@@ -60,11 +60,11 @@ static void _appendEscaped(const UnownedStringSlice& slice, StringBuilder& out)
/* static */String ProcessUtil::getCommandLineString(const CommandLine& commandLine)
{
StringBuilder cmd;
- _appendEscaped(commandLine.m_executable.getUnownedSlice(), cmd);
+ appendCommandLineEscaped(commandLine.m_executable.getUnownedSlice(), cmd);
for (const auto& arg : commandLine.m_args)
{
cmd << " ";
- _appendEscaped(arg.getUnownedSlice(), cmd);
+ appendCommandLineEscaped(arg.getUnownedSlice(), cmd);
}
return cmd.ToString();
}