From 277780ab7770453ed12e82df10d2a9d79ebf47dd Mon Sep 17 00:00:00 2001 From: Yong He Date: Thu, 3 Dec 2020 14:48:42 -0800 Subject: Add github action to verify vs project file consistency. (#1625) * Add github action to verify vs project file consistency. * fix solution files * fix project files --- .github/workflows/verify-solution-file.yml | 25 +++++++++++++++++++++++++ premake5.lua | 10 ++++++++++ source/slang/slang.vcxproj | 8 -------- source/slang/slang.vcxproj.filters | 24 ------------------------ 4 files changed, 35 insertions(+), 32 deletions(-) create mode 100644 .github/workflows/verify-solution-file.yml diff --git a/.github/workflows/verify-solution-file.yml b/.github/workflows/verify-solution-file.yml new file mode 100644 index 000000000..f2dddd97a --- /dev/null +++ b/.github/workflows/verify-solution-file.yml @@ -0,0 +1,25 @@ +name: Verify-VSProjects + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + runs-on: windows-latest + steps: + - uses: actions/checkout@v2.3.4 + with: + submodules: 'true' + fetch-depth: '1' + - name: verify + run: | + & .\premake.bat vs2015 + $diff = & git diff + if ($diff.length -ne 0) + { + $diff + throw "error: vs project file verification failed." + } diff --git a/premake5.lua b/premake5.lua index 8b8a39933..bc0154319 100644 --- a/premake5.lua +++ b/premake5.lua @@ -302,6 +302,16 @@ function addSourceDir(path) path .. "/*.hpp", -- C++ style headers (for glslang) path .. "/*.natvis", -- Visual Studio debugger visualization files } + removefiles + { + "**/*.meta.slang.h", + "**/slang-generated-*", + "**/slang-ast-generated*", + "**/slang-ref-object-generated*", + "**/*generated.h", + "**/*generated-macro.h" + + } end -- diff --git a/source/slang/slang.vcxproj b/source/slang/slang.vcxproj index fd5986481..08c1f03a4 100644 --- a/source/slang/slang.vcxproj +++ b/source/slang/slang.vcxproj @@ -187,8 +187,6 @@ - - @@ -215,12 +213,6 @@ - - - - - - diff --git a/source/slang/slang.vcxproj.filters b/source/slang/slang.vcxproj.filters index 9320987cf..8659054c7 100644 --- a/source/slang/slang.vcxproj.filters +++ b/source/slang/slang.vcxproj.filters @@ -12,12 +12,6 @@ Header Files - - Header Files - - - Header Files - Header Files @@ -96,24 +90,6 @@ Header Files - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - Header Files -- cgit v1.2.3