Move bison/m4 and bison/induced out of contrib/tools/bison

520961d4315ab4738f60613278b7e63765341b85

18 files changed, 7 insertions, 7 deletions

diff --git a/build/conf/bison_lex.conf b/build/conf/bison_lex.conf
index 96d3ff5ed87..54ceaa458ad 100644
--- a/build/conf/bison_lex.conf
+++ b/build/conf/bison_lex.conf
@@ -107,7 +107,7 @@ macro BISON_NO_HEADER() {
 ### Use `contrib/tools/flex` as flex tool. Default is `contrib/tools/flex-old`.
 ### @note: by default no header is emitted. Use `USE_MODERN_FLEX_WITH_HEADER` to add header emission.
 macro USE_MODERN_FLEX() {
-    SET(_FLEX_TOOL \${tool:"contrib/tools/flex"} --m4=\${tool:"contrib/tools/bison/m4"})
+    SET(_FLEX_TOOL \${tool:"contrib/tools/flex"} --m4=\${tool:"contrib/tools/m4"})
     SET(_FLEX_TOOL_DIR contrib/tools/flex)
 }
 
@@ -118,7 +118,7 @@ macro USE_MODERN_FLEX() {
 ###
 ### @example: USE_MODERN_FLEX_WITH_HEADER(_lexer.h)
 macro USE_MODERN_FLEX_WITH_HEADER(Suffix) {
-    SET(_FLEX_TOOL \${tool:"contrib/tools/flex"} --m4=\${tool:"contrib/tools/bison/m4"})
+    SET(_FLEX_TOOL \${tool:"contrib/tools/flex"} --m4=\${tool:"contrib/tools/m4"})
     SET(_FLEX_TOOL_DIR contrib/tools/flex)
     SET(_FLEX_HEADER --header-file=\${nopath;noext;output;main;addincl;norel;suf=$Suffix:SRC})
 }
@@ -132,13 +132,13 @@ macro USE_OLD_FLEX() {
 }
 
 macro _SRC("y", SRC, SRCFLAGS...) {
-    .PEERDIR=contrib/tools/bison/induced
-    .CMD=${tool:"contrib/tools/bison"} $BISON_FLAGS --m4=${tool:"contrib/tools/bison/m4"} $_BISON_HEADER ${hide:_BISON_GEN_EXT} -o ${nopath;output;suf=$_BISON_GEN_EXT:SRC} ${input:SRC} ${SRCFLAGS} ${kv;hide:"p YC"} ${kv;hide:"pc light-green"} && $_BISON_PP
+    .PEERDIR=build/induced/by_bison
+    .CMD=${tool:"contrib/tools/bison"} $BISON_FLAGS --m4=${tool:"contrib/tools/m4"} $_BISON_HEADER ${hide:_BISON_GEN_EXT} -o ${nopath;output;suf=$_BISON_GEN_EXT:SRC} ${input:SRC} ${SRCFLAGS} ${kv;hide:"p YC"} ${kv;hide:"pc light-green"} && $_BISON_PP
     .SEM=target_bison_parser PRIVATE ${input:SRC} ${output;nopath;noext;hide;suf=${OBJ_SUF}.o:SRC} ${nopath;noext;output;hide:SRC.h} ${nopath;noext;output;addincl;hide:SRC.h} && set_global_flags BISON_FLAGS $BISON_FLAGS && conan_require_tool m4/1.4.19 && conan_import '"bin, m4* -> ./bin/m4/bin"' && conan_require_tool bison/3.8.2 && conan_import '"bin, bison* -> ./bin/bison/bin"' && conan_import '"res, * -> ./bin/bison/res"' && platform_vars-BISON_FLAGS ${quo:BISON_FLAGS} && conan-tool_requires m4/1.4.19 && conan-imports 'bin, m4* -> ./bin/m4/bin' && conan-tool_requires bison/3.8.2 && conan-imports 'bin, bison* -> ./bin/bison/bin' && conan-imports 'res, * -> ./bin/bison/res'
 }
 
 macro _SRC("ypp", SRC, SRCFLAGS...) {
-    .PEERDIR=contrib/tools/bison/induced
+    .PEERDIR=build/induced/by_bison
     .CMD=$_SRC(y $SRC $SRCFLAGS)
     .SEM=$_SRC(y $SRC $SRCFLAGS)
 }
diff --git a/contrib/tools/bison/induced/ya.make b/build/induced/by_bison/ya.make
index a6893e34d63..a6893e34d63 100644
--- a/contrib/tools/bison/induced/ya.make
+++ b/build/induced/by_bison/ya.make
diff --git a/build/sysincl/misc-win.yml b/build/sysincl/misc-win.yml
index 8b2754a01cb..ae0fdb2abd8 100644
--- a/build/sysincl/misc-win.yml
+++ b/build/sysincl/misc-win.yml
@@ -78,7 +78,7 @@
   - inttypes.h:    contrib/libs/libx264/extras/inttypes.h
   - stdint.h:      contrib/libs/libx264/extras/stdint.h
 
-- source_filter: "^contrib/tools/bison"
+- source_filter: "^contrib/tools/(bison|m4)"
   includes:
   - alloca.h:      contrib/tools/bison/gnulib/platform/win64/alloca.h
   - getopt.h:      contrib/tools/bison/gnulib/platform/win64/getopt.h
diff --git a/build/sysincl/misc.yml b/build/sysincl/misc.yml
index e4143a05641..ebd781959dc 100644
--- a/build/sysincl/misc.yml
+++ b/build/sysincl/misc.yml
@@ -45,7 +45,7 @@
     - complex.h:     contrib/libs/libm/include/complex.h
     - math.h:        contrib/libs/libm/include/math.h
 
-- source_filter: "^contrib/tools/bison/"
+- source_filter: "^contrib/tools/(bison|m4)/"
   includes:
     - error.h:       contrib/tools/bison/gnulib/src/error.h
     - fcntl.h:       contrib/tools/bison/gnulib/platform/posix/fcntl.h
diff --git a/contrib/tools/bison/m4/src/builtin.c b/contrib/tools/m4/src/builtin.c
index 01ede380173..01ede380173 100644
--- a/contrib/tools/bison/m4/src/builtin.c
+++ b/contrib/tools/m4/src/builtin.c
diff --git a/contrib/tools/bison/m4/src/cpp.cpp b/contrib/tools/m4/src/cpp.cpp
index 19c4a90e13b..19c4a90e13b 100644
--- a/contrib/tools/bison/m4/src/cpp.cpp
+++ b/contrib/tools/m4/src/cpp.cpp
diff --git a/contrib/tools/bison/m4/src/debug.c b/contrib/tools/m4/src/debug.c
index c13a205b897..c13a205b897 100644
--- a/contrib/tools/bison/m4/src/debug.c
+++ b/contrib/tools/m4/src/debug.c
diff --git a/contrib/tools/bison/m4/src/eval.c b/contrib/tools/m4/src/eval.c
index 8b4b05afb1a..8b4b05afb1a 100644
--- a/contrib/tools/bison/m4/src/eval.c
+++ b/contrib/tools/m4/src/eval.c
diff --git a/contrib/tools/bison/m4/src/format.c b/contrib/tools/m4/src/format.c
index fd8830ed7cb..fd8830ed7cb 100644
--- a/contrib/tools/bison/m4/src/format.c
+++ b/contrib/tools/m4/src/format.c
diff --git a/contrib/tools/bison/m4/src/freeze.c b/contrib/tools/m4/src/freeze.c
index edc0568b962..edc0568b962 100644
--- a/contrib/tools/bison/m4/src/freeze.c
+++ b/contrib/tools/m4/src/freeze.c
diff --git a/contrib/tools/bison/m4/src/input.c b/contrib/tools/m4/src/input.c
index 836d7064897..836d7064897 100644
--- a/contrib/tools/bison/m4/src/input.c
+++ b/contrib/tools/m4/src/input.c
diff --git a/contrib/tools/bison/m4/src/m4.c b/contrib/tools/m4/src/m4.c
index 2c031544711..2c031544711 100644
--- a/contrib/tools/bison/m4/src/m4.c
+++ b/contrib/tools/m4/src/m4.c
diff --git a/contrib/tools/bison/m4/src/m4.h b/contrib/tools/m4/src/m4.h
index eb2a96784ff..eb2a96784ff 100644
--- a/contrib/tools/bison/m4/src/m4.h
+++ b/contrib/tools/m4/src/m4.h
diff --git a/contrib/tools/bison/m4/src/macro.c b/contrib/tools/m4/src/macro.c
index 0e7624372e7..0e7624372e7 100644
--- a/contrib/tools/bison/m4/src/macro.c
+++ b/contrib/tools/m4/src/macro.c
diff --git a/contrib/tools/bison/m4/src/output.c b/contrib/tools/m4/src/output.c
index c378afebdb4..c378afebdb4 100644
--- a/contrib/tools/bison/m4/src/output.c
+++ b/contrib/tools/m4/src/output.c
diff --git a/contrib/tools/bison/m4/src/path.c b/contrib/tools/m4/src/path.c
index 278200b7825..278200b7825 100644
--- a/contrib/tools/bison/m4/src/path.c
+++ b/contrib/tools/m4/src/path.c
diff --git a/contrib/tools/bison/m4/src/symtab.c b/contrib/tools/m4/src/symtab.c
index 7448c272cc3..7448c272cc3 100644
--- a/contrib/tools/bison/m4/src/symtab.c
+++ b/contrib/tools/m4/src/symtab.c
diff --git a/contrib/tools/bison/m4/ya.make b/contrib/tools/m4/ya.make
index f474cbfb714..f474cbfb714 100644
--- a/contrib/tools/bison/m4/ya.make
+++ b/contrib/tools/m4/ya.make