[build] Remove build/oil-defs, and all references

This failed the last time I released. It's no longer worth carrying around, now that we have the C++ oils-for-unix build. Also, clean up log output for 'build/py.sh all'. (TODO: I'd also like to make it faster.)
oils-for-unix · Jan 6, 2025 · 6c47273 · 6c47273
1 parent 937099a
commit 6c47273
Show file tree

Hide file tree

Showing 108 changed files with 81 additions and 753 deletions.
diff --git a/NINJA-config.sh b/NINJA-config.sh
@@ -125,7 +125,6 @@ main() {
   yaks
 
   echo DEPS prebuilt/ninja/*/deps.txt
-
   echo
 
   # Reads the deps.txt files above

diff --git a/Python-2.7.13/Modules/_codecsmodule.c b/Python-2.7.13/Modules/_codecsmodule.c
@@ -1052,9 +1052,6 @@ static PyObject *lookup_error(PyObject *self, PyObject *args)
 
 /* --- Module API --------------------------------------------------------- */
 
-#ifdef OVM_MAIN
-#include "Python-2.7.13/Modules/_codecsmodule.c/_codecs_functions.def"
-#else
 static PyMethodDef _codecs_functions[] = {
     {"register",                codec_register,                 METH_O,
         register__doc__},
@@ -1111,7 +1108,6 @@ static PyMethodDef _codecs_functions[] = {
         lookup_error__doc__},
     {NULL, NULL}                /* sentinel */
 };
-#endif
 
 PyMODINIT_FUNC
 init_codecs(void)

diff --git a/Python-2.7.13/Modules/cStringIO.c b/Python-2.7.13/Modules/cStringIO.c
@@ -508,9 +508,6 @@ O_writelines(Oobject *self, PyObject *args) {
 
     Py_RETURN_NONE;
 }
-#ifdef OVM_MAIN
-#include "Python-2.7.13/Modules/cStringIO.c/O_methods.def"
-#else
 static struct PyMethodDef O_methods[] = {
   /* Common methods: */
   {"flush",     (PyCFunction)IO_flush,    METH_NOARGS,  IO_flush__doc__},
@@ -530,7 +527,6 @@ static struct PyMethodDef O_methods[] = {
   {"writelines", (PyCFunction)O_writelines, METH_O,       O_writelines__doc__},
   {NULL,         NULL}          /* sentinel */
 };
-#endif
 
 static PyMemberDef O_memberlist[] = {
     {"softspace",       T_INT,  offsetof(Oobject, softspace),   0,
@@ -619,9 +615,6 @@ I_close(Iobject *self, PyObject *unused) {
     return Py_None;
 }
 
-#ifdef OVM_MAIN
-#include "Python-2.7.13/Modules/cStringIO.c/I_methods.def"
-#else
 static struct PyMethodDef I_methods[] = {
   /* Common methods: */
   {"flush",     (PyCFunction)IO_flush,    METH_NOARGS,  IO_flush__doc__},
@@ -639,7 +632,6 @@ static struct PyMethodDef I_methods[] = {
   {"close",     (PyCFunction)I_close,    METH_NOARGS,  O_close__doc__},
   {NULL,        NULL}
 };
-#endif
 
 static void
 I_dealloc(Iobject *self) {
@@ -732,15 +724,11 @@ IO_StringIO(PyObject *self, PyObject *args) {
 
 /* List of methods defined in the module */
 
-#ifdef OVM_MAIN
-#include "Python-2.7.13/Modules/cStringIO.c/IO_methods.def"
-#else
 static struct PyMethodDef IO_methods[] = {
   {"StringIO",  (PyCFunction)IO_StringIO,
    METH_VARARGS,        IO_StringIO__doc__},
   {NULL,                NULL}           /* sentinel */
 };
-#endif
 
 
 /* Initialization function for the module (*must* be called initcStringIO) */

diff --git a/Python-2.7.13/Modules/errnomodule.c b/Python-2.7.13/Modules/errnomodule.c
@@ -12,13 +12,9 @@
  * Pull in the system error definitions
  */
 
-#ifdef OVM_MAIN
-#include "Python-2.7.13/Modules/errnomodule.c/errno_methods.def"
-#else
 static PyMethodDef errno_methods[] = {
     {NULL,              NULL}
 };
-#endif
 
 /* Helper function doing the dictionary inserting */
 

diff --git a/Python-2.7.13/Modules/fcntlmodule.c b/Python-2.7.13/Modules/fcntlmodule.c
@@ -405,17 +405,13 @@ starts.  whence is as with fileobj.seek(), specifically:\n\
 
 /* List of functions */
 
-#ifdef OVM_MAIN
-#include "Python-2.7.13/Modules/fcntlmodule.c/fcntl_methods.def"
-#else
 static PyMethodDef fcntl_methods[] = {
     {"fcntl",           fcntl_fcntl, METH_VARARGS, fcntl_doc},
     {"ioctl",           fcntl_ioctl, METH_VARARGS, ioctl_doc},
     {"flock",           fcntl_flock, METH_VARARGS, flock_doc},
     {"lockf",       fcntl_lockf, METH_VARARGS, lockf_doc},
     {NULL,              NULL}           /* sentinel */
 };
-#endif
 
 
 PyDoc_STRVAR(module_doc,

diff --git a/Python-2.7.13/Modules/gcmodule.c b/Python-2.7.13/Modules/gcmodule.c
@@ -1369,9 +1369,6 @@ PyDoc_STRVAR(gc__doc__,
 "get_referrers() -- Return the list of objects that refer to an object.\n"
 "get_referents() -- Return the list of objects that an object refers to.\n");
 
-#ifdef OVM_MAIN
-#include "Python-2.7.13/Modules/gcmodule.c/GcMethods.def"
-#else
 static PyMethodDef GcMethods[] = {
     {"enable",             gc_enable,     METH_NOARGS,  gc_enable__doc__},
     {"disable",            gc_disable,    METH_NOARGS,  gc_disable__doc__},
@@ -1391,7 +1388,6 @@ static PyMethodDef GcMethods[] = {
         gc_get_referents__doc__},
     {NULL,      NULL}           /* Sentinel */
 };
-#endif
 
 #ifndef OBJECTS_ONLY
 PyMODINIT_FUNC

diff --git a/Python-2.7.13/Modules/posixmodule.c b/Python-2.7.13/Modules/posixmodule.c
@@ -8824,9 +8824,6 @@ posix_getresgid (PyObject *self, PyObject *noargs)
 }
 #endif
 
-#ifdef OVM_MAIN
-#include "Python-2.7.13/Modules/posixmodule.c/posix_methods.def"
-#else
 static PyMethodDef posix_methods[] = {
     {"access",          posix_access, METH_VARARGS, posix_access__doc__},
 #ifdef HAVE_TTYNAME
@@ -9139,7 +9136,6 @@ static PyMethodDef posix_methods[] = {
     {"urandom",         posix_urandom,   METH_VARARGS, posix_urandom__doc__},
     {NULL,              NULL}            /* Sentinel */
 };
-#endif
 
 
 static int

diff --git a/Python-2.7.13/Modules/pwdmodule.c b/Python-2.7.13/Modules/pwdmodule.c
@@ -178,9 +178,6 @@ pwd_getpwall(PyObject *self)
 }
 #endif
 
-#ifdef OVM_MAIN
-#include "Python-2.7.13/Modules/pwdmodule.c/pwd_methods.def"
-#else
 static PyMethodDef pwd_methods[] = {
     {"getpwuid",        pwd_getpwuid, METH_VARARGS, pwd_getpwuid__doc__},
     {"getpwnam",        pwd_getpwnam, METH_VARARGS, pwd_getpwnam__doc__},
@@ -190,7 +187,6 @@ static PyMethodDef pwd_methods[] = {
 #endif
     {NULL,              NULL}           /* sentinel */
 };
-#endif
 
 PyMODINIT_FUNC
 initpwd(void)

diff --git a/Python-2.7.13/Modules/readline.c b/Python-2.7.13/Modules/readline.c
@@ -702,9 +702,6 @@ contents of the line buffer.");
 
 /* Table of functions exported by the module */
 
-#ifdef OVM_MAIN
-#include "Python-2.7.13/Modules/readline.c/readline_methods.def"
-#else
 static struct PyMethodDef readline_methods[] = {
     {"parse_and_bind", parse_and_bind, METH_VARARGS, doc_parse_and_bind},
     {"get_line_buffer", get_line_buffer, METH_NOARGS, doc_get_line_buffer},
@@ -751,7 +748,6 @@ static struct PyMethodDef readline_methods[] = {
 #endif
     {0, 0}
 };
-#endif
 
 
 /* C function to call the Python hooks. */

diff --git a/Python-2.7.13/Modules/resource.c b/Python-2.7.13/Modules/resource.c
@@ -230,17 +230,13 @@ resource_getpagesize(PyObject *self, PyObject *unused)
 
 /* List of functions */
 
-#ifdef OVM_MAIN
-#include "Python-2.7.13/Modules/resource.c/resource_methods.def"
-#else
 static struct PyMethodDef resource_methods[] = {
     {"getrusage",    resource_getrusage,   METH_VARARGS},
     {"getrlimit",    resource_getrlimit,   METH_VARARGS},
     {"setrlimit",    resource_setrlimit,   METH_VARARGS},
     {"getpagesize",  resource_getpagesize, METH_NOARGS},
     {NULL, NULL}                             /* sentinel */
 };
-#endif
 
 
 /* Module initialization */

diff --git a/Python-2.7.13/Modules/signalmodule.c b/Python-2.7.13/Modules/signalmodule.c
@@ -506,9 +506,6 @@ Returns current value of given itimer.");
 
 
 /* List of functions defined in the module */
-#ifdef OVM_MAIN
-#include "Python-2.7.13/Modules/signalmodule.c/signal_methods.def"
-#else
 static PyMethodDef signal_methods[] = {
 #ifdef HAVE_ALARM
     {"alarm",                   signal_alarm, METH_VARARGS, alarm_doc},
@@ -533,7 +530,6 @@ static PyMethodDef signal_methods[] = {
      METH_VARARGS, default_int_handler_doc},
     {NULL,                      NULL}           /* sentinel */
 };
-#endif
 
 
 PyDoc_STRVAR(module_doc,

diff --git a/Python-2.7.13/Modules/termios.c b/Python-2.7.13/Modules/termios.c
@@ -293,9 +293,6 @@ termios_tcflow(PyObject *self, PyObject *args)
     return Py_None;
 }
 
-#ifdef OVM_MAIN
-#include "Python-2.7.13/Modules/termios.c/termios_methods.def"
-#else
 static PyMethodDef termios_methods[] =
 {
     {"tcgetattr", termios_tcgetattr, METH_VARARGS, termios_tcgetattr__doc__},
@@ -306,7 +303,6 @@ static PyMethodDef termios_methods[] =
     {"tcflow", termios_tcflow, METH_VARARGS, termios_tcflow__doc__},
     {NULL, NULL}
 };
-#endif
 
 
 #if defined(VSWTCH) && !defined(VSWTC)

diff --git a/Python-2.7.13/Modules/timemodule.c b/Python-2.7.13/Modules/timemodule.c
@@ -776,9 +776,6 @@ inittimezone(PyObject *m) {
 }
 
 
-#ifdef OVM_MAIN
-#include "Python-2.7.13/Modules/timemodule.c/time_methods.def"
-#else
 static PyMethodDef time_methods[] = {
     {"time",            time_time, METH_NOARGS, time_doc},
 #ifdef HAVE_CLOCK
@@ -801,7 +798,6 @@ static PyMethodDef time_methods[] = {
 #endif
     {NULL,              NULL}           /* sentinel */
 };
-#endif
 
 
 PyDoc_STRVAR(module_doc,

diff --git a/Python-2.7.13/Modules/zipimport.c b/Python-2.7.13/Modules/zipimport.c
@@ -561,9 +561,6 @@ PyDoc_STRVAR(doc_get_filename,
 \n\
 Return the filename for the specified module.");
 
-#ifdef OVM_MAIN
-#include "Python-2.7.13/Modules/zipimport.c/zipimporter_methods.def"
-#else
 static PyMethodDef zipimporter_methods[] = {
     {"find_module", zipimporter_find_module, METH_VARARGS,
      doc_find_module},
@@ -581,7 +578,6 @@ static PyMethodDef zipimporter_methods[] = {
      doc_is_package},
     {NULL,              NULL}   /* sentinel */
 };
-#endif
 
 static PyMemberDef zipimporter_members[] = {
     {"archive",  T_OBJECT, offsetof(ZipImporter, archive),  READONLY},

diff --git a/Python-2.7.13/Objects/enumobject.c b/Python-2.7.13/Objects/enumobject.c
@@ -331,14 +331,10 @@ reversed_len(reversedobject *ro)
 
 PyDoc_STRVAR(length_hint_doc, "Private method returning an estimate of len(list(it)).");
 
-#ifdef OVM_MAIN
-#include "Python-2.7.13/Objects/enumobject.c/reversediter_methods.def"
-#else
 static PyMethodDef reversediter_methods[] = {
     {"__length_hint__", (PyCFunction)reversed_len, METH_NOARGS, length_hint_doc},
     {NULL,              NULL}           /* sentinel */
 };
-#endif
 
 PyTypeObject PyReversed_Type = {
     PyVarObject_HEAD_INIT(&PyType_Type, 0)

diff --git a/Python-2.7.13/Objects/exceptions.c b/Python-2.7.13/Objects/exceptions.c
@@ -212,9 +212,6 @@ BaseException_setstate(PyObject *self, PyObject *state)
 }
 
 
-#ifdef OVM_MAIN
-#include "Python-2.7.13/Objects/exceptions.c/BaseException_methods.def"
-#else
 static PyMethodDef BaseException_methods[] = {
    {"__reduce__", (PyCFunction)BaseException_reduce, METH_NOARGS },
    {"__setstate__", (PyCFunction)BaseException_setstate, METH_O },
@@ -223,7 +220,6 @@ static PyMethodDef BaseException_methods[] = {
 #endif
    {NULL, NULL, 0, NULL},
 };
-#endif
 
 
 
@@ -796,14 +792,10 @@ EnvironmentError_reduce(PyEnvironmentErrorObject *self)
 }
 
 
-#ifdef OVM_MAIN
-#include "Python-2.7.13/Objects/exceptions.c/EnvironmentError_methods.def"
-#else
 static PyMethodDef EnvironmentError_methods[] = {
     {"__reduce__", (PyCFunction)EnvironmentError_reduce, METH_NOARGS},
     {NULL}
 };
-#endif
 
 ComplexExtendsException(PyExc_StandardError, EnvironmentError,
                         EnvironmentError, EnvironmentError_dealloc,
@@ -2044,14 +2036,10 @@ PyObject *PyExc_MemoryErrorInst=NULL;
 PyObject *PyExc_RecursionErrorInst = NULL;
 
 /* module global functions */
-#ifdef OVM_MAIN
-#include "Python-2.7.13/Objects/exceptions.c/functions.def"
-#else
 static PyMethodDef functions[] = {
     /* Sentinel */
     {NULL, NULL}
 };
-#endif
 
 #define PRE_INIT(TYPE) if (PyType_Ready(&_PyExc_ ## TYPE) < 0) \
     Py_FatalError("exceptions bootstrapping error.");

diff --git a/Python-2.7.13/Objects/fileobject.c b/Python-2.7.13/Objects/fileobject.c
@@ -2113,9 +2113,6 @@ PyDoc_STRVAR(enter_doc,
 PyDoc_STRVAR(exit_doc,
              "__exit__(*excinfo) -> None.  Closes the file.");
 
-#ifdef OVM_MAIN
-#include "Python-2.7.13/Objects/fileobject.c/file_methods.def"
-#else
 static PyMethodDef file_methods[] = {
     {"readline",  (PyCFunction)file_readline, METH_VARARGS, readline_doc},
     {"read",      (PyCFunction)file_read,     METH_VARARGS, read_doc},
@@ -2137,7 +2134,6 @@ static PyMethodDef file_methods[] = {
     {"__exit__",  (PyCFunction)file_exit,     METH_VARARGS, exit_doc},
     {NULL,            NULL}             /* sentinel */
 };
-#endif
 
 #define OFF(x) offsetof(PyFileObject, x)
 

diff --git a/Python-2.7.13/Objects/floatobject.c b/Python-2.7.13/Objects/floatobject.c
@@ -2031,9 +2031,6 @@ PyDoc_STRVAR(float__format__doc,
 #endif
 
 
-#ifdef OVM_MAIN
-#include "Python-2.7.13/Objects/floatobject.c/float_methods.def"
-#else
 static PyMethodDef float_methods[] = {
     {"conjugate",       (PyCFunction)float_float,       METH_NOARGS,
      "Return self, the complex conjugate of any float."},
@@ -2066,7 +2063,6 @@ static PyMethodDef float_methods[] = {
 #endif
     {NULL,              NULL}           /* sentinel */
 };
-#endif
 
 static PyGetSetDef float_getset[] = {
     {"real",

diff --git a/Python-2.7.13/Objects/frameobject.c b/Python-2.7.13/Objects/frameobject.c
@@ -567,15 +567,11 @@ frame_sizeof(PyFrameObject *f)
 PyDoc_STRVAR(sizeof__doc__,
 "F.__sizeof__() -> size of F in memory, in bytes");
 
-#ifdef OVM_MAIN
-#include "Python-2.7.13/Objects/frameobject.c/frame_methods.def"
-#else
 static PyMethodDef frame_methods[] = {
     {"__sizeof__",      (PyCFunction)frame_sizeof,      METH_NOARGS,
      sizeof__doc__},
     {NULL,              NULL}   /* sentinel */
 };
-#endif
 
 PyTypeObject PyFrame_Type = {
     PyVarObject_HEAD_INIT(&PyType_Type, 0)
-Original file line number
+Diff line change
@@ Expand Up / @@ -125,7 +125,6 @@ main() { @@
       yaks
       echo DEPS prebuilt/ninja/*/deps.txt
       echo
       # Reads the deps.txt files above
@@ Expand Down @@