move more stuff to specific confs

4 files changed, 88 insertions, 85 deletions

diff --git a/build/conf/java.conf b/build/conf/java.conf
index 8943a0dcbc..85c6e336cf 100644
--- a/build/conf/java.conf
+++ b/build/conf/java.conf
@@ -579,6 +579,9 @@ macro _ADD_OPTS_IF_NON_EMPTY(Opt, Args...) {
 macro _ADD_GEN_POM_FROM_COORD_FILES_ARGS(Deps...) {
     .CMD=${pre=--deps-coords ;ext=.jar;suf=.mvn_coords:Deps}
 }
+
+MAVEN_BIN=$MAVEN_RESOURCE_GLOBAL/bin/mvn
+
 MAVEN_EXPORT_OUT_DIR_FLAG=$_ADD_OPTS_IF_NON_EMPTY(--output-dir ${MAVEN_EXPORT_OUT_DIR})
 MAVEN_EXPORT_SOURCE_DIRS=$_ADD_OPTS_IF_NON_EMPTY(--source-dirs ${ALL_SRCDIRS})
 MAVEN_EXPORT_DEPS_COORS=$_ADD_GEN_POM_FROM_COORD_FILES_ARGS(${MANAGED_PEERS_CLOSURE})
@@ -1785,3 +1788,42 @@ module JSRC_LIBRARY: _BARE_UNIT {
 
     NO_RUNTIME()
 }
+
+# tag:java-specific
+when ($JDK_REAL_VERSION == "10") {
+    JDK10=yes # remove this later
+}
+JAVA_PROGRAM_CP_USE_COMMAND_FILE=yes
+when ($JDK_REAL_VERSION == "8") {
+    JAVA_PROGRAM_CP_USE_COMMAND_FILE=no
+}
+
+# tag:kotlin-specific
+KOTLIN_JVM_TARGET=
+when ($JDK_REAL_VERSION == "8") {
+    KOTLIN_JVM_TARGET=1.8
+}
+elsewhen ($JDK_REAL_VERSION == "20") {
+    # remove when kotlin starts supporting jdk20 bytecode
+    # see also devtools/ya/jbuild/gen/actions/idea.py
+    KOTLIN_JVM_TARGET=19
+}
+otherwise {
+    KOTLIN_JVM_TARGET=$JDK_REAL_VERSION
+}
+
+# tag:java-specific
+### @usage: JDK_VERSION(Version)
+###
+### Specify JDK version for module
+macro JDK_VERSION(Arg) {
+    .SEM=required_jdk $Arg ${output;hide:"JdkVersionFakeProp.java"}
+    SET(JDK_REAL_VERSION $Arg)
+    _JDK_VERSION_MACRO_CHECK($Arg)
+}
+
+# tag:java-specific
+# local jdk and tools
+USE_SYSTEM_JDK=
+USE_SYSTEM_UBERJAR=
+USE_SYSTEM_ERROR_PRONE=
diff --git a/build/conf/misc.conf b/build/conf/misc.conf
new file mode 100644
index 0000000000..d640f6ff4c
--- /dev/null
+++ b/build/conf/misc.conf
@@ -0,0 +1,37 @@
+
+# tag:external-build
+CONTAINER_LAYER_CMD=$YMAKE_PYTHON ${input:"build/scripts/make_container_layer.py"} -s $SQUASHFS_RESOURCE_GLOBAL -o $TARGET $AUTO_INPUT ${cwd:ARCADIA_BUILD_ROOT} ${kv;hide:"p CL"} ${kv;hide:"pc blue"}
+CONTAINER_CMD=$YMAKE_PYTHON ${input:"build/scripts/make_container.py"} -s $SQUASHFS_RESOURCE_GLOBAL -o $TARGET ${rootrel:PEERS} ${cwd:ARCADIA_BUILD_ROOT} ${kv;hide:"p CN"} ${kv;hide:"pc blue"}
+
+# tag:external-build
+module CONTAINER_LAYER: _BARE_UNIT {
+    .CMD=CONTAINER_LAYER_CMD
+    PEERDIR(build/external_resources/squashfs_tools)
+
+    MODULE_SUFFIX=.container_layer
+    CHECK_ALLOWED_PATH()
+    CHECK_DEPENDENT_DIRS(ALLOW_ONLY PEERDIRS base_layers build/external_resources/squashfs_tools build/platform/python/ymake_python3 junk)
+}
+
+# tag:external-build
+module CONTAINER: _BARE_UNIT {
+    .NODE_TYPE=Bundle
+    .PEERDIR_POLICY=as_build_from
+    .FINAL_TARGET=yes
+    .CMD=CONTAINER_CMD
+    PEERDIR(build/external_resources/squashfs_tools)
+    PEERDIR(devtools/contrib/cake/entry)
+}
+
+# tag:external-build
+CUSTOM_BUILD_LIBRARY_USE=
+CUSTOM_BUILD_LIBRARY_CMD=$GENERATE_MF && ${tool:"devtools/experimental/solar/outbuild/runner"} ${hide:PEERS} --script=${input:CUSTOM_SCRIPT} --output $TARGET --python=${tool:"contrib/tools/python3"} --isolator=${tool:"devtools/experimental/solar/outbuild/isolator"} $CUSTOM_BUILD_LIBRARY_USE
+
+# tag:external-build
+module CUSTOM_BUILD_LIBRARY: LIBRARY {
+    .NODE_TYPE=Bundle
+    .PEERDIR_POLICY=as_build_from
+    .PROXY=yes
+    .CMD=CUSTOM_BUILD_LIBRARY_CMD
+    DISABLE(NEED_ADD_FAKE_SRC)
+}
diff --git a/build/conf/project_specific/maps/mapkit.conf b/build/conf/project_specific/maps/mapkit.conf
index 52afc6151a..d7027d3e56 100644
--- a/build/conf/project_specific/maps/mapkit.conf
+++ b/build/conf/project_specific/maps/mapkit.conf
@@ -357,3 +357,10 @@ when ($MAPSMOBI_BUILD_TARGET == "yes" && $OS_LINUX != "yes") {
     ARCADIA_CURL_DNS_RESOLVER=MULTITHREADED
 }
 
+when ($QT_REQUIRED) {
+    QT_BIN=${HOST_QT_RESOURCE_GLOBAL}/bin
+}
+
+when ($OPENGL_REQUIRED) {
+    OPENGL_VERSION=18.0.5
+}
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index 3f1a1e9e26..148f5d3729 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -6434,39 +6434,6 @@ otherwise {
     TEST_IOS_RUNTIME_TYPE_VALUE=$IOS_RUNTIME
 }
 
-# tag:java-specific
-### @usage: JDK_VERSION(Version)
-###
-### Specify JDK version for module
-macro JDK_VERSION(Arg) {
-    .SEM=required_jdk $Arg ${output;hide:"JdkVersionFakeProp.java"}
-    SET(JDK_REAL_VERSION $Arg)
-    _JDK_VERSION_MACRO_CHECK($Arg)
-}
-
-# tag:java-specific
-when ($JDK_REAL_VERSION == "10") {
-    JDK10=yes # remove this later
-}
-JAVA_PROGRAM_CP_USE_COMMAND_FILE=yes
-when ($JDK_REAL_VERSION == "8") {
-    JAVA_PROGRAM_CP_USE_COMMAND_FILE=no
-}
-
-# tag:kotlin-specific
-KOTLIN_JVM_TARGET=
-when ($JDK_REAL_VERSION == "8") {
-    KOTLIN_JVM_TARGET=1.8
-}
-elsewhen ($JDK_REAL_VERSION == "20") {
-    # remove when kotlin starts supporting jdk20 bytecode
-    # see also devtools/ya/jbuild/gen/actions/idea.py
-    KOTLIN_JVM_TARGET=19
-}
-otherwise {
-    KOTLIN_JVM_TARGET=$JDK_REAL_VERSION
-}
-
 # tag:frontend-specific
 ### @usage: COLLECT_FRONTEND_FILES(Varname, Dir)
 ###
@@ -6475,12 +6442,6 @@ macro COLLECT_FRONTEND_FILES(Varname, Dir) {
     _GLOB($Varname $Dir/**/*.(css|ejs|jpg|js|jsx|png|styl|svg|ts|tsx|json|html))
 }
 
-# tag:java-specific
-# local jdk and tools
-USE_SYSTEM_JDK=
-USE_SYSTEM_UBERJAR=
-USE_SYSTEM_ERROR_PRONE=
-
 # tag:swift-specific
 CPP_XCODE_TOOLCHAIN_VERSION=9.2
 SWIFT_XCODE_TOOLCHAIN_VERSION=9.2
@@ -6519,15 +6480,6 @@ when (!$TENSORRT_VERSION) {
 
 ANDROID_APK_TEST_ACTIVITY_VALUE=com.yandex.test.unittests/.RunTestsActivity
 
-MAVEN_BIN=$MAVEN_RESOURCE_GLOBAL/bin/mvn
-
-when ($QT_REQUIRED) {
-    QT_BIN=${HOST_QT_RESOURCE_GLOBAL}/bin
-}
-when ($OPENGL_REQUIRED) {
-    OPENGL_VERSION=18.0.5
-}
-
 # tag:windows-specific
 WINDOWS_MANIFEST=
 macro WINDOWS_MANIFEST(Manifest) {
@@ -6598,43 +6550,6 @@ macro NGINX_MODULES(Modules...) {
     RUN_PROGRAM(nginx/module_gen ${Modules} CWD ${ARCADIA_ROOT} IN ${suf=/modules.json:Modules} OUTPUT_INCLUDES contrib/nginx/core/src/core/ngx_config.h contrib/nginx/core/src/core/ngx_core.h STDOUT ngx_modules.c)
 }
 
-# tag:external-build
-CONTAINER_LAYER_CMD=$YMAKE_PYTHON ${input:"build/scripts/make_container_layer.py"} -s $SQUASHFS_RESOURCE_GLOBAL -o $TARGET $AUTO_INPUT ${cwd:ARCADIA_BUILD_ROOT} ${kv;hide:"p CL"} ${kv;hide:"pc blue"}
-CONTAINER_CMD=$YMAKE_PYTHON ${input:"build/scripts/make_container.py"} -s $SQUASHFS_RESOURCE_GLOBAL -o $TARGET ${rootrel:PEERS} ${cwd:ARCADIA_BUILD_ROOT} ${kv;hide:"p CN"} ${kv;hide:"pc blue"}
-
-# tag:external-build
-module CONTAINER_LAYER: _BARE_UNIT {
-    .CMD=CONTAINER_LAYER_CMD
-    PEERDIR(build/external_resources/squashfs_tools)
-
-    MODULE_SUFFIX=.container_layer
-    CHECK_ALLOWED_PATH()
-    CHECK_DEPENDENT_DIRS(ALLOW_ONLY PEERDIRS base_layers build/external_resources/squashfs_tools build/platform/python/ymake_python3 junk)
-}
-
-# tag:external-build
-module CONTAINER: _BARE_UNIT {
-    .NODE_TYPE=Bundle
-    .PEERDIR_POLICY=as_build_from
-    .FINAL_TARGET=yes
-    .CMD=CONTAINER_CMD
-    PEERDIR(build/external_resources/squashfs_tools)
-    PEERDIR(devtools/contrib/cake/entry)
-}
-
-# tag:external-build
-CUSTOM_BUILD_LIBRARY_USE=
-CUSTOM_BUILD_LIBRARY_CMD=$GENERATE_MF && ${tool:"devtools/experimental/solar/outbuild/runner"} ${hide:PEERS} --script=${input:CUSTOM_SCRIPT} --output $TARGET --python=${tool:"contrib/tools/python3"} --isolator=${tool:"devtools/experimental/solar/outbuild/isolator"} $CUSTOM_BUILD_LIBRARY_USE
-
-# tag:external-build
-module CUSTOM_BUILD_LIBRARY: LIBRARY {
-    .NODE_TYPE=Bundle
-    .PEERDIR_POLICY=as_build_from
-    .PROXY=yes
-    .CMD=CUSTOM_BUILD_LIBRARY_CMD
-    DISABLE(NEED_ADD_FAKE_SRC)
-}
-
 ### @usage: ORIGINAL_SOURCE(Source)
 ###
 ### This macro specifies the source repository for contrib
@@ -6761,3 +6676,5 @@ macro ALICE_CAPABILITY() {
 
     JAVA_PROTO_PLUGIN(alice_capability_java alice/library/go/java_marker_interface_protoc_plugin DEPS alice/protos/endpoint/java_interface alice/megamind/protos/scenarios/java_interface)
 }
+
+@import "${CONF_ROOT}/conf/misc.conf"