diff options
| author | thegeorg <thegeorg@yandex-team.com> | 2023-09-18 13:34:23 +0300 |
|---|---|---|
| committer | thegeorg <thegeorg@yandex-team.com> | 2023-09-18 14:04:30 +0300 |
| commit | f9c6de928b8fc9f18206ef247aeb56127adb3107 (patch) | |
| tree | 7e10df929e44296769455f5e9f2c48e03733991b /build/conf | |
| parent | 5a92b71af7de6553080153a01c343e6859ce93fc (diff) | |
| download | ydb-f9c6de928b8fc9f18206ef247aeb56127adb3107.tar.gz | |
Use swig from Arcadia
Diffstat (limited to 'build/conf')
| -rw-r--r-- | build/conf/swig.conf | 41 | ||||
| -rw-r--r-- | build/conf/sysincl.conf | 8 |
2 files changed, 10 insertions, 39 deletions
diff --git a/build/conf/swig.conf b/build/conf/swig.conf index 7bd42ebf53..92f1eefbae 100644 --- a/build/conf/swig.conf +++ b/build/conf/swig.conf @@ -1,37 +1,12 @@ -USE_LOCAL_SWIG=no -SWIG_TOOL=no -SWIG_LIBRARY=no -_SWIG_PYTHON_ADDINCLS= -_SWIG_PERL_ADDINCLS= -_SWIG_JNI_ADDINCLS= - -when ($USE_LOCAL_SWIG == "no") { - _SWIG_TOOL=${tool:"contrib/tools/swig"} - _SWIG_LIBRARY_ABS=$ARCADIA_ROOT/$_SWIG_LIBRARY - - _SWIG_LIBRARY=contrib/tools/swig/Lib - _SWIG_PYTHON_ADDINCLS=FOR swig ${_SWIG_LIBRARY}/python FOR swig ${_SWIG_LIBRARY} - _SWIG_PERL_ADDINCLS=FOR swig ${_SWIG_LIBRARY}/perl5 FOR swig ${_SWIG_LIBRARY} - _SWIG_JNI_ADDINCLS=FOR swig ${_SWIG_LIBRARY}/java FOR swig $_SWIG_LIBRARY -} -otherwise { - when ($SWIG_TOOL != "no") { - _SWIG_TOOL=$SWIG_TOOL - } - otherwise { - _SWIG_TOOL=${USE_LOCAL_SWIG}/bin/swig - } +_SWIG_TOOL=${tool:"contrib/tools/swig"} + +_SWIG_LIBRARY=contrib/tools/swig/Lib +_SWIG_LIBRARY_ABS=$ARCADIA_ROOT/$_SWIG_LIBRARY + +_SWIG_PYTHON_ADDINCLS=FOR swig ${_SWIG_LIBRARY}/python FOR swig ${_SWIG_LIBRARY} +_SWIG_PERL_ADDINCLS=FOR swig ${_SWIG_LIBRARY}/perl5 FOR swig ${_SWIG_LIBRARY} +_SWIG_JNI_ADDINCLS=FOR swig ${_SWIG_LIBRARY}/java FOR swig $_SWIG_LIBRARY - when ($SWIG_LIBRARY != "no") { - _SWIG_LIBRARY_ABS=$SWIG_LIBRARY - } - elsewhen ($OS_WINDOWS == "yes") { - _SWIG_LIBRARY_ABS=${USE_LOCAL_SWIG}/bin/Lib - } - otherwise { - _SWIG_LIBRARY_ABS=${USE_LOCAL_SWIG}/share/swig - } -} SWIG_IMPLICIT_INCLUDES = swig.swg go.swg java.swg perl5.swg python.swg _SWIG_CMD=$_SWIG_PYTHON_CMD diff --git a/build/conf/sysincl.conf b/build/conf/sysincl.conf index 1c0573ed6b..657ad1b01d 100644 --- a/build/conf/sysincl.conf +++ b/build/conf/sysincl.conf @@ -12,12 +12,8 @@ SYSINCL+=build/sysincl/nvidia.yml SYSINCL+=build/sysincl/misc.yml SYSINCL+=build/sysincl/unsorted.yml -when ($USE_LOCAL_SWIG != "no") { - SYSINCL+=build/sysincl/swig-to-nothing.yml -} -otherwise { - SYSINCL+=build/sysincl/swig.yml -} +# FIXME: Make SWIG_IMPLICIT_INCLUDES more granular and get rid of swig.yml +SYSINCL+=build/sysincl/swig.yml when ($USE_SYSTEM_JDK) { SYSINCL+=build/sysincl/system-jdk.yml |