Move swig related rules into own module

Noop copy of maros and modules to a dedicated place

Invert USE_LOCAL_SWIG conditions in order to switch var value from `yes`/`no` to `no`/`path/to/swigdir` in next PRs

1 files changed, 1 insertions, 58 deletions

diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index 8eae150a18..d3468bbbc4 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -47,6 +47,7 @@ SO_OUTPUTS=no
 @import "${CONF_ROOT}/conf/license.conf"
 @import "${CONF_ROOT}/conf/ts/ts.conf"
 @import "${CONF_ROOT}/conf/docs.conf"
+@import "${CONF_ROOT}/conf/swig.conf"
 @import "${CONF_ROOT}/conf/java.conf"
 
 @import "${CONF_ROOT}/conf/project_specific/other.conf"
@@ -397,18 +398,6 @@ elsewhen ($OS_WINDOWS) {
     CYTHON_OPTIONS += -E UNAME_SYSNAME=Windows
 }
 
-when ($USE_LOCAL_SWIG != "yes") {
-    _SWIG_TOOL=${tool:"contrib/tools/swig"}
-    _SWIG_LIBRARY=contrib/tools/swig/Lib
-    _SWIG_LIBRARY_ABS=$ARCADIA_ROOT/$_SWIG_LIBRARY
-}
-otherwise {
-    _SWIG_TOOL=$SWIG_TOOL
-    _SWIG_LIBRARY=$SWIG_LIBRARY
-    _SWIG_LIBRARY_ABS=$SWIG_LIBRARY
-}
-SWIG_IMPLICIT_INCLUDES = swig.swg go.swg java.swg perl5.swg python.swg
-
 FATAL_ERROR_MODULE=no
 FATAL_ERROR_MESSAGE=
 
@@ -4819,7 +4808,6 @@ otherwise {
     EXTERNAL_JAVA_JDK_RESOURCE=$JDK_RESOURCE
 }
 COMPILE_JAVA=${cwd:ARCADIA_BUILD_ROOT} $YMAKE_PYTHON ${input:"build/scripts/compile_java.py"} --java-bin $EXTERNAL_JAVA_JDK_RESOURCE/bin/java --javac-bin $EXTERNAL_JAVA_JDK_RESOURCE/bin/javac --jar-bin $JDK_RESOURCE/bin/jar --kotlin-compiler $KOTLIN_COMPILER_RESOURCE_GLOBAL/kotlin-compiler.jar $JAVA_VCS_MF_ARG $PACKAGE_PREFIX_ARGS --jar-output $TARGET --srcs-jar-output ${output;suf=-sources.jar:REALPRJNAME} $AUTO_INPUT DELIM $JAVAC_OPTS DELIM $MANAGED_PEERS_CLOSURE DELIM -no-stdlib -module-name $REALPRJNAME -jvm-target ${KOTLIN_JVM_TARGET} ${KOTLINC_OPTS_VALUE} ${kv;hide:"p JV"} ${kv;hide:"pc light-blue"} ${kv;hide:"show_out"} ${requirements;hide:"cpu:2"}
-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
 
 ARGS_DELIM="MACRO_CALLS_DELIM"
 
@@ -6126,32 +6114,6 @@ macro _SRC(EXT, SRC, SRCFLAGS...) {
     # Generic macro definition for _SRC (just a placeholder, it does nothing)
 }
 
-_SWIG_CMD=$_SWIG_PYTHON_CMD
-_SWIG_ADDINCLS=$_SWIG_PYTHON_ADDINCLS
-_SWIG_PEERDIR=$_SWIG_PYTHON_PEERDIR
-_SWIG_SEM_TO_MODULE_LINK=${output;hide;suf=.o:SRC}
-
-_SWIG_PYTHON_CMD=${_SWIG_TOOL} -module ${REALPRJNAME} -cpperraswarn -c++ -python -interface ${MODULE_PREFIX}${REALPRJNAME} -o ${output;noext;main;suf=_wrap.swg.cpp:SRC} ${output;noauto;add_to_outs;hide;tobindir;suf=.py:REALPRJNAME} -outdir ${BINDIR} ${pre=-I:_SWIG__INCLUDE} ${input:SRC} ${kv;hide:"p SW"} ${kv;hide:"pc yellow"}
-_SWIG_PYTHON_ADDINCLS=FOR swig ${_SWIG_LIBRARY}/python FOR swig ${_SWIG_LIBRARY}
-_SWIG_PYTHON_PEERDIR=
-
-_SWIG_PERL_CMD=${_SWIG_TOOL} -c++ -cpperraswarn -module ${REALPRJNAME} -shadow -perl -o ${output;noext;main;suf=_wrap.swg.cpp:SRC} ${output;noauto;add_to_outs;hide;tobindir;suf=.pm:REALPRJNAME} -outdir ${ARCADIA_BUILD_ROOT}/${MODDIR} ${pre=-I:_SWIG__INCLUDE} ${input:SRC} ${kv;hide:"p SW"} ${kv;hide:"pc yellow"}
-_SWIG_PERL_ADDINCLS=FOR swig ${_SWIG_LIBRARY}/perl5 FOR swig ${_SWIG_LIBRARY}
-_SWIG_PERL_PEERDIR=build/platform/perl
-
-_SWIG_JNI_CPP_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} -- ${pre=-I:_SWIG__INCLUDE} -o ${output;noext;suf=_wrap.swg.cpp:SRC} ${kv;hide:"p SW"} ${kv;hide:"pc yellow"}
-_SWIG_JNI_JAVA_CMD=$YMAKE_PYTHON3 ${input:"build/scripts/jni_swig.py"} --swig ${_SWIG_TOOL} --default-module ${nopath;noext:SRC} --src ${input:SRC} --package-by-file ru/yandex/${input;rootrel:SRC} --jsrc ${output;main;suf=.jsrc:SRC} -- ${pre=-I:_SWIG__INCLUDE} -o ${BINDIR}/unused.cpp ${kv;hide:"p SW"} ${kv;hide:"pc yellow"}
-_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} ${kv;hide:"p SW"} ${kv;hide:"pc yellow"}
-_SWIG_JNI_ADDINCLS=FOR swig ${_SWIG_LIBRARY}/java FOR swig $_SWIG_LIBRARY
-_SWIG_JNI_PEERDIR=contrib/libs/jdk
-
-when ($USE_LOCAL_SWIG == "yes") {
-    _SWIG_JNI_ADDINCLS=
-}
-when ($USE_SYSTEM_JDK == "yes" || $OS_ANDROID == "yes") {
-    _SWIG_JNI_PEERDIR=
-}
-
 # tag:src-processing
 macro _SRC("swg", SRC, SRCFLAGS...) {
     .CMD=${_SWIG_CMD}
@@ -6946,25 +6908,6 @@ macro _BUILDWITH_CYTHON_C_API_H(Src, Dep, Options...) {
     ADDINCL(FOR cython contrib/tools/cython/Cython/Includes)
 }
 
-# tag:python-processing tag:internal
-### @usage: _SWIG_PYTHON_CPP(Src, DstSubPrefix) # internal
-###
-### Run swig on Src to produce DstSubPrefix.py and DstSubPrefix_swg.cpp that
-### provides DstSubPrefix_swg python module.
-macro _SWIG_PYTHON_CPP(Src, DstSubPrefix) {
-    .CMD=$_SWIG_TOOL -I$ARCADIA_BUILD_ROOT -I$ARCADIA_ROOT -I$_SWIG_LIBRARY_ABS/python -I$_SWIG_LIBRARY_ABS -c++ -python -module ${nopath:DstSubPrefix} -interface ${nopath;suf=_swg:DstSubPrefix} -o ${output;suf=.swg.cpp:DstSubPrefix} ${input:Src} ${output;noauto;hide;suf=.py:DstSubPrefix} ${kv;hide:"p SW"} ${kv;hide:"pc yellow"}
-    ADDINCL(FOR swig $_SWIG_LIBRARY/python FOR swig $_SWIG_LIBRARY)
-}
-
-# tag:python-processing tag:internal
-### @usage: _SWIG_PYTHON_C(Src, DstSubPrefix) # internal
-###
-### Like _SWIG_PYTHON_CPP but generate DstSubPrefix_swg.c.
-macro _SWIG_PYTHON_C(Src, DstSubPrefix) {
-    .CMD=$_SWIG_TOOL -I$ARCADIA_BUILD_ROOT -I$ARCADIA_ROOT -I$_SWIG_LIBRARY_ABS/python -I$_SWIG_LIBRARY_ABS -python -module ${nopath:DstSubPrefix} -interface ${nopath;suf=_swg:DstSubPrefix} -o ${output;suf=.swg.c:DstSubPrefix} ${input:Src} ${output;noauto;hide;suf=.py:DstSubPrefix} ${kv;hide:"p SW"} ${kv;hide:"pc yellow"}
-    ADDINCL(FOR swig $_SWIG_LIBRARY/python FOR swig $_SWIG_LIBRARY)
-}
-
 ### @usage: BUILDWITH_RAGEL6(Src Options...)
 ###
 ### Compile .rl file using Ragel6.