aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthegeorg <thegeorg@yandex-team.com>2023-09-29 23:52:33 +0300
committerthegeorg <thegeorg@yandex-team.com>2023-09-30 00:21:59 +0300
commit866215175648a5f00ca9b617cbac975462e06f0d (patch)
tree9b67129765fe600b06d9dc8ca323c96224980d24
parent611ec625981b1cb27dfb70f7da4a4bbcd4bb2384 (diff)
downloadydb-866215175648a5f00ca9b617cbac975462e06f0d.tar.gz
Move contrib/tools/python3/pycc to tools/py3cc
This is not a third party code, it is written by us.
-rw-r--r--build/ymake.core.conf4
-rw-r--r--contrib/tools/python3/pycc/ya.make11
-rw-r--r--contrib/tools/python3/ya.make1
-rw-r--r--tools/py3cc/bin/ya.make (renamed from contrib/tools/python3/pycc/bin/ya.make)2
-rwxr-xr-xtools/py3cc/main.py (renamed from contrib/tools/python3/pycc/main.py)0
-rw-r--r--tools/py3cc/ya.make11
6 files changed, 14 insertions, 15 deletions
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index 58e8149762..d65db15f9b 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -3173,7 +3173,7 @@ macro _SRC_py2src(SRC, SRCFLAGS...) {
# tag:src-processing
macro _SRC_py3src(SRC, SRCFLAGS...) {
- .CMD=${cwd:BINDIR} $YMAKE_PYTHON3 ${input:"build/scripts/compile_pysrc.py"} --input ${input:SRC} --output ${output;noext;suf=.py3_raw.cpp:SRC} --rescompiler ${tool:"tools/rescompiler"} py3 --pycc ${tool:"contrib/tools/python3/pycc"} ${kv;hide:"p P3"} ${kv;hide:"pc light-green"}
+ .CMD=${cwd:BINDIR} $YMAKE_PYTHON3 ${input:"build/scripts/compile_pysrc.py"} --input ${input:SRC} --output ${output;noext;suf=.py3_raw.cpp:SRC} --rescompiler ${tool:"tools/rescompiler"} py3 --pycc ${tool:"tools/py3cc"} ${kv;hide:"p P3"} ${kv;hide:"pc light-green"}
}
# tag:src-processing python-specific
@@ -3736,7 +3736,7 @@ macro _PY_COMPILE_BYTECODE(SrcX, Src, Dst) {
###
### Documentation: https://wiki.yandex-team.ru/devtools/commandsandvars/pysrcs/#makrospyregister
macro _PY3_COMPILE_BYTECODE(SrcX, Src, Dst) {
- .CMD=${env:"PYTHONHASHSEED=0"} ${tool:"contrib/tools/python3/pycc"} $SrcX ${input:Src} ${output;noauto:Dst.yapyc3} ${kv;hide:"p PY"} ${kv;hide:"pc yellow"}
+ .CMD=${env:"PYTHONHASHSEED=0"} ${tool:"tools/py3cc"} $SrcX ${input:Src} ${output;noauto:Dst.yapyc3} ${kv;hide:"p PY"} ${kv;hide:"pc yellow"}
}
macro _ARCHIVE_SEM_HELPER(FLAGS[], OUT, Files...) {
diff --git a/contrib/tools/python3/pycc/ya.make b/contrib/tools/python3/pycc/ya.make
deleted file mode 100644
index 9749544dbf..0000000000
--- a/contrib/tools/python3/pycc/ya.make
+++ /dev/null
@@ -1,11 +0,0 @@
-IF (USE_PREBUILT_TOOLS)
- INCLUDE(${ARCADIA_ROOT}/build/prebuilt/contrib/tools/python3/pycc/ya.make.prebuilt)
-ENDIF()
-
-IF (NOT PREBUILT)
- INCLUDE(${ARCADIA_ROOT}/contrib/tools/python3/pycc/bin/ya.make)
-ENDIF()
-
-RECURSE(
- bin
-)
diff --git a/contrib/tools/python3/ya.make b/contrib/tools/python3/ya.make
index d1bb6895d8..b768fdef5a 100644
--- a/contrib/tools/python3/ya.make
+++ b/contrib/tools/python3/ya.make
@@ -25,7 +25,6 @@ SRCS(
END()
RECURSE(
- pycc
src
src/Lib
src/Modules
diff --git a/contrib/tools/python3/pycc/bin/ya.make b/tools/py3cc/bin/ya.make
index bd517d970b..178ba5c4b4 100644
--- a/contrib/tools/python3/pycc/bin/ya.make
+++ b/tools/py3cc/bin/ya.make
@@ -16,7 +16,7 @@ NO_PYTHON_INCLUDES()
NO_PYTHON_COVERAGE()
SRCDIR(
- contrib/tools/python3/pycc
+ tools/py3cc
)
PY_SRCS(
diff --git a/contrib/tools/python3/pycc/main.py b/tools/py3cc/main.py
index 996edb2bdd..996edb2bdd 100755
--- a/contrib/tools/python3/pycc/main.py
+++ b/tools/py3cc/main.py
diff --git a/tools/py3cc/ya.make b/tools/py3cc/ya.make
new file mode 100644
index 0000000000..b6f5ce202e
--- /dev/null
+++ b/tools/py3cc/ya.make
@@ -0,0 +1,11 @@
+IF (USE_PREBUILT_TOOLS)
+ INCLUDE(ya.make.prebuilt)
+ENDIF()
+
+IF (NOT PREBUILT)
+ INCLUDE(bin/ya.make)
+ENDIF()
+
+RECURSE(
+ bin
+)