diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2022-09-01 09:35:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-01 09:35:18 -0400 |
| commit | cd8715a7760189c54b36c0c250efbe1db5b8635c (patch) | |
| tree | cd1b2e840e64cbdd9e9a383646f0e58a7f14ae97 /source/core/slang-file-system.cpp | |
| parent | 5c2c2cfc9918bb43225159e67a851e196e17759a (diff) | |
Passing source to Downstream compilation as artifacts (#2382)
* #include an absolute path didn't work - because paths were taken to always be relative.
* Make DownstreamCompileOptions use POD types.
* CharSliceAllocator -> SliceAllocator
Added SliceConverter
CharSliceCaster -> SliceCaster
* First attempt at zero terminating around blobs.
* Fix clang warning.
* Add SlangTerminatedChars
Make Blob implementations support it.
Make most blobs 'terminated'.
* Fix bug setting up sourceFiles for CommandLineDownstreamCompiler.
* Traffic in TerminatedCharSlice for sourceFiles.
Use ArtifactDesc to generate temporary file names for source.
* Fix typo in testing for shared library/C++.
* Working with source being passed as artifacts to DownstreamCompiler.
* Use artifacts in SourceManager/SourceFile.
* Support infering extension from the original file extension.
Diffstat (limited to 'source/core/slang-file-system.cpp')
| -rw-r--r-- | source/core/slang-file-system.cpp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/source/core/slang-file-system.cpp b/source/core/slang-file-system.cpp index 6d9ad4324..208c4d834 100644 --- a/source/core/slang-file-system.cpp +++ b/source/core/slang-file-system.cpp @@ -291,6 +291,9 @@ void CacheFileSystem::setInnerFileSystem(ISlangFileSystem* fileSystem, UniqueIde fileSystem->queryInterface(ISlangFileSystemExt::getTypeGuid(), (void**)m_fileSystemExt.writeRef()); } + // Determine how paths map + m_osPathKind = m_fileSystemExt ? m_fileSystemExt->getOSPathKind() : OSPathKind::None; + switch (m_uniqueIdentityMode) { case UniqueIdentityMode::Default: @@ -746,6 +749,20 @@ RelativeFileSystem::RelativeFileSystem(ISlangFileSystem* fileSystem, const Strin m_stripPath(stripPath) { m_style = _getFileSystemStyle(fileSystem, m_fileSystem); + + m_osPathKind = OSPathKind::None; + + ComPtr<ISlangFileSystemExt> ext; + if (SLANG_SUCCEEDED(fileSystem->queryInterface(ISlangFileSystemExt::getTypeGuid(), (void**)ext.writeRef()))) + { + m_osPathKind = ext->getOSPathKind(); + + // If it's direct, but we have a relative path, canonical should work + if (m_osPathKind == OSPathKind::Direct && relativePath.getLength()) + { + m_osPathKind = OSPathKind::Canonical; + } + } } ISlangUnknown* RelativeFileSystem::getInterface(const Guid& guid) |