From 499e6764e6fbb2a1e9b107e5b30f45ec2b13046c Mon Sep 17 00:00:00 2001
From: jsmall-nvidia <jsmall@nvidia.com>
Date: Mon, 25 Oct 2021 15:02:17 -0400
Subject: Enabling slang-llvm for host-callable (#1975)

* #include an absolute path didn't work - because paths were taken to always be relative.

* First integration of slang-pack.

* Use .os

* Add optional dependency support.

* Update github actions/scripts to update deps. aarch64 needs special handling.

* Upgrade to latest slang-pack for ignore-deps support.

* Fix linux build issues.

* Copying slang-llvm from dependencies.

* Add support for LLVM for host callable.
Added CodeGenTransitionMap.

* Remove hack to enable host callable for LLVM.

* Small improvements around transitions/downstream compiler.

* Fix typo in method name.

* Fix comment.

* Update visual studio project.

* Updage slang-llvm to include initialization fix.

* Fix handling extraction of clang version number.

* Fix some formatting problems.

* hack - to see if there is a version problem on CI.

* Remove progress on github action linux.

* Allow version lines to have text before 'prefix'.

* Update slang-binaries to include centos-7 premake binaries.

* Upgrade slang-binaries.

* Upgrade slang-binaries.

* Update slang binaries to have certificates.

* Fix handling of dependency path.

* Update README to include LLVM
Update building to include --deps and --arch

* Include slang-llvm in packages.

* Update building docs.
---
 .github/workflows/release-linux.yml   | 4 ++--
 .github/workflows/release-windows.yml | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/release-linux.yml b/.github/workflows/release-linux.yml
index 8f31dc510..db8879757 100644
--- a/.github/workflows/release-linux.yml
+++ b/.github/workflows/release-linux.yml
@@ -40,9 +40,9 @@ jobs:
           export SLANG_BINARY_ARCHIVE=slang-${SLANG_TAG}-${SLANG_OS_NAME}-${SLANG_ARCH_NAME}.zip
           export SLANG_BINARY_ARCHIVE_TAR=slang-${SLANG_TAG}-${SLANG_OS_NAME}-${SLANG_ARCH_NAME}.tar.gz
           echo "creating zip"
-          zip -r ${SLANG_BINARY_ARCHIVE} bin/*/*/slangc bin/*/*/libslang.so bin/*/*/libslang-glslang.so bin/*/*/libgfx.so docs/*.md README.md LICENSE slang.h slang-com-helper.h slang-com-ptr.h slang-tag-version.h slang-gfx.h prelude/*.h
+          zip -r ${SLANG_BINARY_ARCHIVE} bin/*/*/slangc bin/*/*/libslang.so bin/*/*/libslang-glslang.so bin/*/*/libgfx.so bin/*/*/libslang-llvm.so docs/*.md README.md LICENSE slang.h slang-com-helper.h slang-com-ptr.h slang-tag-version.h slang-gfx.h prelude/*.h
           echo "creating tar"
-          tar -czf ${SLANG_BINARY_ARCHIVE_TAR} bin/*/*/slangc bin/*/*/libslang.so bin/*/*/libslang-glslang.so bin/*/*/libgfx.so docs/*.md README.md LICENSE slang.h slang-com-helper.h slang-com-ptr.h slang-tag-version.h slang-gfx.h prelude/*.h
+          tar -czf ${SLANG_BINARY_ARCHIVE_TAR} bin/*/*/slangc bin/*/*/libslang.so bin/*/*/libslang-glslang.so bin/*/*/libgfx.so bin/*/*/libslang-llvm.so docs/*.md README.md LICENSE slang.h slang-com-helper.h slang-com-ptr.h slang-tag-version.h slang-gfx.h prelude/*.h
           echo "::set-output name=SLANG_BINARY_ARCHIVE::${SLANG_BINARY_ARCHIVE}"
           echo "::set-output name=SLANG_BINARY_ARCHIVE_TAR::${SLANG_BINARY_ARCHIVE_TAR}"
       - name: UploadBinary
diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml
index 8079b2519..95932b174 100644
--- a/.github/workflows/release-windows.yml
+++ b/.github/workflows/release-windows.yml
@@ -32,7 +32,7 @@ jobs:
       # Do the premake for the actual target, downloading dependencies if necessary    
       - name: premake 
         run:
-          .\premake.bat vs2017 --enable-embed-stdlib=true --arch=${{matrix.platform}} --deps=true
+          .\premake.bat vs2017 --enable-embed-stdlib=true --arch=${{matrix.platform}} --deps=true --no-progress=true
       - name: msbuild
         run:
           MSBuild.exe slang.sln -v:m -m -property:Configuration=${{matrix.configuration}} -property:Platform=${{matrix.platform}} -property:WindowsTargetPlatformVersion=10.0.19041.0
@@ -68,6 +68,7 @@ jobs:
           7z a "$binArchive" bin\*\*\slang.dll
           7z a "$binArchive" bin\*\*\slang.lib
           7z a "$binArchive" bin\*\*\slang-glslang.dll
+          7z a "$binArchive" bin\*\*\slang-llvm.dll
           7z a "$binArchive" bin\*\*\gfx.dll
           7z a "$binArchive" bin\*\*\slangc.exe
           7z a "$binArchive" docs\*.md
-- 
cgit v1.2.3