Use swig from Arcadia

3 files changed, 10 insertions, 274 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
diff --git a/build/sysincl/swig-to-nothing.yml b/build/sysincl/swig-to-nothing.yml
deleted file mode 100644
index 1d3f987371..0000000000
--- a/build/sysincl/swig-to-nothing.yml
+++ /dev/null
@@ -1,235 +0,0 @@
-- includes:
-# (cd $S/contrib/tools/swig/Lib; find * '(' -not -path '*/*' -or -path 'typemaps/*' ')' -and '(' -name '*.i' -or -name '*.swg' ')' ) | awk '{print "  - "$0}'
-  - allkw.swg
-  - attribute.i
-  - carrays.i
-  - cdata.i
-  - cmalloc.i
-  - constraints.i
-  - cpointer.i
-  - cstring.i
-  - cwstring.i
-  - director_common.swg
-  - exception.i
-  - intrusive_ptr.i
-  - inttypes.i
-  - math.i
-  - pointer.i
-  - runtime.swg
-  - shared_ptr.i
-  - std_except.i
-  - stdint.i
-  - stl.i
-  - swigarch.i
-  - swigerrors.swg
-  - swigfragments.swg
-  - swiginit.swg
-  - swiglabels.swg
-  - swigrun.i
-  - swigrun.swg
-  - swig.swg
-  - swigwarnings.swg
-  - swigwarn.swg
-  - typemaps/attribute.swg
-  - typemaps/carrays.swg
-  - typemaps/cdata.swg
-  - typemaps/cmalloc.swg
-  - typemaps/cpointer.swg
-  - typemaps/cstring.swg
-  - typemaps/cstrings.swg
-  - typemaps/cwstring.swg
-  - typemaps/enumint.swg
-  - typemaps/exception.swg
-  - typemaps/factory.swg
-  - typemaps/fragments.swg
-  - typemaps/implicit.swg
-  - typemaps/inoutlist.swg
-  - typemaps/misctypes.swg
-  - typemaps/primtypes.swg
-  - typemaps/ptrtypes.swg
-  - typemaps/std_except.swg
-  - typemaps/std_string.swg
-  - typemaps/std_strings.swg
-  - typemaps/std_wstring.swg
-  - typemaps/string.swg
-  - typemaps/strings.swg
-  - typemaps/swigmacros.swg
-  - typemaps/swigobject.swg
-  - typemaps/swigtype.swg
-  - typemaps/swigtypemaps.swg
-  - typemaps/typemaps.swg
-  - typemaps/valtypes.swg
-  - typemaps/void.swg
-  - typemaps/wstring.swg
-  - wchar.i
-  - windows.i
-# (cd $S/contrib/tools/swig/Lib/python; find * '(' -not -path '*/*' -or -path 'typemaps/*' ')' -and '(' -name '*.i' -or -name '*.swg' ')' ) | awk '{print "  - "$0}'
-  - argcargv.i
-  - attribute.i
-  - boost_shared_ptr.i
-  - builtin.swg
-  - carrays.i
-  - ccomplex.i
-  - cdata.i
-  - cmalloc.i
-  - complex.i
-  - cpointer.i
-  - cstring.i
-  - cwstring.i
-  - defarg.swg
-  - director.swg
-  - embed.i
-  - exception.i
-  - factory.i
-  - file.i
-  - implicit.i
-  - pyabc.i
-  - pyapi.swg
-  - pybackward.swg
-  - pybuffer.i
-  - pyclasses.swg
-  - pycomplex.swg
-  - pycontainer.swg
-  - pydocs.swg
-  - pyerrors.swg
-  - pyfragments.swg
-  - pyhead.swg
-  - pyinit.swg
-  - pyiterators.swg
-  - pymacros.swg
-  - pyname_compat.i
-  - pyopers.swg
-  - pyprimtypes.swg
-  - pyrun.swg
-  - pyruntime.swg
-  - pystdcommon.swg
-  - pystrings.swg
-  - pythonkw.swg
-  - python.swg
-  - pythreads.swg
-  - pytuplehlp.swg
-  - pytypemaps.swg
-  - pyuserdir.swg
-  - pywstrings.swg
-  - std_alloc.i
-  - std_array.i
-  - std_auto_ptr.i
-  - std_basic_string.i
-  - std_carray.i
-  - std_char_traits.i
-  - std_common.i
-  - std_complex.i
-  - std_container.i
-  - std_deque.i
-  - std_except.i
-  - std_ios.i
-  - std_iostream.i
-  - std_list.i
-  - std_map.i
-  - std_multimap.i
-  - std_multiset.i
-  - std_pair.i
-  - std_set.i
-  - std_shared_ptr.i
-  - std_sstream.i
-  - std_streambuf.i
-  - std_string.i
-  - std_unordered_map.i
-  - std_unordered_multimap.i
-  - std_unordered_multiset.i
-  - std_unordered_set.i
-  - std_vectora.i
-  - std_vector.i
-  - std_wios.i
-  - std_wiostream.i
-  - std_wsstream.i
-  - std_wstreambuf.i
-  - std_wstring.i
-  - stl.i
-  - typemaps.i
-  - wchar.i
-# (cd $S/contrib/tools/swig/Lib/java; find * '(' -not -path '*/*' -or -path 'typemaps/*' ')' -and '(' -name '*.i' -or -name '*.swg' ')' ) | awk '{print "  - "$0}'
-  - arrays_java.i
-  - boost_intrusive_ptr.i
-  - boost_shared_ptr.i
-  - director.swg
-  - enumsimple.swg
-  - enums.swg
-  - enumtypesafe.swg
-  - enumtypeunsafe.swg
-  - javahead.swg
-  - javakw.swg
-  - java.swg
-  - std_array.i
-  - std_auto_ptr.i
-  - std_common.i
-  - std_deque.i
-  - std_except.i
-  - std_list.i
-  - std_map.i
-  - std_pair.i
-  - std_set.i
-  - std_shared_ptr.i
-  - std_string.i
-  - std_unordered_map.i
-  - std_unordered_set.i
-  - std_vector.i
-  - std_wstring.i
-  - stl.i
-  - swiginterface.i
-  - typemaps.i
-  - various.i
-# (cd $S/contrib/tools/swig/Lib/go; find * '(' -not -path '*/*' -or -path 'typemaps/*' ')' -and '(' -name '*.i' -or -name '*.swg' ')' ) | awk '{print "  - "$0}'
-  - cdata.i
-  - director.swg
-  - exception.i
-  - gokw.swg
-  - goruntime.swg
-  - gostring.swg
-  - go.swg
-  - std_common.i
-  - std_deque.i
-  - std_except.i
-  - std_list.i
-  - std_map.i
-  - std_pair.i
-  - std_string.i
-  - std_vector.i
-  - stl.i
-  - typemaps.i
-# (cd $S/contrib/tools/swig/Lib/perl5; find * '(' -not -path '*/*' -or -path 'typemaps/*' ')' -and '(' -name '*.i' -or -name '*.swg' ')' ) | awk '{print "  - "$0}'
-  - attribute.i
-  - carrays.i
-  - cdata.i
-  - cmalloc.i
-  - cpointer.i
-  - cstring.i
-  - director.swg
-  - exception.i
-  - factory.i
-  - perl5.swg
-  - perlerrors.swg
-  - perlfragments.swg
-  - perlhead.swg
-  - perlinit.swg
-  - perlkw.swg
-  - perlmacros.swg
-  - perlmain.i
-  - perlopers.swg
-  - perlprimtypes.swg
-  - perlrun.swg
-  - perlruntime.swg
-  - perlstrings.swg
-  - perltypemaps.swg
-  - perluserdir.swg
-  - reference.i
-  - std_common.i
-  - std_deque.i
-  - std_except.i
-  - std_list.i
-  - std_map.i
-  - std_pair.i
-  - std_string.i
-  - std_vector.i
-  - stl.i
-  - typemaps.i