aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsnermolaev <snermolaev@yandex-team.com>2024-11-04 07:14:50 +0300
committersnermolaev <snermolaev@yandex-team.com>2024-11-04 07:25:42 +0300
commit03a7163a5505d8197c05d3601b4fd4f654ed3ff0 (patch)
tree040e67ff90b56b3e9ee45b13ec03f0c26005705e
parent1a7579568785bcea1363d6af9dd0e732043ce06a (diff)
downloadydb-03a7163a5505d8197c05d3601b4fd4f654ed3ff0.tar.gz
fix DEFAULT_JDK_VERSION macro
commit_hash:adb862030ba6789e6f89c32f1284455c80523ada
-rw-r--r--build/conf/java.conf16
1 files changed, 12 insertions, 4 deletions
diff --git a/build/conf/java.conf b/build/conf/java.conf
index 7e86268746..86e6b95bd7 100644
--- a/build/conf/java.conf
+++ b/build/conf/java.conf
@@ -2137,23 +2137,31 @@ otherwise {
KOTLIN_JVM_TARGET=$JDK_REAL_VERSION
}
-# tag:java-specific
-### @usage: JDK_VERSION(Version)
+# tag:java-specific tag:internal
+### @usage: _JDK_VERSION_INTERNAL(Version) #internal
###
### Specify JDK version for module
-macro JDK_VERSION(Arg) {
+macro _JDK_VERSION_INTERNAL(Arg) {
.SEM=required_jdk $Arg ${hide;output:"JdkVersionFakeProp.java"}
SET(JDK_REAL_VERSION $Arg)
_JDK_VERSION_MACRO_CHECK($Arg)
}
# tag:java-specific
+### @usage: JDK_VERSION(Version)
+###
+### Specify JDK version for module
+macro JDK_VERSION(Arg) {
+ _JDK_VERSION_INTERNAL($Arg)
+}
+
+# tag:java-specific
### @usage: DEFAULT_JDK_VERSION(Version)
###
### Specify JDK version for module, can be overridden by setting the JDK_VERSION variable
macro DEFAULT_JDK_VERSION(Arg) {
_SET_FIRST_VALUE(_JDK_VERSION $JDK_VERSION $Arg)
- JDK_VERSION($_JDK_VERSION)
+ _JDK_VERSION_INTERNAL($_JDK_VERSION)
}
# tag:java-specific