aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsvidyuk <svidyuk@yandex-team.com>2025-01-21 06:30:00 +0300
committersvidyuk <svidyuk@yandex-team.com>2025-01-21 06:51:30 +0300
commit06e85acf4c773282303b439f027e769c705bd34a (patch)
treea741fd2609469b6d40317a9fdab7177df495a931
parent5b90dce1b9ab8d0c7c86110656d2257a4c78ac0f (diff)
downloadydb-06e85acf4c773282303b439f027e769c705bd34a.tar.gz
Remove ancient DLL_JAVA implementation
commit_hash:0f94f3592c8bd6af74f451cf8f388fff380fc27d
-rw-r--r--build/conf/java.conf3
-rw-r--r--build/conf/linkers/ld.conf6
-rw-r--r--build/conf/linkers/msvc_linker.conf2
-rw-r--r--build/conf/swig.conf2
-rw-r--r--build/scripts/build_dll_and_java.py47
-rw-r--r--build/scripts/ya.make1
6 files changed, 0 insertions, 61 deletions
diff --git a/build/conf/java.conf b/build/conf/java.conf
index 0b78fbab23..b49301eeff 100644
--- a/build/conf/java.conf
+++ b/build/conf/java.conf
@@ -1325,9 +1325,6 @@ module _JAR_TEST: _COMPILABLE_JAR_BASE {
}
# tag:java-specific
-JAVA_SWIG_DELIM=JAVA_SWIG_DELIM
-
-# tag:java-specific
JDK_REAL_VERSION=
JDK_VERSION=
diff --git a/build/conf/linkers/ld.conf b/build/conf/linkers/ld.conf
index b189bf1e17..28d14f24c0 100644
--- a/build/conf/linkers/ld.conf
+++ b/build/conf/linkers/ld.conf
@@ -334,12 +334,6 @@ LINK_EXEC_DYN_LIB=\
$DWARF_COMMAND && \
$LINK_ADDITIONAL_SECTIONS_COMMAND
-SWIG_DLL_JAR_CMD=\
- $GENERATE_MF && \
- $GENERATE_VCS_C_INFO_NODEP && \
- $REAL_SWIG_DLL_JAR_CMD && \
- $DWARF_COMMAND
-
_LD_LINK_LIB_EXTRA_INPUT=
_LD_TAIL_LINK_LIB=$AUTO_INPUT $_LD_LINK_LIB_EXTRA_INPUT ${hide;kv:"p AR"} $TOOLCHAIN_ENV ${hide;kv:"pc light-red"} ${hide;kv:"show_out"}
_LD_ARCHIVER=$YMAKE_PYTHON ${input:"build/scripts/link_lib.py"} ${quo:AR_TOOL} $AR_TYPE $_LD_LLVM_AR_FORMAT $ARCADIA_BUILD_ROOT $_LD_AR_PLUGIN
diff --git a/build/conf/linkers/msvc_linker.conf b/build/conf/linkers/msvc_linker.conf
index c94cd67c9b..df638dc2d0 100644
--- a/build/conf/linkers/msvc_linker.conf
+++ b/build/conf/linkers/msvc_linker.conf
@@ -174,8 +174,6 @@ REAL_LINK_DYN_LIB_CMDLINE=\
REAL_LINK_DYN_LIB=$REAL_LINK_DYN_LIB_IMPL($_WHOLE_ARCHIVE_PEERS_VALUE)
-SWIG_DLL_JAR_CMD=$GENERATE_MF && $GENERATE_VCS_C_INFO_NODEP && $REAL_SWIG_DLL_JAR_CMD
-
_MSVC_HEAD_LINK_LIB=${TOOLCHAIN_ENV} ${cwd:ARCADIA_BUILD_ROOT} ${LIB_WRAPPER} ${LINK_LIB_CMD}
_MSVC_TAIL_LINK_LIB=\
--ya-start-command-file \
diff --git a/build/conf/swig.conf b/build/conf/swig.conf
index 2dcb707af4..6c3061e308 100644
--- a/build/conf/swig.conf
+++ b/build/conf/swig.conf
@@ -17,8 +17,6 @@ _SWIG_JNI_JAVA_CMD=$YMAKE_PYTHON3 ${input:"build/scripts/jni_swig.py"} --swig ${
_SWIG_JNI_CMD=$YMAKE_PYTHON3 ${input:"build/scripts/jni_swig.py"} --swig ${_SWIG_TOOL} --default-module ${nopath;noext:SRC} --src ${input:SRC} --out-header ${output;main;noext;suf=_wrap.swg.h:SRC} --package-by-file ru/yandex/${input;rootrel:SRC} --jsrc ${output;suf=.jsrc:SRC} -- ${pre=-I:_SWIG__INCLUDE} -o ${output;noext;suf=_wrap.swg.cpp:SRC} ${hide;kv:"p SW"} ${hide;kv:"pc yellow"}
_SWIG_JNI_PEERDIR=contrib/libs/jdk
-REAL_SWIG_DLL_JAR_CMD=$GENERATE_VCS_JAVA_INFO_NODEP && ${cwd:ARCADIA_BUILD_ROOT} $YMAKE_PYTHON ${input:"build/scripts/build_dll_and_java.py"} $JAVA_SWIG_DELIM $REAL_LINK_DYN_LIB $JAVA_SWIG_DELIM $COMPILE_JAVA $JAVA_SWIG_DELIM $AUTO_INPUT $JAVA_SWIG_DELIM $TARGET $JAVA_SWIG_DELIM ${output;suf=.jar:REALPRJNAME} $JAVA_SWIG_DELIM ${output;suf=-sources.jar:REALPRJNAME} $JAVA_SWIG_DELIM $ARCADIA_BUILD_ROOT $ARCADIA_ROOT
-
when ($USE_SYSTEM_JDK == "yes" || $OS_ANDROID == "yes") {
_SWIG_JNI_PEERDIR=
}
diff --git a/build/scripts/build_dll_and_java.py b/build/scripts/build_dll_and_java.py
deleted file mode 100644
index b9d8aff4df..0000000000
--- a/build/scripts/build_dll_and_java.py
+++ /dev/null
@@ -1,47 +0,0 @@
-import os
-import subprocess
-import sys
-
-
-def just_do_it(argv):
- delim = argv[0]
- args = []
- for item in argv:
- if item == delim:
- args.append([])
- else:
- args[-1].append(item)
- dll_cmd, java_cmd, inputs, dll_out, java_out, jsrs_out, roots = args
- dll_out, java_out, jsrs_out, build_root, source_root = dll_out[0], java_out[0], jsrs_out[0], roots[0], roots[1]
- for inp in inputs:
- origin_inp = inp
- if os.path.isabs(inp):
- if os.path.relpath(inp, build_root).startswith('..'):
- inp = os.path.relpath(inp, source_root)
- else:
- inp = os.path.relpath(inp, build_root)
- ext = os.path.splitext(inp)[1]
- if ext in ('.o', '.obj'):
- if os.path.join(build_root, inp) in java_cmd:
- inp = os.path.join(build_root, inp)
- if sys.platform == 'win32':
- inp = inp.replace('\\', '/')
- if inp not in java_cmd:
- inp = build_root + '/' + inp
- java_cmd.remove(inp)
- if ext in ('.java', '.jsrc'):
- if origin_inp in dll_cmd:
- inp = origin_inp
- elif os.path.join(build_root, inp) in dll_cmd:
- inp = os.path.join(build_root, inp)
- if sys.platform == 'win32':
- inp = inp.replace('\\', '/')
- dll_cmd.remove(inp)
- java_cmd.insert(java_cmd.index(dll_out), java_out)
- java_cmd.remove(dll_out)
- subprocess.check_call(java_cmd)
- subprocess.check_call(dll_cmd)
-
-
-if __name__ == '__main__':
- just_do_it(sys.argv[1:])
diff --git a/build/scripts/ya.make b/build/scripts/ya.make
index 44752603d0..4dbc7581eb 100644
--- a/build/scripts/ya.make
+++ b/build/scripts/ya.make
@@ -41,7 +41,6 @@ ELSEIF (PY3)
TEST_SRCS(
append_file.py
autotar_gendirs.py
- build_dll_and_java.py
build_info_gen.py
build_java_codenav_index.py
build_java_with_error_prone2.py