encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-05-13 10:51:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move kokoro dir under infra

Browse Source 
Relabel a bunch of things as Dawn instead of Tint.

Also adjust the tools/lint to only lint Tint.
- It doesn't like Dawn code much.

Bug: dawn:1339
Change-Id: Iab224cfbea2314f9e06fe71f8d75d825bc483c43
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/86066
Reviewed-by: Antonio Maiorano <amaiorano@google.com>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Ben Clayton <bclayton@google.com>
Commit-Queue: Ben Clayton <bclayton@google.com>
This commit is contained in:
Ben Clayton 2022-04-07 19:25:14 +00:00 committed by Dawn LUCI CQ
parent feb42e5231
commit 17393c1535
34 changed files with 255 additions and 255 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kokoro/linux/build.sh → infra/kokoro/linux/build.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# Copyright 2021 The Tint Authors. # Copyright 2021 The Tint and Dawn Authors.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
@ -17,7 +17,7 @@
set -e # Fail on any error. set -e # Fail on any error.
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd )" SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd )"
ROOT_DIR="$( cd "${SCRIPT_DIR}/../.." >/dev/null 2>&1 && pwd )" ROOT_DIR="$( cd "${SCRIPT_DIR}/../../.." >/dev/null 2>&1 && pwd )"
# Inside the docker VM, we clone the project to a new directory. # Inside the docker VM, we clone the project to a new directory.
# We do this so that the docker script can be tested in a local development # We do this so that the docker script can be tested in a local development
@ -35,11 +35,11 @@ fi
docker run --rm -i \ docker run --rm -i \
--privileged \ --privileged \
--volume "${ROOT_DIR}:${ROOT_DIR}" \ --volume "${ROOT_DIR}:${ROOT_DIR}" \
--volume "${TMP_DIR}/kokoro/tint:/tint" \ --volume "${TMP_DIR}/kokoro/dawn:/dawn" \
--volume "${KOKORO_ARTIFACTS_DIR}:/mnt/artifacts" \ --volume "${KOKORO_ARTIFACTS_DIR}:/mnt/artifacts" \
--workdir "${ROOT_DIR}" \ --workdir "${ROOT_DIR}" \
--env SRC_DIR="/tint/src" \ --env SRC_DIR="/dawn/src" \
--env BUILD_DIR="/tint/build" \ --env BUILD_DIR="/dawn/build" \
--env BUILD_TYPE=$BUILD_TYPE \ --env BUILD_TYPE=$BUILD_TYPE \
--env BUILD_SYSTEM=$BUILD_SYSTEM \ --env BUILD_SYSTEM=$BUILD_SYSTEM \
--env BUILD_SANITIZER=$BUILD_SANITIZER \ --env BUILD_SANITIZER=$BUILD_SANITIZER \

2
kokoro/linux/cmake-clang-debug-asan/build.sh → infra/kokoro/linux/cmake-clang-debug-asan/build.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# Copyright 2021 The Tint Authors. # Copyright 2021 The Tint and Dawn Authors.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.

3
infra/kokoro/linux/cmake-clang-debug-asan/presubmit.cfg Normal file
View File

@ -0,0 +1,3 @@
# Format: //devtools/kokoro/config/proto/build.proto
build_file: "dawn/infra/kokoro/linux/cmake-clang-debug-asan/build.sh"

2
kokoro/linux/cmake-clang-debug-ubsan/build.sh → infra/kokoro/linux/cmake-clang-debug-ubsan/build.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# Copyright 2021 The Tint Authors. # Copyright 2021 The Tint and Dawn Authors.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.

3
infra/kokoro/linux/cmake-clang-debug-ubsan/presubmit.cfg Normal file
View File

@ -0,0 +1,3 @@
# Format: //devtools/kokoro/config/proto/build.proto
build_file: "dawn/infra/kokoro/linux/cmake-clang-debug-ubsan/build.sh"

2
kokoro/linux/cmake-clang-debug/build.sh → infra/kokoro/linux/cmake-clang-debug/build.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# Copyright 2021 The Tint Authors. # Copyright 2021 The Tint and Dawn Authors.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.

3
infra/kokoro/linux/cmake-clang-debug/presubmit.cfg Normal file
View File

@ -0,0 +1,3 @@
# Format: //devtools/kokoro/config/proto/build.proto
build_file: "dawn/infra/kokoro/linux/cmake-clang-debug/build.sh"

2
kokoro/linux/cmake-clang-release-asan/build.sh → infra/kokoro/linux/cmake-clang-release-asan/build.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# Copyright 2021 The Tint Authors. # Copyright 2021 The Tint and Dawn Authors.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.

3
infra/kokoro/linux/cmake-clang-release-asan/presubmit.cfg Normal file
View File

@ -0,0 +1,3 @@
# Format: //devtools/kokoro/config/proto/build.proto
build_file: "dawn/infra/kokoro/linux/cmake-clang-release-asan/build.sh"

2
kokoro/linux/cmake-clang-release-ubsan/build.sh → infra/kokoro/linux/cmake-clang-release-ubsan/build.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# Copyright 2021 The Tint Authors. # Copyright 2021 The Tint and Dawn Authors.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.

3
infra/kokoro/linux/cmake-clang-release-ubsan/presubmit.cfg Normal file
View File

@ -0,0 +1,3 @@
# Format: //devtools/kokoro/config/proto/build.proto
build_file: "dawn/infra/kokoro/linux/cmake-clang-release-ubsan/build.sh"

2
kokoro/linux/cmake-clang-release/build.sh → infra/kokoro/linux/cmake-clang-release/build.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# Copyright 2021 The Tint Authors. # Copyright 2021 The Tint and Dawn Authors.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.

3
infra/kokoro/linux/cmake-clang-release/presubmit.cfg Normal file
View File

@ -0,0 +1,3 @@
# Format: //devtools/kokoro/config/proto/build.proto
build_file: "dawn/infra/kokoro/linux/cmake-clang-release/build.sh"

2
kokoro/linux/cmake-gcc-debug/build.sh → infra/kokoro/linux/cmake-gcc-debug/build.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# Copyright 2021 The Tint Authors. # Copyright 2021 The Tint and Dawn Authors.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.

3
infra/kokoro/linux/cmake-gcc-debug/presubmit.cfg Normal file
View File

@ -0,0 +1,3 @@
# Format: //devtools/kokoro/config/proto/build.proto
build_file: "dawn/infra/kokoro/linux/cmake-gcc-debug/build.sh"

2
kokoro/linux/cmake-gcc-release/build.sh → infra/kokoro/linux/cmake-gcc-release/build.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# Copyright 2021 The Tint Authors. # Copyright 2021 The Tint and Dawn Authors.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.

3
infra/kokoro/linux/cmake-gcc-release/presubmit.cfg Normal file
View File

@ -0,0 +1,3 @@
# Format: //devtools/kokoro/config/proto/build.proto
build_file: "dawn/infra/kokoro/linux/cmake-gcc-release/build.sh"

16
kokoro/linux/docker.sh → infra/kokoro/linux/docker.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# Copyright 2021 The Tint Authors. # Copyright 2021 The Tint and Dawn Authors.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
@ -15,16 +15,16 @@
# limitations under the License. # limitations under the License.
# This is the bash script invoked inside a docker container. # This is the bash script invoked inside a docker container.
# The script expects that the CWD points to a clean checkout of Tint. # The script expects that the CWD points to a clean checkout of Dawn.
# As `gclient sync` will litter the tint checkout with fetched tools and # As `gclient sync` will litter the dawn checkout with fetched tools and
# projects, this script will first clone the pristine tint checkout to # projects, this script will first clone the pristine dawn checkout to
# ${SRC_DIR}. This allows developers to locally run this script without having # ${SRC_DIR}. This allows developers to locally run this script without having
# to worry about their local tint copy being touched. # to worry about their local dawn copy being touched.
# #
# This script expects the following environment variables to be set on entry: # This script expects the following environment variables to be set on entry:
# #
# SRC_DIR - Path to where the local Tint copy will be made. See above. # SRC_DIR - Path to where the local Dawn copy will be made. See above.
# BUILD_DIR - Path to where Tint will be built. # BUILD_DIR - Path to where Dawn will be built.
# BUILD_TYPE - Either: 'Debug' or 'Release' # BUILD_TYPE - Either: 'Debug' or 'Release'
# BUILD_SYSTEM - Must be 'cmake' # BUILD_SYSTEM - Must be 'cmake'
# BUILD_SANITIZER - Either: '', 'asan', or 'ubstan' # BUILD_SANITIZER - Either: '', 'asan', or 'ubstan'
@ -132,7 +132,7 @@ if [ "$BUILD_SYSTEM" == "cmake" ]; then
cmake --build . --target tint-docs cmake --build . --target tint-docs
hide_cmds hide_cmds
status "Building tint in '${BUILD_DIR}'" status "Building dawn in '${BUILD_DIR}'"
show_cmds show_cmds
cmake ${SRC_DIR} ${CMAKE_FLAGS} ${COMMON_CMAKE_FLAGS} cmake ${SRC_DIR} ${CMAKE_FLAGS} ${COMMON_CMAKE_FLAGS}
cmake --build . -- --jobs=$(nproc) cmake --build . -- --jobs=$(nproc)

16
kokoro/windows/build.bat → infra/kokoro/windows/build.bat
View File

@ -1,4 +1,4 @@
@rem Copyright 2021 The Tint Authors. @rem Copyright 2021 The Tint and Dawn Authors.
@rem @rem
@rem Licensed under the Apache License, Version 2.0 (the "License"); @rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License. @rem you may not use this file except in compliance with the License.
@ -42,10 +42,10 @@ exit /b 0
:main :main
set ORIGINAL_SRC_DIR= %~dp0\..\.. set ORIGINAL_SRC_DIR= %~dp0\..\..\..
set TEMP_DIR=%TEMP%\tint-temp set TEMP_DIR=%TEMP%\dawn-temp
set SRC_DIR="%TEMP_DIR%\tint-src" set SRC_DIR="%TEMP_DIR%\dawn-src"
set BUILD_DIR="%TEMP_DIR%\tint-build" set BUILD_DIR="%TEMP_DIR%\dawn-build"
cd /d %ORIGINAL_SRC_DIR% cd /d %ORIGINAL_SRC_DIR%
if not exist ".git\" ( if not exist ".git\" (
@ -119,7 +119,7 @@ cd /d %BUILD_DIR%
set COMMON_CMAKE_FLAGS=-DTINT_BUILD_DOCS=O -DTINT_BUILD_BENCHMARKS=1 -DCMAKE_BUILD_TYPE=%BUILD_TYPE% set COMMON_CMAKE_FLAGS=-DTINT_BUILD_DOCS=O -DTINT_BUILD_BENCHMARKS=1 -DCMAKE_BUILD_TYPE=%BUILD_TYPE%
@echo off @echo off
call :status "Building tint" call :status "Building dawn"
@echo on @echo on
rem Disable msbuild "Intermediate or Output directory cannot reside in Temporary directory" rem Disable msbuild "Intermediate or Output directory cannot reside in Temporary directory"
set IgnoreWarnIntDirInTempDetected=true set IgnoreWarnIntDirInTempDetected=true
@ -148,13 +148,13 @@ set PATH=C:\Program Files\Metal Developer Tools\macos\bin;%PATH%
where metal.exe where metal.exe
set PATH=%DXC_PATH%;%OLD_PATH% set PATH=%DXC_PATH%;%OLD_PATH%
where dxc.exe dxil.dll where dxc.exe dxil.dll
call git bash -- ./test/tint/test-all.sh ../tint-build/tint.exe --verbose || goto :error call git bash -- ./test/tint/test-all.sh ../dawn-build/tint.exe --verbose || goto :error
@echo on @echo on
set PATH=%OLD_PATH% set PATH=%OLD_PATH%
rem Run again to test with FXC validation rem Run again to test with FXC validation
set PATH=%D3DCOMPILER_PATH%;%OLD_PATH% set PATH=%D3DCOMPILER_PATH%;%OLD_PATH%
where d3dcompiler_47.dll where d3dcompiler_47.dll
call git bash -- ./test/tint/test-all.sh ../tint-build/tint.exe --verbose --format hlsl --fxc || goto :error call git bash -- ./test/tint/test-all.sh ../dawn-build/tint.exe --verbose --format hlsl --fxc || goto :error
@echo on @echo on
set PATH=%OLD_PATH% set PATH=%OLD_PATH%
@echo off @echo off

2
kokoro/windows/cmake-msvc2019-debug/build.bat → infra/kokoro/windows/cmake-msvc2019-debug/build.bat
View File

@ -1,4 +1,4 @@
@rem Copyright 2021 The Tint Authors. @rem Copyright 2021 The Tint and Dawn Authors.
@rem @rem
@rem Licensed under the Apache License, Version 2.0 (the "License"); @rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License. @rem you may not use this file except in compliance with the License.

3
infra/kokoro/windows/cmake-msvc2019-debug/presubmit.cfg Normal file
View File

@ -0,0 +1,3 @@
# Format: //devtools/kokoro/config/proto/build.proto
build_file: "dawn/infra/kokoro/windows/cmake-msvc2019-debug/build.bat"

2
kokoro/windows/cmake-msvc2019-release/build.bat → infra/kokoro/windows/cmake-msvc2019-release/build.bat
View File

@ -1,4 +1,4 @@
@rem Copyright 2021 The Tint Authors. @rem Copyright 2021 The Tint and Dawn Authors.
@rem @rem
@rem Licensed under the Apache License, Version 2.0 (the "License"); @rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License. @rem you may not use this file except in compliance with the License.

3
infra/kokoro/windows/cmake-msvc2019-release/presubmit.cfg Normal file
View File

@ -0,0 +1,3 @@
# Format: //devtools/kokoro/config/proto/build.proto
build_file: "dawn/infra/kokoro/windows/cmake-msvc2019-release/build.bat"

3
kokoro/linux/cmake-clang-debug-asan/presubmit.cfg
View File

@ -1,3 +0,0 @@
# Format: //devtools/kokoro/config/proto/build.proto
build_file: "tint/kokoro/linux/cmake-clang-debug-asan/build.sh"

3
kokoro/linux/cmake-clang-debug-ubsan/presubmit.cfg
View File

@ -1,3 +0,0 @@
# Format: //devtools/kokoro/config/proto/build.proto
build_file: "tint/kokoro/linux/cmake-clang-debug-ubsan/build.sh"

3
kokoro/linux/cmake-clang-debug/presubmit.cfg
View File

@ -1,3 +0,0 @@
# Format: //devtools/kokoro/config/proto/build.proto
build_file: "tint/kokoro/linux/cmake-clang-debug/build.sh"

3
kokoro/linux/cmake-clang-release-asan/presubmit.cfg
View File

@ -1,3 +0,0 @@
# Format: //devtools/kokoro/config/proto/build.proto
build_file: "tint/kokoro/linux/cmake-clang-release-asan/build.sh"

3
kokoro/linux/cmake-clang-release-ubsan/presubmit.cfg
View File

@ -1,3 +0,0 @@
# Format: //devtools/kokoro/config/proto/build.proto
build_file: "tint/kokoro/linux/cmake-clang-release-ubsan/build.sh"

3
kokoro/linux/cmake-clang-release/presubmit.cfg
View File

@ -1,3 +0,0 @@
# Format: //devtools/kokoro/config/proto/build.proto
build_file: "tint/kokoro/linux/cmake-clang-release/build.sh"

3
kokoro/linux/cmake-gcc-debug/presubmit.cfg
View File

@ -1,3 +0,0 @@
# Format: //devtools/kokoro/config/proto/build.proto
build_file: "tint/kokoro/linux/cmake-gcc-debug/build.sh"

3
kokoro/linux/cmake-gcc-release/presubmit.cfg
View File

@ -1,3 +0,0 @@
# Format: //devtools/kokoro/config/proto/build.proto
build_file: "tint/kokoro/linux/cmake-gcc-release/build.sh"

3
kokoro/windows/cmake-msvc2019-debug/presubmit.cfg
View File

@ -1,3 +0,0 @@
# Format: //devtools/kokoro/config/proto/build.proto
build_file: "tint/kokoro/windows/cmake-msvc2019-debug/build.bat"

3
kokoro/windows/cmake-msvc2019-release/presubmit.cfg
View File

@ -1,3 +0,0 @@
# Format: //devtools/kokoro/config/proto/build.proto
build_file: "tint/kokoro/windows/cmake-msvc2019-release/build.bat"

2
tools/lint
View File

@ -24,7 +24,7 @@ if ! command -v cpplint.py &> /dev/null; then
fi fi
FILTER="-runtime/references" FILTER="-runtime/references"
FILES="`find src -type f` `find src/tint/cmd -type f`" FILES="`find src/tint -type f` `find src/tint/cmd -type f`"
FILES+="`find tools/src -type f` `find src/tint/cmd -type f`" FILES+="`find tools/src -type f` `find src/tint/cmd -type f`"
if command -v go &> /dev/null; then if command -v go &> /dev/null; then