Browse Source

Proofread contrib/tools/swig licenses

`LicenseRef-scancode-swig` stands for

```
You may copy, modify, distribute, and make derivative works based on
this software, in source code or object code form, without
restriction. If you distribute the software to others, you may do
so according to the terms of your choice. This software is offered as
is, without warranty of any kind.
```
thegeorg 1 year ago
parent
commit
24b02b90c8
3 changed files with 10 additions and 22 deletions
  1. 2 1
      build/conf/license.conf
  2. 4 12
      build/conf/swig.conf
  3. 4 9
      build/ymake.core.conf

+ 2 - 1
build/conf/license.conf

@@ -143,7 +143,6 @@ LICENSES_UNATTRIBUTED= \
     LicenseRef-scancode-secret-labs-2011 \
     LicenseRef-scancode-ssleay-windows \
     LicenseRef-scancode-sun-source \
-    LicenseRef-scancode-swig \
     LicenseRef-scancode-unknown \
     LicenseRef-scancode-unknown-license-reference \
     LicenseRef-scancode-unknown-spdx \
@@ -301,6 +300,7 @@ LICENSES_PERMISSIVE= \
     libpng-2.0 \
     LicenseRef-scancode-ams-fonts \
     LicenseRef-scancode-bitstream \
+    LicenseRef-scancode-swig \
     Linux-OpenIB \
     Martin-Birgmeier \
     Minpack \
@@ -399,6 +399,7 @@ LICENSES_REQUIRE_CITATION= \
     CC-BY-4.0 \
     Cmu-Computing-Services \
     Custom-Oasis-Pkcs11 \
+    Custom-swig \
     EDL-1.0 \
     HPND \
     Info-Zip \

+ 4 - 12
build/conf/swig.conf

@@ -3,22 +3,14 @@ _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
-
 SWIG_IMPLICIT_INCLUDES = swig.swg go.swg java.swg perl5.swg python.swg
 
 _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_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_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"}
@@ -38,7 +30,7 @@ when ($USE_SYSTEM_JDK == "yes" || $OS_ANDROID == "yes") {
 ### 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=$_SWIG_PYTHON_ADDINCLS
+    .PEERDIR=contrib/tools/swig/Lib/python
 }
 
 # tag:python-processing tag:internal
@@ -47,7 +39,7 @@ macro _SWIG_PYTHON_CPP(Src, DstSubPrefix) {
 ### 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=$_SWIG_PYTHON_ADDINCLS
+    .PEERDIR=contrib/tools/swig/Lib/python
 }
 
 _EXPLICIT_SWIG_JAVA_SOURCES=
@@ -64,6 +56,7 @@ macro _JNI_CPP_SWIG_SRCS(Srcs...) {
     SRCS(${ext=.cpp:Srcs} ${ext=.swg:Srcs})
     _EXPORT_JAVA_BINDINGS(${ext=.java:Srcs})
     _EXPORT_SWIG_SOURCES(${ext=.swg:Srcs})
+    .PEERDIR=contrib/tools/swig/Lib/java
 }
 macro _JNI_JAVA_SWIG_SRCS(Srcs...) {
     SRCS(${ext=.java:Srcs} ${ext=.swg:Srcs})
@@ -104,8 +97,7 @@ multimodule DLL_JAVA {
 
         SWIG_LANG=jni_java
         _SWIG_CMD=$_SWIG_JNI_JAVA_CMD
-        _SWIG_ADDINCLS=$_SWIG_JNI_ADDINCLS
-        _SWIG_PEERDIR=$_SWIG_JNI_PEERDIR
+        _SWIG_PEERDIR=contrib/tools/swig/Lib/java $_SWIG_JNI_PEERDIR
         _SWIG_SEM_TO_MODULE_LINK=${output;hide;suf=.jsrc:SRC}
     }
 }

+ 4 - 9
build/ymake.core.conf

@@ -499,23 +499,19 @@ module _BASE_UNIT: _BARE_UNIT {
 
     when ($SWIG_LANG == "perl") {
         _SWIG_CMD=$_SWIG_PERL_CMD
-        _SWIG_ADDINCLS=$_SWIG_PERL_ADDINCLS
-        _SWIG_PEERDIR=$_SWIG_PERL_PEERDIR
+        _SWIG_PEERDIR=contrib/tools/swig/Lib/perl5 build/platform/perl
     }
     elsewhen ($SWIG_LANG == "python") {
         _SWIG_CMD=$_SWIG_PYTHON_CMD
-        _SWIG_ADDINCLS=$_SWIG_PYTHON_ADDINCLS
-        _SWIG_PEERDIR=$_SWIG_PYTHON_PEERDIR
+        _SWIG_PEERDIR=contrib/tools/swig/Lib/python
     }
     elsewhen ($SWIG_LANG == "jni_cpp") {
         _SWIG_CMD=$_SWIG_JNI_CPP_CMD
-        _SWIG_ADDINCLS=$_SWIG_JNI_ADDINCLS
-        _SWIG_PEERDIR=$_SWIG_JNI_PEERDIR
+        _SWIG_PEERDIR=contrib/tools/swig/Lib/java $_SWIG_JNI_PEERDIR
     }
     elsewhen ($SWIG_LANG == "java") {
         _SWIG_CMD=$_SWIG_JNI_CMD
-        _SWIG_ADDINCLS=$_SWIG_JNI_ADDINCLS
-        _SWIG_PEERDIR=$_SWIG_JNI_PEERDIR
+        _SWIG_PEERDIR=contrib/tools/swig/Lib/java $_SWIG_JNI_PEERDIR
     }
 
     when ($PY_PROTOS_FOR == "yes") {
@@ -3012,7 +3008,6 @@ macro _SRC(EXT, SRC, SRCFLAGS...) {
 # tag:src-processing
 macro _SRC("swg", SRC, SRCFLAGS...) {
     .CMD=${_SWIG_CMD}
-    .ADDINCL=${_SWIG_ADDINCLS}
     .PEERDIR=${_SWIG_PEERDIR}
     .SEM=conan_require_tool swig/4.0.2 && conan_import '"bin, *swig* -> ./bin"' ${input;hide:SRC} ${_SWIG_SEM_TO_MODULE_LINK}
 }