summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYong He <yonghe@outlook.com>2020-12-03 14:48:42 -0800
committerGitHub <noreply@github.com>2020-12-03 14:48:42 -0800
commit277780ab7770453ed12e82df10d2a9d79ebf47dd (patch)
treeb89f24e1aac610e4e220aeb2f65651b90b3f8996
parenta82779887bf6f908c6759e539a35a1872892069e (diff)
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
-rw-r--r--.github/workflows/verify-solution-file.yml25
-rw-r--r--premake5.lua10
-rw-r--r--source/slang/slang.vcxproj8
-rw-r--r--source/slang/slang.vcxproj.filters24
4 files changed, 35 insertions, 32 deletions
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 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\..\slang.h" />
- <ClInclude Include="core.meta.slang.h" />
- <ClInclude Include="hlsl.meta.slang.h" />
<ClInclude Include="slang-ast-all.h" />
<ClInclude Include="slang-ast-base.h" />
<ClInclude Include="slang-ast-builder.h" />
@@ -215,12 +213,6 @@
<ClInclude Include="slang-emit-source-writer.h" />
<ClInclude Include="slang-emit.h" />
<ClInclude Include="slang-file-system.h" />
- <ClInclude Include="slang-generated-ast-macro.h" />
- <ClInclude Include="slang-generated-ast.h" />
- <ClInclude Include="slang-generated-obj-macro.h" />
- <ClInclude Include="slang-generated-obj.h" />
- <ClInclude Include="slang-generated-value-macro.h" />
- <ClInclude Include="slang-generated-value.h" />
<ClInclude Include="slang-glsl-extension-tracker.h" />
<ClInclude Include="slang-hlsl-intrinsic-set.h" />
<ClInclude Include="slang-image-format-defs.h" />
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 @@
<ClInclude Include="..\..\slang.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="core.meta.slang.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="hlsl.meta.slang.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="slang-ast-all.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -96,24 +90,6 @@
<ClInclude Include="slang-file-system.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="slang-generated-ast-macro.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="slang-generated-ast.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="slang-generated-obj-macro.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="slang-generated-obj.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="slang-generated-value-macro.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="slang-generated-value.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="slang-glsl-extension-tracker.h">
<Filter>Header Files</Filter>
</ClInclude>