summaryrefslogtreecommitdiffstats
path: root/source/core/unix
diff options
context:
space:
mode:
authorjsmall-nvidia <jsmall@nvidia.com>2019-06-13 15:03:01 -0400
committerGitHub <noreply@github.com>2019-06-13 15:03:01 -0400
commit84c42000cbe92e7a4d1fcc3740ef6c41cdc5ee0b (patch)
tree4fcb0bb6de6122e92de95042b90cfe7d5e3956f4 /source/core/unix
parent503721047731e8f6566bc51d6eadc7d24161c129 (diff)
Runtime C++ compiling and testing on Unix-like targets (#981)
* 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. * CommandLine arguments are now tagged if they are escaped or not. That it is the clients responsibility to escape command lines that cannot be automatically escaped. * Add checks on unix/linux that command line args are all unescaped. * WIP getting runtime GCC to work. * First pass compiler working on unix-like targets. * Enable c-compile.c test on 'smoke'.
Diffstat (limited to 'source/core/unix')
-rw-r--r--source/core/unix/slang-unix-cpp-compiler-util.cpp163
-rw-r--r--source/core/unix/slang-unix-cpp-compiler-util.h24
-rw-r--r--source/core/unix/slang-unix-process-util.cpp4
3 files changed, 191 insertions, 0 deletions
diff --git a/source/core/unix/slang-unix-cpp-compiler-util.cpp b/source/core/unix/slang-unix-cpp-compiler-util.cpp
new file mode 100644
index 000000000..a5459b665
--- /dev/null
+++ b/source/core/unix/slang-unix-cpp-compiler-util.cpp
@@ -0,0 +1,163 @@
+#include "slang-unix-cpp-compiler-util.h"
+
+#include "../slang-common.h"
+#include "../slang-process-util.h"
+#include "../slang-string-util.h"
+
+#include "../slang-shared-library.h"
+
+#include "../slang-io.h"
+
+// The method used to invoke VS was originally inspired by some ideas in
+// https://github.com/RuntimeCompiledCPlusPlus/RuntimeCompiledCPlusPlus/
+
+namespace Slang {
+
+
+/* static */void UnixCPPCompilerUtil::calcArgs(const CPPCompileOptions& options, CommandLine& cmdLine)
+{
+ typedef CPPCompileOptions::OptimizationLevel OptimizationLevel;
+ typedef CPPCompileOptions::TargetType TargetType;
+ typedef CPPCompileOptions::DebugInfoType DebugInfoType;
+
+ cmdLine.addArg("-fvisibility=hidden");
+ // Use shared libraries
+ //cmdLine.addArg("-shared");
+
+ switch (options.optimizationLevel)
+ {
+ case OptimizationLevel::Debug:
+ {
+ // No optimization
+ cmdLine.addArg("-O0");
+ break;
+ }
+ case OptimizationLevel::Normal:
+ {
+ cmdLine.addArg("-Os");
+ break;
+ }
+ default: break;
+ }
+
+ if (options.debugInfoType != DebugInfoType::None)
+ {
+ cmdLine.addArg("-g");
+ }
+
+ switch (options.targetType)
+ {
+ case TargetType::SharedLibrary:
+ {
+ // Position independent
+ cmdLine.addArg("-fPIC");
+
+ String sharedLibraryPath;
+
+ // Work out the shared library name
+ {
+ String moduleDir = Path::getParentDirectory(options.modulePath);
+ String moduleFilename = Path::getFileName(options.modulePath);
+
+ StringBuilder sharedLibraryFilename;
+ SharedLibrary::appendPlatformFileName(moduleFilename.getUnownedSlice(), sharedLibraryFilename);
+
+ if (moduleDir.getLength() > 0)
+ {
+ sharedLibraryPath = Path::combine(moduleDir, sharedLibraryFilename);
+ }
+ else
+ {
+ sharedLibraryPath = sharedLibraryFilename;
+ }
+ }
+
+ cmdLine.addArg("-o");
+ cmdLine.addArg(sharedLibraryPath);
+ break;
+ }
+ case TargetType::Executable:
+ {
+ cmdLine.addArg("-o");
+
+ StringBuilder builder;
+ builder << options.modulePath;
+ builder << ProcessUtil::getExecutableSuffix();
+
+ cmdLine.addArg(options.modulePath);
+ break;
+ }
+ case TargetType::Object:
+ {
+ // Don't link, just produce object file
+ cmdLine.addArg("-c");
+ break;
+ }
+ default: break;
+ }
+
+ // Add defines
+ for (const auto& define : options.defines)
+ {
+ StringBuilder builder;
+ builder << define.nameWithSig;
+ if (define.value.getLength())
+ {
+ builder << "=" << define.value;
+ }
+
+ cmdLine.addArg(builder);
+ }
+
+ // Add includes
+ for (const auto& include : options.includePaths)
+ {
+ cmdLine.addArg("-I");
+ cmdLine.addArg(include);
+ }
+
+ // Link options
+ if (0)
+ {
+ StringBuilder linkOptions;
+ linkOptions << "Wl,";
+ cmdLine.addArg(linkOptions);
+ }
+
+ // Files to compile
+ for (const auto& sourceFile : options.sourceFiles)
+ {
+ cmdLine.addArg(sourceFile);
+ }
+
+ for (const auto& libPath : options.libraryPaths)
+ {
+ // Note that any escaping of the path is handled in the ProcessUtil::
+ cmdLine.addArg("-L");
+ cmdLine.addArg(libPath);
+ cmdLine.addArg("-F");
+ cmdLine.addArg(libPath);
+ }
+}
+
+/* static */SlangResult UnixCPPCompilerUtil::executeCompiler(const CommandLine& commandLine, ExecuteResult& outResult)
+{
+ CommandLine cmdLine;
+ // We'll assume g++ for now
+ cmdLine.setExecutableFilename("g++");
+
+ // Append the command line options
+ cmdLine.addArgs(commandLine.m_args.getBuffer(), commandLine.m_args.getCount());
+
+#if 0
+ // Test
+ {
+ String line = ProcessUtil::getCommandLineString(cmdLine);
+ printf("%s", line.getBuffer());
+ }
+#endif
+
+ return ProcessUtil::execute(cmdLine, outResult);
+}
+
+} // namespace Slang
diff --git a/source/core/unix/slang-unix-cpp-compiler-util.h b/source/core/unix/slang-unix-cpp-compiler-util.h
new file mode 100644
index 000000000..03c1b5e2e
--- /dev/null
+++ b/source/core/unix/slang-unix-cpp-compiler-util.h
@@ -0,0 +1,24 @@
+#ifndef SLANG_UNIX_CPP_COMPILER_UTIL_H
+#define SLANG_UNIX_CPP_COMPILER_UTIL_H
+
+#include "../slang-list.h"
+#include "../slang-string.h"
+
+#include "../slang-process-util.h"
+
+#include "../slang-cpp-compiler.h"
+
+namespace Slang {
+
+struct UnixCPPCompilerUtil
+{
+ /// Run compiler with command line (typically generated by calcArgs). Output placed in outResult.
+ static SlangResult executeCompiler(const CommandLine& commandLine, ExecuteResult& outResult);
+
+ /// Calculate the command line args
+ static void calcArgs(const CPPCompileOptions& options, CommandLine& cmdLine);
+};
+
+} // namespace Slang
+
+#endif
diff --git a/source/core/unix/slang-unix-process-util.cpp b/source/core/unix/slang-unix-process-util.cpp
index 0447dd499..400f4f773 100644
--- a/source/core/unix/slang-unix-process-util.cpp
+++ b/source/core/unix/slang-unix-process-util.cpp
@@ -20,7 +20,11 @@ namespace Slang {
/* static */UnownedStringSlice ProcessUtil::getExecutableSuffix()
{
+#if __CYGWIN__
+ return UnownedStringSlice::fromLiteral(".exe");
+#else
return UnownedStringSlice::fromLiteral("");
+#endif
}
/* static */void ProcessUtil::appendCommandLineEscaped(const UnownedStringSlice& slice, StringBuilder& out)