[tint] Add tint_build_is_<OS> defines and build flags
Unifies the flags so they can be used in both C++ and build systems
Change-Id: I4baf3359ee13471e408b1f503e70e0fa6533b1b9
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/162400
Commit-Queue: Ben Clayton <bclayton@google.com>
Reviewed-by: dan sinclair <dsinclair@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
diff --git a/src/tint/BUILD.gn b/src/tint/BUILD.gn
index d083bef..6f78959 100644
--- a/src/tint/BUILD.gn
+++ b/src/tint/BUILD.gn
@@ -108,6 +108,24 @@
defines += [ "TINT_BUILD_SYNTAX_TREE_WRITER=0" ]
}
+ if (tint_build_is_win) {
+ defines += [ "TINT_BUILD_IS_WIN=1" ]
+ } else {
+ defines += [ "TINT_BUILD_IS_WIN=0" ]
+ }
+
+ if (tint_build_is_mac) {
+ defines += [ "TINT_BUILD_IS_MAC=1" ]
+ } else {
+ defines += [ "TINT_BUILD_IS_MAC=0" ]
+ }
+
+ if (tint_build_is_linux) {
+ defines += [ "TINT_BUILD_IS_LINUX=1" ]
+ } else {
+ defines += [ "TINT_BUILD_IS_LINUX=0" ]
+ }
+
include_dirs = [
"${tint_root_dir}/",
"${tint_root_dir}/include/",
diff --git a/src/tint/CMakeLists.txt b/src/tint/CMakeLists.txt
index 052ab20..e82aa47 100644
--- a/src/tint/CMakeLists.txt
+++ b/src/tint/CMakeLists.txt
@@ -30,14 +30,14 @@
################################################################################
if(NOT TINT_BUILD_AS_OTHER_OS)
if(APPLE) # Must come before UNIX
- set(IS_MAC TRUE)
- set(IS_MAC TRUE)
+ set(TINT_BUILD_IS_MAC TRUE)
+ set(TINT_BUILD_IS_MAC TRUE)
elseif(UNIX)
- set(IS_LINUX TRUE)
- set(IS_LINUX TRUE)
+ set(TINT_BUILD_IS_LINUX TRUE)
+ set(TINT_BUILD_IS_LINUX TRUE)
elseif(WIN32)
- set(IS_WIN TRUE)
- set(IS_WIN TRUE)
+ set(TINT_BUILD_IS_WIN TRUE)
+ set(TINT_BUILD_IS_WIN TRUE)
endif()
endif()
@@ -47,15 +47,19 @@
function(tint_core_compile_options TARGET)
target_include_directories(${TARGET} PUBLIC "${TINT_ROOT_SOURCE_DIR}")
target_include_directories(${TARGET} PUBLIC "${TINT_ROOT_SOURCE_DIR}/include")
- target_compile_definitions(${TARGET} PUBLIC -DTINT_BUILD_SPV_READER=$<BOOL:${TINT_BUILD_SPV_READER}>)
- target_compile_definitions(${TARGET} PUBLIC -DTINT_BUILD_WGSL_READER=$<BOOL:${TINT_BUILD_WGSL_READER}>)
- target_compile_definitions(${TARGET} PUBLIC -DTINT_BUILD_GLSL_WRITER=$<BOOL:${TINT_BUILD_GLSL_WRITER}>)
target_compile_definitions(${TARGET} PUBLIC -DTINT_BUILD_GLSL_VALIDATOR=$<BOOL:${TINT_BUILD_GLSL_VALIDATOR}>)
+ target_compile_definitions(${TARGET} PUBLIC -DTINT_BUILD_GLSL_WRITER=$<BOOL:${TINT_BUILD_GLSL_WRITER}>)
target_compile_definitions(${TARGET} PUBLIC -DTINT_BUILD_HLSL_WRITER=$<BOOL:${TINT_BUILD_HLSL_WRITER}>)
+ target_compile_definitions(${TARGET} PUBLIC -DTINT_BUILD_IS_LINUX=$<BOOL:${TINT_BUILD_IS_LINUX}>)
+ target_compile_definitions(${TARGET} PUBLIC -DTINT_BUILD_IS_MAC=$<BOOL:${TINT_BUILD_IS_MAC}>)
+ target_compile_definitions(${TARGET} PUBLIC -DTINT_BUILD_IS_WIN=$<BOOL:${TINT_BUILD_IS_WIN}>)
target_compile_definitions(${TARGET} PUBLIC -DTINT_BUILD_MSL_WRITER=$<BOOL:${TINT_BUILD_MSL_WRITER}>)
+ target_compile_definitions(${TARGET} PUBLIC -DTINT_BUILD_SPV_READER=$<BOOL:${TINT_BUILD_SPV_READER}>)
target_compile_definitions(${TARGET} PUBLIC -DTINT_BUILD_SPV_WRITER=$<BOOL:${TINT_BUILD_SPV_WRITER}>)
- target_compile_definitions(${TARGET} PUBLIC -DTINT_BUILD_WGSL_WRITER=$<BOOL:${TINT_BUILD_WGSL_WRITER}>)
target_compile_definitions(${TARGET} PUBLIC -DTINT_BUILD_SYNTAX_TREE_WRITER=$<BOOL:${TINT_BUILD_SYNTAX_TREE_WRITER}>)
+ target_compile_definitions(${TARGET} PUBLIC -DTINT_BUILD_WGSL_READER=$<BOOL:${TINT_BUILD_WGSL_READER}>)
+ target_compile_definitions(${TARGET} PUBLIC -DTINT_BUILD_WGSL_WRITER=$<BOOL:${TINT_BUILD_WGSL_WRITER}>)
+
if(TINT_BUILD_FUZZERS)
target_compile_options(${TARGET} PRIVATE "-fsanitize=fuzzer")
diff --git a/src/tint/externals.json b/src/tint/externals.json
index a7631a5..dd5d1df 100644
--- a/src/tint/externals.json
+++ b/src/tint/externals.json
@@ -17,7 +17,7 @@
"IncludePatterns": [
"Metal/Metal.h"
],
- "Condition": "is_mac",
+ "Condition": "tint_build_is_mac",
},
"thread": {
"IncludePatterns": [
@@ -64,6 +64,6 @@
"IncludePatterns": [
"winsock2.h"
],
- "Condition": "is_win",
+ "Condition": "tint_build_is_win",
},
-}
\ No newline at end of file
+}
diff --git a/src/tint/flags.bzl b/src/tint/flags.bzl
index 08b5d60..8da589a 100644
--- a/src/tint/flags.bzl
+++ b/src/tint/flags.bzl
@@ -35,7 +35,7 @@
def declare_os_flag():
"""Creates the 'os' string flag that specifies the OS to target, and a pair of
- 'is_<os>_true' and 'is_<os>_false' targets.
+ 'tint_build_is_<os>_true' and 'tint_build_is_<os>_false' targets.
The OS flag can be specified on the command line with '--//src/tint:os=<os>'
"""
@@ -55,12 +55,12 @@
for os in OSes:
native.config_setting(
- name = "is_{}_true".format(os),
+ name = "tint_build_is_{}_true".format(os),
flag_values = { ":os": os },
visibility = ["//visibility:public"],
)
selects.config_setting_group(
- name = "is_{}_false".format(os),
+ name = "tint_build_is_{}_false".format(os),
match_any = [ "is_{}_true".format(other) for other in OSes if other != os],
visibility = ["//visibility:public"],
)
diff --git a/src/tint/lang/msl/validate/BUILD.bazel b/src/tint/lang/msl/validate/BUILD.bazel
index 5ea0d1a..706f70a 100644
--- a/src/tint/lang/msl/validate/BUILD.bazel
+++ b/src/tint/lang/msl/validate/BUILD.bazel
@@ -41,7 +41,7 @@
srcs = [
"validate.cc",
] + select({
- ":is_mac": [
+ ":tint_build_is_mac": [
"validate_metal.mm",
],
"//conditions:default": [],
@@ -72,7 +72,7 @@
"//src/tint/utils/text",
"//src/tint/utils/traits",
] + select({
- ":is_mac": [
+ ":tint_build_is_mac": [
],
"//conditions:default": [],
@@ -82,8 +82,8 @@
)
alias(
- name = "is_mac",
- actual = "//src/tint:is_mac_true",
+ name = "tint_build_is_mac",
+ actual = "//src/tint:tint_build_is_mac_true",
)
alias(
diff --git a/src/tint/lang/msl/validate/BUILD.cmake b/src/tint/lang/msl/validate/BUILD.cmake
index 14012fe..c1f44bb 100644
--- a/src/tint/lang/msl/validate/BUILD.cmake
+++ b/src/tint/lang/msl/validate/BUILD.cmake
@@ -69,13 +69,13 @@
tint_utils_traits
)
-if(IS_MAC)
+if(TINT_BUILD_IS_MAC)
tint_target_add_sources(tint_lang_msl_validate lib
"lang/msl/validate/validate_metal.mm"
)
tint_target_add_external_dependencies(tint_lang_msl_validate lib
"metal"
)
-endif(IS_MAC)
+endif(TINT_BUILD_IS_MAC)
endif(TINT_BUILD_MSL_WRITER)
\ No newline at end of file
diff --git a/src/tint/lang/msl/validate/BUILD.gn b/src/tint/lang/msl/validate/BUILD.gn
index 5789793..488b0a5 100644
--- a/src/tint/lang/msl/validate/BUILD.gn
+++ b/src/tint/lang/msl/validate/BUILD.gn
@@ -67,7 +67,7 @@
"${tint_src_dir}/utils/traits",
]
- if (is_mac) {
+ if (tint_build_is_mac) {
sources += [ "validate_metal.mm" ]
deps += [ "${tint_src_dir}:metal" ]
}
diff --git a/src/tint/lang/msl/validate/validate_metal.mm b/src/tint/lang/msl/validate/validate_metal.mm
index 4669e6c..9a1b090 100644
--- a/src/tint/lang/msl/validate/validate_metal.mm
+++ b/src/tint/lang/msl/validate/validate_metal.mm
@@ -25,7 +25,7 @@
// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// GEN_BUILD:CONDITION(is_mac)
+// GEN_BUILD:CONDITION(tint_build_is_mac)
#import <Metal/Metal.h>
diff --git a/src/tint/tint.gni b/src/tint/tint.gni
index 5613f79..8ae6c91 100644
--- a/src/tint/tint.gni
+++ b/src/tint/tint.gni
@@ -34,6 +34,13 @@
}
###############################################################################
+# OS defines
+###############################################################################
+tint_build_is_win = is_win
+tint_build_is_mac = is_mac
+tint_build_is_linux = is_linux
+
+###############################################################################
# Tint library target
###############################################################################
template("libtint_source_set") {
diff --git a/src/tint/utils/command/BUILD.bazel b/src/tint/utils/command/BUILD.bazel
index f3388db..ffcef85 100644
--- a/src/tint/utils/command/BUILD.bazel
+++ b/src/tint/utils/command/BUILD.bazel
@@ -40,17 +40,17 @@
name = "command",
srcs = [
] + select({
- ":_not_is_linux__and__not_is_mac__and__not_is_win_": [
+ ":_not_tint_build_is_linux__and__not_tint_build_is_mac__and__not_tint_build_is_win_": [
"command_other.cc",
],
"//conditions:default": [],
}) + select({
- ":is_linux_or_is_mac": [
+ ":tint_build_is_linux_or_tint_build_is_mac": [
"command_posix.cc",
],
"//conditions:default": [],
}) + select({
- ":is_win": [
+ ":tint_build_is_win": [
"command_windows.cc",
],
"//conditions:default": [],
@@ -80,49 +80,49 @@
)
alias(
- name = "is_linux",
- actual = "//src/tint:is_linux_true",
+ name = "tint_build_is_linux",
+ actual = "//src/tint:tint_build_is_linux_true",
)
alias(
- name = "_not_is_linux_",
- actual = "//src/tint:is_linux_false",
+ name = "_not_tint_build_is_linux_",
+ actual = "//src/tint:tint_build_is_linux_false",
)
alias(
- name = "is_mac",
- actual = "//src/tint:is_mac_true",
+ name = "tint_build_is_mac",
+ actual = "//src/tint:tint_build_is_mac_true",
)
alias(
- name = "_not_is_mac_",
- actual = "//src/tint:is_mac_false",
+ name = "_not_tint_build_is_mac_",
+ actual = "//src/tint:tint_build_is_mac_false",
)
alias(
- name = "is_win",
- actual = "//src/tint:is_win_true",
+ name = "tint_build_is_win",
+ actual = "//src/tint:tint_build_is_win_true",
)
alias(
- name = "_not_is_win_",
- actual = "//src/tint:is_win_false",
+ name = "_not_tint_build_is_win_",
+ actual = "//src/tint:tint_build_is_win_false",
)
selects.config_setting_group(
- name = "is_linux_or_is_mac",
+ name = "tint_build_is_linux_or_tint_build_is_mac",
match_any = [
- "is_linux",
- "is_mac",
+ "tint_build_is_linux",
+ "tint_build_is_mac",
],
)
selects.config_setting_group(
- name = "_not_is_linux__and__not_is_mac__and__not_is_win_",
+ name = "_not_tint_build_is_linux__and__not_tint_build_is_mac__and__not_tint_build_is_win_",
match_all = [
- ":_not_is_linux_",
- ":_not_is_mac_",
- ":_not_is_win_",
+ ":_not_tint_build_is_linux_",
+ ":_not_tint_build_is_mac_",
+ ":_not_tint_build_is_win_",
],
)
diff --git a/src/tint/utils/command/BUILD.cmake b/src/tint/utils/command/BUILD.cmake
index 51778af..4e40cc0 100644
--- a/src/tint/utils/command/BUILD.cmake
+++ b/src/tint/utils/command/BUILD.cmake
@@ -47,23 +47,23 @@
tint_utils_text
)
-if((NOT IS_LINUX) AND (NOT IS_MAC) AND (NOT IS_WIN))
+if((NOT TINT_BUILD_IS_LINUX) AND (NOT TINT_BUILD_IS_MAC) AND (NOT TINT_BUILD_IS_WIN))
tint_target_add_sources(tint_utils_command lib
"utils/command/command_other.cc"
)
-endif((NOT IS_LINUX) AND (NOT IS_MAC) AND (NOT IS_WIN))
+endif((NOT TINT_BUILD_IS_LINUX) AND (NOT TINT_BUILD_IS_MAC) AND (NOT TINT_BUILD_IS_WIN))
-if(IS_LINUX OR IS_MAC)
+if(TINT_BUILD_IS_LINUX OR TINT_BUILD_IS_MAC)
tint_target_add_sources(tint_utils_command lib
"utils/command/command_posix.cc"
)
-endif(IS_LINUX OR IS_MAC)
+endif(TINT_BUILD_IS_LINUX OR TINT_BUILD_IS_MAC)
-if(IS_WIN)
+if(TINT_BUILD_IS_WIN)
tint_target_add_sources(tint_utils_command lib
"utils/command/command_windows.cc"
)
-endif(IS_WIN)
+endif(TINT_BUILD_IS_WIN)
################################################################################
# Target: tint_utils_command_test
diff --git a/src/tint/utils/command/BUILD.gn b/src/tint/utils/command/BUILD.gn
index 898eebe..4f42d68 100644
--- a/src/tint/utils/command/BUILD.gn
+++ b/src/tint/utils/command/BUILD.gn
@@ -49,15 +49,15 @@
"${tint_src_dir}/utils/text",
]
- if (!is_linux && !is_mac && !is_win) {
+ if (!tint_build_is_linux && !tint_build_is_mac && !tint_build_is_win) {
sources += [ "command_other.cc" ]
}
- if (is_linux || is_mac) {
+ if (tint_build_is_linux || tint_build_is_mac) {
sources += [ "command_posix.cc" ]
}
- if (is_win) {
+ if (tint_build_is_win) {
sources += [ "command_windows.cc" ]
}
}
diff --git a/src/tint/utils/command/command_other.cc b/src/tint/utils/command/command_other.cc
index 2e47a8b..49a090a 100644
--- a/src/tint/utils/command/command_other.cc
+++ b/src/tint/utils/command/command_other.cc
@@ -25,7 +25,7 @@
// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// GEN_BUILD:CONDITION((!is_linux) && (!is_mac) && (!is_win))
+// GEN_BUILD:CONDITION((!tint_build_is_linux) && (!tint_build_is_mac) && (!tint_build_is_win))
#include "src/tint/utils/command/command.h"
diff --git a/src/tint/utils/command/command_posix.cc b/src/tint/utils/command/command_posix.cc
index cf9219f..61bb0b1 100644
--- a/src/tint/utils/command/command_posix.cc
+++ b/src/tint/utils/command/command_posix.cc
@@ -25,7 +25,7 @@
// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// GEN_BUILD:CONDITION(is_linux || is_mac)
+// GEN_BUILD:CONDITION(tint_build_is_linux || tint_build_is_mac)
#include "src/tint/utils/command/command.h"
diff --git a/src/tint/utils/command/command_windows.cc b/src/tint/utils/command/command_windows.cc
index 0c12bc8..2916d9a 100644
--- a/src/tint/utils/command/command_windows.cc
+++ b/src/tint/utils/command/command_windows.cc
@@ -25,7 +25,7 @@
// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// GEN_BUILD:CONDITION(is_win)
+// GEN_BUILD:CONDITION(tint_build_is_win)
#include "src/tint/utils/command/command.h"
diff --git a/src/tint/utils/diagnostic/BUILD.bazel b/src/tint/utils/diagnostic/BUILD.bazel
index b9e46fb..5cd5f48 100644
--- a/src/tint/utils/diagnostic/BUILD.bazel
+++ b/src/tint/utils/diagnostic/BUILD.bazel
@@ -44,17 +44,17 @@
"printer.cc",
"source.cc",
] + select({
- ":_not_is_linux__and__not_is_mac__and__not_is_win_": [
+ ":_not_tint_build_is_linux__and__not_tint_build_is_mac__and__not_tint_build_is_win_": [
"printer_other.cc",
],
"//conditions:default": [],
}) + select({
- ":is_linux_or_is_mac": [
+ ":tint_build_is_linux_or_tint_build_is_mac": [
"printer_posix.cc",
],
"//conditions:default": [],
}) + select({
- ":is_win": [
+ ":tint_build_is_win": [
"printer_windows.cc",
],
"//conditions:default": [],
@@ -104,49 +104,49 @@
)
alias(
- name = "is_linux",
- actual = "//src/tint:is_linux_true",
+ name = "tint_build_is_linux",
+ actual = "//src/tint:tint_build_is_linux_true",
)
alias(
- name = "_not_is_linux_",
- actual = "//src/tint:is_linux_false",
+ name = "_not_tint_build_is_linux_",
+ actual = "//src/tint:tint_build_is_linux_false",
)
alias(
- name = "is_mac",
- actual = "//src/tint:is_mac_true",
+ name = "tint_build_is_mac",
+ actual = "//src/tint:tint_build_is_mac_true",
)
alias(
- name = "_not_is_mac_",
- actual = "//src/tint:is_mac_false",
+ name = "_not_tint_build_is_mac_",
+ actual = "//src/tint:tint_build_is_mac_false",
)
alias(
- name = "is_win",
- actual = "//src/tint:is_win_true",
+ name = "tint_build_is_win",
+ actual = "//src/tint:tint_build_is_win_true",
)
alias(
- name = "_not_is_win_",
- actual = "//src/tint:is_win_false",
+ name = "_not_tint_build_is_win_",
+ actual = "//src/tint:tint_build_is_win_false",
)
selects.config_setting_group(
- name = "is_linux_or_is_mac",
+ name = "tint_build_is_linux_or_tint_build_is_mac",
match_any = [
- "is_linux",
- "is_mac",
+ "tint_build_is_linux",
+ "tint_build_is_mac",
],
)
selects.config_setting_group(
- name = "_not_is_linux__and__not_is_mac__and__not_is_win_",
+ name = "_not_tint_build_is_linux__and__not_tint_build_is_mac__and__not_tint_build_is_win_",
match_all = [
- ":_not_is_linux_",
- ":_not_is_mac_",
- ":_not_is_win_",
+ ":_not_tint_build_is_linux_",
+ ":_not_tint_build_is_mac_",
+ ":_not_tint_build_is_win_",
],
)
diff --git a/src/tint/utils/diagnostic/BUILD.cmake b/src/tint/utils/diagnostic/BUILD.cmake
index c11c314..37b0742 100644
--- a/src/tint/utils/diagnostic/BUILD.cmake
+++ b/src/tint/utils/diagnostic/BUILD.cmake
@@ -60,23 +60,23 @@
tint_utils_traits
)
-if((NOT IS_LINUX) AND (NOT IS_MAC) AND (NOT IS_WIN))
+if((NOT TINT_BUILD_IS_LINUX) AND (NOT TINT_BUILD_IS_MAC) AND (NOT TINT_BUILD_IS_WIN))
tint_target_add_sources(tint_utils_diagnostic lib
"utils/diagnostic/printer_other.cc"
)
-endif((NOT IS_LINUX) AND (NOT IS_MAC) AND (NOT IS_WIN))
+endif((NOT TINT_BUILD_IS_LINUX) AND (NOT TINT_BUILD_IS_MAC) AND (NOT TINT_BUILD_IS_WIN))
-if(IS_LINUX OR IS_MAC)
+if(TINT_BUILD_IS_LINUX OR TINT_BUILD_IS_MAC)
tint_target_add_sources(tint_utils_diagnostic lib
"utils/diagnostic/printer_posix.cc"
)
-endif(IS_LINUX OR IS_MAC)
+endif(TINT_BUILD_IS_LINUX OR TINT_BUILD_IS_MAC)
-if(IS_WIN)
+if(TINT_BUILD_IS_WIN)
tint_target_add_sources(tint_utils_diagnostic lib
"utils/diagnostic/printer_windows.cc"
)
-endif(IS_WIN)
+endif(TINT_BUILD_IS_WIN)
################################################################################
# Target: tint_utils_diagnostic_test
diff --git a/src/tint/utils/diagnostic/BUILD.gn b/src/tint/utils/diagnostic/BUILD.gn
index 637dc85..4bc6b72 100644
--- a/src/tint/utils/diagnostic/BUILD.gn
+++ b/src/tint/utils/diagnostic/BUILD.gn
@@ -64,15 +64,15 @@
"${tint_src_dir}/utils/traits",
]
- if (!is_linux && !is_mac && !is_win) {
+ if (!tint_build_is_linux && !tint_build_is_mac && !tint_build_is_win) {
sources += [ "printer_other.cc" ]
}
- if (is_linux || is_mac) {
+ if (tint_build_is_linux || tint_build_is_mac) {
sources += [ "printer_posix.cc" ]
}
- if (is_win) {
+ if (tint_build_is_win) {
sources += [ "printer_windows.cc" ]
}
}
diff --git a/src/tint/utils/diagnostic/printer_other.cc b/src/tint/utils/diagnostic/printer_other.cc
index c7d438f..2f93fa7 100644
--- a/src/tint/utils/diagnostic/printer_other.cc
+++ b/src/tint/utils/diagnostic/printer_other.cc
@@ -25,7 +25,7 @@
// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// GEN_BUILD:CONDITION((!is_linux) && (!is_mac) && (!is_win))
+// GEN_BUILD:CONDITION((!tint_build_is_linux) && (!tint_build_is_mac) && (!tint_build_is_win))
#include <cstring>
diff --git a/src/tint/utils/diagnostic/printer_posix.cc b/src/tint/utils/diagnostic/printer_posix.cc
index 5094681..3c7ba22 100644
--- a/src/tint/utils/diagnostic/printer_posix.cc
+++ b/src/tint/utils/diagnostic/printer_posix.cc
@@ -25,7 +25,7 @@
// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// GEN_BUILD:CONDITION(is_linux || is_mac)
+// GEN_BUILD:CONDITION(tint_build_is_linux || tint_build_is_mac)
#include <unistd.h>
diff --git a/src/tint/utils/diagnostic/printer_windows.cc b/src/tint/utils/diagnostic/printer_windows.cc
index 5b1e68a..52d3790 100644
--- a/src/tint/utils/diagnostic/printer_windows.cc
+++ b/src/tint/utils/diagnostic/printer_windows.cc
@@ -25,7 +25,7 @@
// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// GEN_BUILD:CONDITION(is_win)
+// GEN_BUILD:CONDITION(tint_build_is_win)
#include <cstring>
diff --git a/src/tint/utils/file/BUILD.bazel b/src/tint/utils/file/BUILD.bazel
index e5c4357..d74bc23 100644
--- a/src/tint/utils/file/BUILD.bazel
+++ b/src/tint/utils/file/BUILD.bazel
@@ -40,17 +40,17 @@
name = "file",
srcs = [
] + select({
- ":_not_is_linux__and__not_is_mac__and__not_is_win_": [
+ ":_not_tint_build_is_linux__and__not_tint_build_is_mac__and__not_tint_build_is_win_": [
"tmpfile_other.cc",
],
"//conditions:default": [],
}) + select({
- ":is_linux_or_is_mac": [
+ ":tint_build_is_linux_or_tint_build_is_mac": [
"tmpfile_posix.cc",
],
"//conditions:default": [],
}) + select({
- ":is_win": [
+ ":tint_build_is_win": [
"tmpfile_windows.cc",
],
"//conditions:default": [],
@@ -82,49 +82,49 @@
)
alias(
- name = "is_linux",
- actual = "//src/tint:is_linux_true",
+ name = "tint_build_is_linux",
+ actual = "//src/tint:tint_build_is_linux_true",
)
alias(
- name = "_not_is_linux_",
- actual = "//src/tint:is_linux_false",
+ name = "_not_tint_build_is_linux_",
+ actual = "//src/tint:tint_build_is_linux_false",
)
alias(
- name = "is_mac",
- actual = "//src/tint:is_mac_true",
+ name = "tint_build_is_mac",
+ actual = "//src/tint:tint_build_is_mac_true",
)
alias(
- name = "_not_is_mac_",
- actual = "//src/tint:is_mac_false",
+ name = "_not_tint_build_is_mac_",
+ actual = "//src/tint:tint_build_is_mac_false",
)
alias(
- name = "is_win",
- actual = "//src/tint:is_win_true",
+ name = "tint_build_is_win",
+ actual = "//src/tint:tint_build_is_win_true",
)
alias(
- name = "_not_is_win_",
- actual = "//src/tint:is_win_false",
+ name = "_not_tint_build_is_win_",
+ actual = "//src/tint:tint_build_is_win_false",
)
selects.config_setting_group(
- name = "is_linux_or_is_mac",
+ name = "tint_build_is_linux_or_tint_build_is_mac",
match_any = [
- "is_linux",
- "is_mac",
+ "tint_build_is_linux",
+ "tint_build_is_mac",
],
)
selects.config_setting_group(
- name = "_not_is_linux__and__not_is_mac__and__not_is_win_",
+ name = "_not_tint_build_is_linux__and__not_tint_build_is_mac__and__not_tint_build_is_win_",
match_all = [
- ":_not_is_linux_",
- ":_not_is_mac_",
- ":_not_is_win_",
+ ":_not_tint_build_is_linux_",
+ ":_not_tint_build_is_mac_",
+ ":_not_tint_build_is_win_",
],
)
diff --git a/src/tint/utils/file/BUILD.cmake b/src/tint/utils/file/BUILD.cmake
index 93eedbe..0dc6cb8 100644
--- a/src/tint/utils/file/BUILD.cmake
+++ b/src/tint/utils/file/BUILD.cmake
@@ -48,23 +48,23 @@
tint_utils_text
)
-if((NOT IS_LINUX) AND (NOT IS_MAC) AND (NOT IS_WIN))
+if((NOT TINT_BUILD_IS_LINUX) AND (NOT TINT_BUILD_IS_MAC) AND (NOT TINT_BUILD_IS_WIN))
tint_target_add_sources(tint_utils_file lib
"utils/file/tmpfile_other.cc"
)
-endif((NOT IS_LINUX) AND (NOT IS_MAC) AND (NOT IS_WIN))
+endif((NOT TINT_BUILD_IS_LINUX) AND (NOT TINT_BUILD_IS_MAC) AND (NOT TINT_BUILD_IS_WIN))
-if(IS_LINUX OR IS_MAC)
+if(TINT_BUILD_IS_LINUX OR TINT_BUILD_IS_MAC)
tint_target_add_sources(tint_utils_file lib
"utils/file/tmpfile_posix.cc"
)
-endif(IS_LINUX OR IS_MAC)
+endif(TINT_BUILD_IS_LINUX OR TINT_BUILD_IS_MAC)
-if(IS_WIN)
+if(TINT_BUILD_IS_WIN)
tint_target_add_sources(tint_utils_file lib
"utils/file/tmpfile_windows.cc"
)
-endif(IS_WIN)
+endif(TINT_BUILD_IS_WIN)
################################################################################
# Target: tint_utils_file_test
diff --git a/src/tint/utils/file/BUILD.gn b/src/tint/utils/file/BUILD.gn
index 612646c..62e1cdc 100644
--- a/src/tint/utils/file/BUILD.gn
+++ b/src/tint/utils/file/BUILD.gn
@@ -50,15 +50,15 @@
"${tint_src_dir}/utils/text",
]
- if (!is_linux && !is_mac && !is_win) {
+ if (!tint_build_is_linux && !tint_build_is_mac && !tint_build_is_win) {
sources += [ "tmpfile_other.cc" ]
}
- if (is_linux || is_mac) {
+ if (tint_build_is_linux || tint_build_is_mac) {
sources += [ "tmpfile_posix.cc" ]
}
- if (is_win) {
+ if (tint_build_is_win) {
sources += [ "tmpfile_windows.cc" ]
}
}
diff --git a/src/tint/utils/file/tmpfile_other.cc b/src/tint/utils/file/tmpfile_other.cc
index 1fcad3f..d8ecad2 100644
--- a/src/tint/utils/file/tmpfile_other.cc
+++ b/src/tint/utils/file/tmpfile_other.cc
@@ -25,7 +25,7 @@
// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// GEN_BUILD:CONDITION((!is_linux) && (!is_mac) && (!is_win))
+// GEN_BUILD:CONDITION((!tint_build_is_linux) && (!tint_build_is_mac) && (!tint_build_is_win))
#include "src/tint/utils/file/tmpfile.h"
diff --git a/src/tint/utils/file/tmpfile_posix.cc b/src/tint/utils/file/tmpfile_posix.cc
index 9114ae0..c7b7178 100644
--- a/src/tint/utils/file/tmpfile_posix.cc
+++ b/src/tint/utils/file/tmpfile_posix.cc
@@ -25,7 +25,7 @@
// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// GEN_BUILD:CONDITION(is_linux || is_mac)
+// GEN_BUILD:CONDITION(tint_build_is_linux || tint_build_is_mac)
#include "src/tint/utils/file/tmpfile.h"
diff --git a/src/tint/utils/file/tmpfile_windows.cc b/src/tint/utils/file/tmpfile_windows.cc
index c6ddc33..486c2ea 100644
--- a/src/tint/utils/file/tmpfile_windows.cc
+++ b/src/tint/utils/file/tmpfile_windows.cc
@@ -25,7 +25,7 @@
// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// GEN_BUILD:CONDITION(is_win)
+// GEN_BUILD:CONDITION(tint_build_is_win)
#include "src/tint/utils/file/tmpfile.h"
diff --git a/src/tint/utils/socket/BUILD.bazel b/src/tint/utils/socket/BUILD.bazel
index 4c1fb71..c236531 100644
--- a/src/tint/utils/socket/BUILD.bazel
+++ b/src/tint/utils/socket/BUILD.bazel
@@ -48,7 +48,7 @@
deps = [
"//src/tint/utils/macros",
] + select({
- ":is_win": [
+ ":tint_build_is_win": [
],
"//conditions:default": [],
@@ -58,7 +58,7 @@
)
alias(
- name = "is_win",
- actual = "//src/tint:is_win_true",
+ name = "tint_build_is_win",
+ actual = "//src/tint:tint_build_is_win_true",
)
diff --git a/src/tint/utils/socket/BUILD.cmake b/src/tint/utils/socket/BUILD.cmake
index 2b9b312..6c69f4c 100644
--- a/src/tint/utils/socket/BUILD.cmake
+++ b/src/tint/utils/socket/BUILD.cmake
@@ -48,8 +48,8 @@
tint_utils_macros
)
-if(IS_WIN)
+if(TINT_BUILD_IS_WIN)
tint_target_add_external_dependencies(tint_utils_socket lib
"winsock"
)
-endif(IS_WIN)
+endif(TINT_BUILD_IS_WIN)
diff --git a/src/tint/utils/socket/BUILD.gn b/src/tint/utils/socket/BUILD.gn
index 0a0ff70..746a415 100644
--- a/src/tint/utils/socket/BUILD.gn
+++ b/src/tint/utils/socket/BUILD.gn
@@ -46,7 +46,7 @@
]
deps = [ "${tint_src_dir}/utils/macros" ]
- if (is_win) {
+ if (tint_build_is_win) {
deps += [ "${tint_src_dir}:winsock" ]
}
}
diff --git a/src/tint/utils/socket/socket.cc b/src/tint/utils/socket/socket.cc
index cd8ecc5..bab68f2 100644
--- a/src/tint/utils/socket/socket.cc
+++ b/src/tint/utils/socket/socket.cc
@@ -30,7 +30,7 @@
#include "src/tint/utils/macros/compiler.h"
#include "src/tint/utils/socket/rwmutex.h"
-#if defined(_WIN32)
+#if TINT_BUILD_IS_WIN
#include <winsock2.h>
#include <ws2tcpip.h>
#else
@@ -44,7 +44,7 @@
#include <cstdio>
#endif
-#if defined(_WIN32)
+#if TINT_BUILD_IS_WIN
#include <atomic>
namespace {
std::atomic<int> wsa_init_count = {0};
@@ -60,7 +60,7 @@
namespace {
constexpr SOCKET InvalidSocket = static_cast<SOCKET>(-1);
void Init() {
-#if defined(_WIN32)
+#if TINT_BUILD_IS_WIN
if (wsa_init_count++ == 0) {
WSADATA winsock_data;
(void)WSAStartup(MAKEWORD(2, 2), &winsock_data);
@@ -69,7 +69,7 @@
}
void Term() {
-#if defined(_WIN32)
+#if TINT_BUILD_IS_WIN
if (--wsa_init_count == 0) {
WSACleanup();
}
@@ -77,7 +77,7 @@
}
bool SetBlocking(SOCKET s, bool blocking) {
-#if defined(_WIN32)
+#if TINT_BUILD_IS_WIN
u_long mode = blocking ? 0 : 1;
return ioctlsocket(s, FIONBIO, &mode) == NO_ERROR;
#else
@@ -113,7 +113,7 @@
addrinfo* info = nullptr;
auto err = getaddrinfo(address, port, &hints, &info);
-#if !defined(_WIN32)
+#if !TINT_BUILD_IS_WIN
if (err) {
printf("getaddrinfo(%s, %s) error: %s\n", address, port, gai_strerror(err));
}
@@ -158,7 +158,7 @@
int enable = 1;
-#if !defined(_WIN32)
+#if !TINT_BUILD_IS_WIN
// Prevent sockets lingering after process termination, causing
// reconnection issues on the same port.
setsockopt(s, SOL_SOCKET, SO_REUSEADDR, reinterpret_cast<char*>(&enable), sizeof(enable));
@@ -168,7 +168,7 @@
int l_linger; /* how many seconds to linger for */
} linger = {false, 0};
setsockopt(s, SOL_SOCKET, SO_LINGER, reinterpret_cast<char*>(&linger), sizeof(linger));
-#endif // !defined(_WIN32)
+#endif // !TINT_BUILD_IS_WIN
// Enable TCP_NODELAY.
setsockopt(s, IPPROTO_TCP, TCP_NODELAY, reinterpret_cast<char*>(&enable), sizeof(enable));
@@ -190,7 +190,7 @@
{
RLock l(mutex);
if (s != InvalidSocket) {
-#if defined(_WIN32)
+#if TINT_BUILD_IS_WIN
closesocket(s);
#else
::shutdown(s, SHUT_RDWR);
@@ -200,7 +200,7 @@
WLock l(mutex);
if (s != InvalidSocket) {
-#if !defined(_WIN32)
+#if !TINT_BUILD_IS_WIN
::close(s);
#endif
s = InvalidSocket;
