From 0e56999a573fada2cce6e94c21ef856cc88dc933 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Wed, 10 Jul 2024 22:37:21 +0800 Subject: WIP Drop Premake (#3703) * Remove premake lua * Remove premake generated vs project * remove deps file * Remove premake driving bat files * Full test matrix under CMake * Remove premake based ci workflows * Wiggle CI * remove cmake from ci name * find frameworks correctly on osx * remove cmake from ci name * Cope with sccache not being available * cmake based falcor tests * ci wobble * only install ninja if necessary * more appropriate cache name * Remove premake from build instructions * Add some docs on ci setup * remove premake from regression tests * remove premake from perf test * Set SLANGC_PATH * ci wobble * bump slang-binaries * ci wobble * Bump spirv tools * dont use timestamp in cache * remote debug code * cache key wobble * Install sccache after building llvm * Do not build llvm tools * ci wobble * ci wobble * ci wobble * ci wobble * ci wobble * Tests spirv via glsl in ci * Define SLANG_ENABLE_XLIB=1 * osx builds on aarch64 * ci wobble * ci wobble * ci wobble * ci wobble * ci wobble * ci wobble * package documentation and metadata with cmake * ci wobble * Split hlsl double intrinsic tests * ci wobble * Correct type for double log10 Fixes https://github.com/shader-slang/slang/issues/4549 * remove working test from expected failures * add broken test to expected failures * smaller build for falcor tests * ci wobble * A few exclusions in ci * wip, release script * Enable examples in ci * neaten release script * Correct building docs * Only use xlib vulkan when slang_enable_xlib is true * bump slang-llvm version * Remove toolchain file use * Bump slang-llvm preset version * slash direction * Improve build directions * Add msvc cross build documentation * Disable old release files * Smaller set of releases for test * Allow not building llvm * simplify release matrix * Cross releases * formatting * formatting * ci wiggle * ci wiggle * cleaner * neaten * ci wobble * formatting * Install cross tools on linux * do not clean build dir * neaten ci * neaten ci * neaten ci * remove unused release workflow files * Build llvm on some platforms * neaten ci * notarize on osx * s/x64/x86_64 * ci wobble * Embed stdlib for release build * wobble ci * wobble ci * s/x64/x86_64 * ci wobble * ci wobble * ci wobble * vk-gl-cts on cmake * neaten ci * neaten ci * bump cache action version * Cope with windows being weird about case * old glibc version * old glibc version * Correct action file * Keep cache hot on main branch * separate small script for old glibc releases * ci wobble * ci wobble * Run cmake outside of docker * only sign on releases * Revert "Run cmake outside of docker" This reverts commit a58aaba939a4aa35fe70962fd60d9512b143592f. * python3 on build image * less parallel * ci wobble * ci wobble * ci wobble * newer git * ci wobble * ci wobble * Use newer docker image * Use newer docker image * sccache wobble * permissions issue * neaten * build llvm in ci * build llvm in ci * Remove linux clang build in ci * Only install crossbuild tools on non-aarch64 systems * neaten ci.yml * Correct github matrix * Simplify github matrix * ci wobble * Disable broken test See https://github.com/shader-slang/slang/issues/4589 * ci wobble * Neater slang-llvm archive filename * Neater path for uploading artifacts * Neater ci names * Use Windows SDK 10.0.19041.0 in cmake builds --- .../run-generators/run-generators.vcxproj | 343 --------------------- .../run-generators/run-generators.vcxproj.filters | 71 ----- 2 files changed, 414 deletions(-) delete mode 100644 build/visual-studio/run-generators/run-generators.vcxproj delete mode 100644 build/visual-studio/run-generators/run-generators.vcxproj.filters (limited to 'build/visual-studio/run-generators') diff --git a/build/visual-studio/run-generators/run-generators.vcxproj b/build/visual-studio/run-generators/run-generators.vcxproj deleted file mode 100644 index dbd3a3947..000000000 --- a/build/visual-studio/run-generators/run-generators.vcxproj +++ /dev/null @@ -1,343 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Debug - ARM64 - - - Debug aarch64 - Win32 - - - Debug aarch64 - x64 - - - Debug aarch64 - ARM64 - - - Release - Win32 - - - Release - x64 - - - Release - ARM64 - - - Release aarch64 - Win32 - - - Release aarch64 - x64 - - - Release aarch64 - ARM64 - - - - {E145B2B8-CD13-A6BE-B6A7-16E5A2148223} - true - Win32Proj - run-generators - - - - Utility - v142 - - - Utility - v142 - - - Utility - v142 - - - Utility - v142 - - - Utility - v142 - - - Utility - v142 - - - - - - - - - - - - - - - - - - - - - - - - - ..\..\..\bin\windows-x86\debug\ - ..\..\..\intermediate\windows-x86\debug\run-generators\ - - - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\run-generators\ - - - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\run-generators\ - - - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\run-generators\ - - - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\run-generators\ - - - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\run-generators\ - - - - - - - - - - - - - - - - - - - - - - - - - Document - "../../../bin/windows-x86/debug/slang-embed" %(Identity) - "../../../bin/windows-x64/debug/slang-embed" %(Identity) - "../../../bin/windows-aarch64/debug/slang-embed" %(Identity) - "../../../bin/windows-x86/release/slang-embed" %(Identity) - "../../../bin/windows-x64/release/slang-embed" %(Identity) - "../../../bin/windows-aarch64/release/slang-embed" %(Identity) - ../../../prelude/slang-cpp-host-prelude.h.cpp - slang-embed %(Identity) - ../../../bin/windows-x86/debug/slang-embed.exe - ../../../bin/windows-x64/debug/slang-embed.exe - ../../../bin/windows-aarch64/debug/slang-embed.exe - ../../../bin/windows-x86/release/slang-embed.exe - ../../../bin/windows-x64/release/slang-embed.exe - ../../../bin/windows-aarch64/release/slang-embed.exe - - - Document - "../../../bin/windows-x86/debug/slang-embed" %(Identity) - "../../../bin/windows-x64/debug/slang-embed" %(Identity) - "../../../bin/windows-aarch64/debug/slang-embed" %(Identity) - "../../../bin/windows-x86/release/slang-embed" %(Identity) - "../../../bin/windows-x64/release/slang-embed" %(Identity) - "../../../bin/windows-aarch64/release/slang-embed" %(Identity) - ../../../prelude/slang-cpp-prelude.h.cpp - slang-embed %(Identity) - ../../../bin/windows-x86/debug/slang-embed.exe - ../../../bin/windows-x64/debug/slang-embed.exe - ../../../bin/windows-aarch64/debug/slang-embed.exe - ../../../bin/windows-x86/release/slang-embed.exe - ../../../bin/windows-x64/release/slang-embed.exe - ../../../bin/windows-aarch64/release/slang-embed.exe - - - Document - "../../../bin/windows-x86/debug/slang-embed" %(Identity) - "../../../bin/windows-x64/debug/slang-embed" %(Identity) - "../../../bin/windows-aarch64/debug/slang-embed" %(Identity) - "../../../bin/windows-x86/release/slang-embed" %(Identity) - "../../../bin/windows-x64/release/slang-embed" %(Identity) - "../../../bin/windows-aarch64/release/slang-embed" %(Identity) - ../../../prelude/slang-cuda-prelude.h.cpp - slang-embed %(Identity) - ../../../bin/windows-x86/debug/slang-embed.exe - ../../../bin/windows-x64/debug/slang-embed.exe - ../../../bin/windows-aarch64/debug/slang-embed.exe - ../../../bin/windows-x86/release/slang-embed.exe - ../../../bin/windows-x64/release/slang-embed.exe - ../../../bin/windows-aarch64/release/slang-embed.exe - - - Document - "../../../bin/windows-x86/debug/slang-embed" %(Identity) - "../../../bin/windows-x64/debug/slang-embed" %(Identity) - "../../../bin/windows-aarch64/debug/slang-embed" %(Identity) - "../../../bin/windows-x86/release/slang-embed" %(Identity) - "../../../bin/windows-x64/release/slang-embed" %(Identity) - "../../../bin/windows-aarch64/release/slang-embed" %(Identity) - ../../../prelude/slang-hlsl-prelude.h.cpp - slang-embed %(Identity) - ../../../bin/windows-x86/debug/slang-embed.exe - ../../../bin/windows-x64/debug/slang-embed.exe - ../../../bin/windows-aarch64/debug/slang-embed.exe - ../../../bin/windows-x86/release/slang-embed.exe - ../../../bin/windows-x64/release/slang-embed.exe - ../../../bin/windows-aarch64/release/slang-embed.exe - - - Document - "../../../bin/windows-x86/debug/slang-embed" %(Identity) - "../../../bin/windows-x64/debug/slang-embed" %(Identity) - "../../../bin/windows-aarch64/debug/slang-embed" %(Identity) - "../../../bin/windows-x86/release/slang-embed" %(Identity) - "../../../bin/windows-x64/release/slang-embed" %(Identity) - "../../../bin/windows-aarch64/release/slang-embed" %(Identity) - ../../../prelude/slang-torch-prelude.h.cpp - slang-embed %(Identity) - ../../../bin/windows-x86/debug/slang-embed.exe - ../../../bin/windows-x64/debug/slang-embed.exe - ../../../bin/windows-aarch64/debug/slang-embed.exe - ../../../bin/windows-x86/release/slang-embed.exe - ../../../bin/windows-x64/release/slang-embed.exe - ../../../bin/windows-aarch64/release/slang-embed.exe - - - Document - "../../../bin/windows-x86/debug/slang-generate" %(Identity) - "../../../bin/windows-x64/debug/slang-generate" %(Identity) - "../../../bin/windows-aarch64/debug/slang-generate" %(Identity) - "../../../bin/windows-x86/release/slang-generate" %(Identity) - "../../../bin/windows-x64/release/slang-generate" %(Identity) - "../../../bin/windows-aarch64/release/slang-generate" %(Identity) - ../../../source/slang/core.meta.slang.h - slang-generate %(Identity) - ../../../bin/windows-x86/debug/slang-generate.exe - ../../../bin/windows-x64/debug/slang-generate.exe - ../../../bin/windows-aarch64/debug/slang-generate.exe - ../../../bin/windows-x86/release/slang-generate.exe - ../../../bin/windows-x64/release/slang-generate.exe - ../../../bin/windows-aarch64/release/slang-generate.exe - - - Document - "../../../bin/windows-x86/debug/slang-generate" %(Identity) - "../../../bin/windows-x64/debug/slang-generate" %(Identity) - "../../../bin/windows-aarch64/debug/slang-generate" %(Identity) - "../../../bin/windows-x86/release/slang-generate" %(Identity) - "../../../bin/windows-x64/release/slang-generate" %(Identity) - "../../../bin/windows-aarch64/release/slang-generate" %(Identity) - ../../../source/slang/diff.meta.slang.h - slang-generate %(Identity) - ../../../bin/windows-x86/debug/slang-generate.exe - ../../../bin/windows-x64/debug/slang-generate.exe - ../../../bin/windows-aarch64/debug/slang-generate.exe - ../../../bin/windows-x86/release/slang-generate.exe - ../../../bin/windows-x64/release/slang-generate.exe - ../../../bin/windows-aarch64/release/slang-generate.exe - - - Document - "../../../bin/windows-x86/debug/slang-generate" %(Identity) - "../../../bin/windows-x64/debug/slang-generate" %(Identity) - "../../../bin/windows-aarch64/debug/slang-generate" %(Identity) - "../../../bin/windows-x86/release/slang-generate" %(Identity) - "../../../bin/windows-x64/release/slang-generate" %(Identity) - "../../../bin/windows-aarch64/release/slang-generate" %(Identity) - ../../../source/slang/glsl.meta.slang.h - slang-generate %(Identity) - ../../../bin/windows-x86/debug/slang-generate.exe - ../../../bin/windows-x64/debug/slang-generate.exe - ../../../bin/windows-aarch64/debug/slang-generate.exe - ../../../bin/windows-x86/release/slang-generate.exe - ../../../bin/windows-x64/release/slang-generate.exe - ../../../bin/windows-aarch64/release/slang-generate.exe - - - Document - "../../../bin/windows-x86/debug/slang-generate" %(Identity) - "../../../bin/windows-x64/debug/slang-generate" %(Identity) - "../../../bin/windows-aarch64/debug/slang-generate" %(Identity) - "../../../bin/windows-x86/release/slang-generate" %(Identity) - "../../../bin/windows-x64/release/slang-generate" %(Identity) - "../../../bin/windows-aarch64/release/slang-generate" %(Identity) - ../../../source/slang/hlsl.meta.slang.h - slang-generate %(Identity) - ../../../bin/windows-x86/debug/slang-generate.exe - ../../../bin/windows-x64/debug/slang-generate.exe - ../../../bin/windows-aarch64/debug/slang-generate.exe - ../../../bin/windows-x86/release/slang-generate.exe - ../../../bin/windows-x64/release/slang-generate.exe - ../../../bin/windows-aarch64/release/slang-generate.exe - - - Document - "../../../bin/windows-x86/debug/slang-cpp-extractor" -d %(RootDir)%(Directory) slang-ast-support-types.h slang-ast-base.h slang-ast-decl.h slang-ast-expr.h slang-ast-modifier.h slang-ast-stmt.h slang-ast-type.h slang-ast-val.h -strip-prefix slang- -o slang-generated -output-fields -mark-suffix _CLASS - "../../../bin/windows-x64/debug/slang-cpp-extractor" -d %(RootDir)%(Directory) slang-ast-support-types.h slang-ast-base.h slang-ast-decl.h slang-ast-expr.h slang-ast-modifier.h slang-ast-stmt.h slang-ast-type.h slang-ast-val.h -strip-prefix slang- -o slang-generated -output-fields -mark-suffix _CLASS - "../../../bin/windows-aarch64/debug/slang-cpp-extractor" -d %(RootDir)%(Directory) slang-ast-support-types.h slang-ast-base.h slang-ast-decl.h slang-ast-expr.h slang-ast-modifier.h slang-ast-stmt.h slang-ast-type.h slang-ast-val.h -strip-prefix slang- -o slang-generated -output-fields -mark-suffix _CLASS - "../../../bin/windows-x86/release/slang-cpp-extractor" -d %(RootDir)%(Directory) slang-ast-support-types.h slang-ast-base.h slang-ast-decl.h slang-ast-expr.h slang-ast-modifier.h slang-ast-stmt.h slang-ast-type.h slang-ast-val.h -strip-prefix slang- -o slang-generated -output-fields -mark-suffix _CLASS - "../../../bin/windows-x64/release/slang-cpp-extractor" -d %(RootDir)%(Directory) slang-ast-support-types.h slang-ast-base.h slang-ast-decl.h slang-ast-expr.h slang-ast-modifier.h slang-ast-stmt.h slang-ast-type.h slang-ast-val.h -strip-prefix slang- -o slang-generated -output-fields -mark-suffix _CLASS - "../../../bin/windows-aarch64/release/slang-cpp-extractor" -d %(RootDir)%(Directory) slang-ast-support-types.h slang-ast-base.h slang-ast-decl.h slang-ast-expr.h slang-ast-modifier.h slang-ast-stmt.h slang-ast-type.h slang-ast-val.h -strip-prefix slang- -o slang-generated -output-fields -mark-suffix _CLASS - ../../../source/slang/slang-generated-obj.h;../../../source/slang/slang-generated-obj-macro.h;../../../source/slang/slang-generated-ast.h;../../../source/slang/slang-generated-ast-macro.h;../../../source/slang/slang-generated-value.h;../../../source/slang/slang-generated-value-macro.h - C++ Extractor %(Identity) - ../../../bin/windows-x86/debug/slang-cpp-extractor.exe;../../../source/slang/slang-ast-support-types.h;../../../source/slang/slang-ast-base.h;../../../source/slang/slang-ast-decl.h;../../../source/slang/slang-ast-expr.h;../../../source/slang/slang-ast-modifier.h;../../../source/slang/slang-ast-stmt.h;../../../source/slang/slang-ast-type.h;../../../source/slang/slang-ast-val.h - ../../../bin/windows-x64/debug/slang-cpp-extractor.exe;../../../source/slang/slang-ast-support-types.h;../../../source/slang/slang-ast-base.h;../../../source/slang/slang-ast-decl.h;../../../source/slang/slang-ast-expr.h;../../../source/slang/slang-ast-modifier.h;../../../source/slang/slang-ast-stmt.h;../../../source/slang/slang-ast-type.h;../../../source/slang/slang-ast-val.h - ../../../bin/windows-aarch64/debug/slang-cpp-extractor.exe;../../../source/slang/slang-ast-support-types.h;../../../source/slang/slang-ast-base.h;../../../source/slang/slang-ast-decl.h;../../../source/slang/slang-ast-expr.h;../../../source/slang/slang-ast-modifier.h;../../../source/slang/slang-ast-stmt.h;../../../source/slang/slang-ast-type.h;../../../source/slang/slang-ast-val.h - ../../../bin/windows-x86/release/slang-cpp-extractor.exe;../../../source/slang/slang-ast-support-types.h;../../../source/slang/slang-ast-base.h;../../../source/slang/slang-ast-decl.h;../../../source/slang/slang-ast-expr.h;../../../source/slang/slang-ast-modifier.h;../../../source/slang/slang-ast-stmt.h;../../../source/slang/slang-ast-type.h;../../../source/slang/slang-ast-val.h - ../../../bin/windows-x64/release/slang-cpp-extractor.exe;../../../source/slang/slang-ast-support-types.h;../../../source/slang/slang-ast-base.h;../../../source/slang/slang-ast-decl.h;../../../source/slang/slang-ast-expr.h;../../../source/slang/slang-ast-modifier.h;../../../source/slang/slang-ast-stmt.h;../../../source/slang/slang-ast-type.h;../../../source/slang/slang-ast-val.h - ../../../bin/windows-aarch64/release/slang-cpp-extractor.exe;../../../source/slang/slang-ast-support-types.h;../../../source/slang/slang-ast-base.h;../../../source/slang/slang-ast-decl.h;../../../source/slang/slang-ast-expr.h;../../../source/slang/slang-ast-modifier.h;../../../source/slang/slang-ast-stmt.h;../../../source/slang/slang-ast-type.h;../../../source/slang/slang-ast-val.h - - - Document - "../../../bin/windows-x86/debug/slang-capability-generator" "%(FullPath)" - "../../../bin/windows-x64/debug/slang-capability-generator" "%(FullPath)" - "../../../bin/windows-aarch64/debug/slang-capability-generator" "%(FullPath)" - "../../../bin/windows-x86/release/slang-capability-generator" "%(FullPath)" - "../../../bin/windows-x64/release/slang-capability-generator" "%(FullPath)" - "../../../bin/windows-aarch64/release/slang-capability-generator" "%(FullPath)" - ../../../source/slang/slang-generated-capability-defs.h - slang-capability-generator %(Identity) - ../../../source/slang/slang-capabilities.capdef;../../../bin/windows-x86/debug/slang-capability-generator.exe - ../../../source/slang/slang-capabilities.capdef;../../../bin/windows-x64/debug/slang-capability-generator.exe - ../../../source/slang/slang-capabilities.capdef;../../../bin/windows-aarch64/debug/slang-capability-generator.exe - ../../../source/slang/slang-capabilities.capdef;../../../bin/windows-x86/release/slang-capability-generator.exe - ../../../source/slang/slang-capabilities.capdef;../../../bin/windows-x64/release/slang-capability-generator.exe - ../../../source/slang/slang-capabilities.capdef;../../../bin/windows-aarch64/release/slang-capability-generator.exe - - - - - - \ No newline at end of file diff --git a/build/visual-studio/run-generators/run-generators.vcxproj.filters b/build/visual-studio/run-generators/run-generators.vcxproj.filters deleted file mode 100644 index c3c8330a8..000000000 --- a/build/visual-studio/run-generators/run-generators.vcxproj.filters +++ /dev/null @@ -1,71 +0,0 @@ - - - - - {21EB8090-0D4E-1035-B6D3-48EBA215DCB7} - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - {76FF3A1C-62A1-65F2-4B5C-7946379DEC42} - - - {9A9B9613-86FE-25B8-2F84-5E6E1BC6F13A} - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Header Files - - - source\slang - - - \ No newline at end of file -- cgit v1.2.3