Let cython use .c-files in text context since they are incuded into code, not compiled

ea779c7e3927f545ed3a46007e2a9491b2248b99

1 files changed, 39 insertions, 25 deletions

diff --git a/build/conf/python.conf b/build/conf/python.conf
index 46df139ed4..30c545af76 100644
--- a/build/conf/python.conf
+++ b/build/conf/python.conf
@@ -3,6 +3,42 @@ CYTHON_SCRIPT=${input:"${ARCADIA_ROOT}/contrib/tools/cython/cython.py"} ${hide:C
 RUN_CYTHON_SCRIPT=$YMAKE_PYTHON $CYTHON_SCRIPT
 RUN_CYTHON_SCRIPT_H=$YMAKE_PYTHON $CYTHON_SCRIPT
 PYTHON_TYPE_FOR_CYTHON=PY2
+
+
+CYTHON_EMBEDED_FILES=\
+contrib/tools/cython/Cython/Utility/Buffer.c \
+contrib/tools/cython/Cython/Utility/Builtins.c \
+contrib/tools/cython/Cython/Utility/CMath.c \
+contrib/tools/cython/Cython/Utility/Capsule.c \
+contrib/tools/cython/Cython/Utility/CommonTypes.c \
+contrib/tools/cython/Cython/Utility/Complex.c \
+contrib/tools/cython/Cython/Utility/Coroutine.c \
+contrib/tools/cython/Cython/Utility/CythonFunction.c \
+contrib/tools/cython/Cython/Utility/Embed.c \
+contrib/tools/cython/Cython/Utility/Exceptions.c \
+contrib/tools/cython/Cython/Utility/ExtensionTypes.c \
+contrib/tools/cython/Cython/Utility/FunctionArguments.c \
+contrib/tools/cython/Cython/Utility/ImportExport.c \
+contrib/tools/cython/Cython/Utility/MemoryView_C.c \
+contrib/tools/cython/Cython/Utility/ModuleSetupCode.c \
+contrib/tools/cython/Cython/Utility/ObjectHandling.c \
+contrib/tools/cython/Cython/Utility/Optimize.c \
+contrib/tools/cython/Cython/Utility/Overflow.c \
+contrib/tools/cython/Cython/Utility/Printing.c \
+contrib/tools/cython/Cython/Utility/Profile.c \
+contrib/tools/cython/Cython/Utility/StringTools.c \
+contrib/tools/cython/Cython/Utility/TestUtilityLoader.c \
+contrib/tools/cython/Cython/Utility/TypeConversion.c
+
+macro _UNWRAP_TEXT_INPUTS(Files...) {
+    .CMD=${input;context=TEXT;hide:Files}
+}
+
+macro _UNWRAP_OUTPUT_INCLUDES(Files...) {
+    .CMD=${output_include;hide:Files}
+}
+
+
 CYTHON_OUTPUT_INCLUDES=\
 ${output_include;hide:"contrib/libs/python/Include/compile.h"} \
 ${output_include;hide:"contrib/libs/python/Include/frameobject.h"} \
@@ -13,36 +49,14 @@ ${output_include;hide:"contrib/libs/python/Include/pythread.h"} \
 ${output_include;hide:"contrib/libs/python/Include/structmember.h"} \
 ${output_include;hide:"contrib/libs/python/Include/traceback.h"} \
 ${output_include;hide:"contrib/tools/cython/generated_c_headers.h"} \
-${output_include;hide:"omp.h"}
+${output_include;hide:"omp.h"} \
+$_UNWRAP_OUTPUT_INCLUDES($CYTHON_EMBEDED_FILES)
 
 # tag:cython-specific
 CYTHON_CPP_OUTPUT_INCLUDES=${output_include;hide:"contrib/tools/cython/generated_cpp_headers.h"}
 
 # tag:cython-specific
-CYTHON_PREDEFINED_INCLUDES=\
-    ${input;hide:"contrib/tools/cython/Cython/Utility/Buffer.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/Builtins.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/CMath.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/Capsule.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/CommonTypes.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/Complex.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/Coroutine.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/CythonFunction.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/Embed.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/Exceptions.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/ExtensionTypes.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/FunctionArguments.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/ImportExport.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/MemoryView_C.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/ModuleSetupCode.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/ObjectHandling.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/Optimize.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/Overflow.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/Printing.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/Profile.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/StringTools.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/TestUtilityLoader.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/TypeConversion.c"}
+CYTHON_PREDEFINED_INCLUDES=$_UNWRAP_TEXT_INPUTS($CYTHON_EMBEDED_FILES)
 
 # tag:cython-specific
 CYTHON_PREDEFINED_INDUCED=\