panda3d-interrogate 0.4.0__tar.gz → 0.5.0__tar.gz

{panda3d_interrogate-0.4.0 → panda3d_interrogate-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: panda3d-interrogate
-Version: 0.4.0
+Version: 0.5.0
 Summary: Binding generator designed for Panda3D
 License: Copyright (c) 2008, Carnegie Mellon University.
         All rights reserved.

{panda3d_interrogate-0.4.0 → panda3d_interrogate-0.5.0}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "panda3d-interrogate"
-version = "0.4.0"
+version = "0.5.0"
 description = "Binding generator designed for Panda3D"
 readme = "README.md"
 requires-python = ">=3.2"

{panda3d_interrogate-0.4.0 → panda3d_interrogate-0.5.0}/src/dtoolutil/string_utils.h

@@ -17,6 +17,7 @@
 #include "dtoolbase.h"
 
 #include <string>
+#include <cstdint>
 #include "vector_string.h"
 #include "pdtoa.h"
 

{panda3d_interrogate-0.4.0 → panda3d_interrogate-0.5.0}/src/dtoolutil/textEncoder.cxx

@@ -14,6 +14,7 @@
 #include "textEncoder.h"
 #include "stringDecoder.h"
 #include "unicodeLatinMap.h"
+#include <cstdint>
 
 using std::istream;
 using std::ostream;

{panda3d_interrogate-0.4.0 → panda3d_interrogate-0.5.0}/src/interrogate/interrogate_module.cxx

@@ -43,6 +43,7 @@ bool build_python_wrappers = false;
 bool build_python_native_wrappers = false;
 bool track_interpreter = false;
 vector_string imports;
+vector_string init_funcs;
 
 // Short command-line options.
 static const char *short_options = "";
@@ -57,6 +58,7 @@ enum CommandOptions {
   CO_python_native,
   CO_track_interpreter,
   CO_import,
+  CO_init,
 };
 
 static struct option long_options[] = {
@@ -68,6 +70,7 @@ static struct option long_options[] = {
   { "python-native", no_argument, nullptr, CO_python_native },
   { "track-interpreter", no_argument, nullptr, CO_track_interpreter },
   { "import", required_argument, nullptr, CO_import },
+  { "init", required_argument, nullptr, CO_init },
   { nullptr }
 };
 
@@ -286,6 +289,10 @@ int write_python_table_native(std::ostream &out) {
     }
   }
 
+  for (auto &init : init_funcs) {
+    out << "extern \"C\" void " << init << "();\n";
+  }
+
   vector_string::const_iterator ii;
   for (ii = libraries.begin(); ii != libraries.end(); ++ii) {
     printf("Referencing Library %s\n", (*ii).c_str());
@@ -347,6 +354,10 @@ int write_python_table_native(std::ostream &out) {
       << "  PyObject *module = Dtool_PyModuleInitHelper(defs, &py_" << library_name << "_module);\n"
       << "  if (module != nullptr) {\n";
 
+  for (auto &init : init_funcs) {
+    out << "    " << init << "();\n";
+  }
+
   for (ii = libraries.begin(); ii != libraries.end(); ii++) {
     out << "    Dtool_" << *ii << "_BuildInstants(module);\n";
   }
@@ -383,6 +394,10 @@ int write_python_table_native(std::ostream &out) {
       << "  PyObject *module = Dtool_PyModuleInitHelper(defs, \"" << module_name << "\");\n"
       << "  if (module != nullptr) {\n";
 
+  for (auto &init : init_funcs) {
+    out << "    " << init << "();\n";
+  }
+
   for (ii = libraries.begin(); ii != libraries.end(); ii++) {
     out << "    Dtool_" << *ii << "_BuildInstants(module);\n";
   }
@@ -554,6 +569,10 @@ int main(int argc, char *argv[]) {
       imports.push_back(optarg);
       break;
 
+    case CO_init:
+      init_funcs.push_back(optarg);
+      break;
+
     default:
       exit(1);
     }

{panda3d_interrogate-0.4.0 → panda3d_interrogate-0.5.0}/src/interrogatedb/interrogateFunctionWrapper.cxx

@@ -74,6 +74,7 @@ input(istream &in) {
  */
 void InterrogateFunctionWrapper::
 remap_indices(const IndexRemapper &remap) {
+  _function = remap.map_from(_function);
   _return_value_destructor = remap.map_from(_return_value_destructor);
   _return_type = remap.map_from(_return_type);
 

{panda3d_interrogate-0.4.0 → panda3d_interrogate-0.5.0}/src/interrogatedb/py_panda.cxx

@@ -5,7 +5,6 @@
  */
 
 #include "py_panda.h"
-#include "executionEnvironment.h"
 
 #ifdef HAVE_PYTHON
 
@@ -696,66 +695,6 @@ PyObject *Dtool_PyModuleInitHelper(const LibraryDef *defs[], const char *modulen
 #endif
   }
 
-  // MAIN_DIR needs to be set very early; this seems like a convenient place
-  // to do that.  Perhaps we'll find a better place for this in the future.
-  static bool initialized_main_dir = false;
-  if (!initialized_main_dir) {
-    /*if (interrogatedb_cat.is_debug()) {
-      // Good opportunity to print this out once, at startup.
-      interrogatedb_cat.debug()
-        << "Python " << version << "\n";
-    }*/
-
-    if (!ExecutionEnvironment::has_environment_variable("MAIN_DIR")) {
-      // Grab the __main__ module.
-      PyObject *main_module = PyImport_ImportModule("__main__");
-      if (main_module == NULL) {
-        std::cerr << "Warning: unable to import __main__\n";
-      }
-
-      // Extract the __file__ attribute, if present.
-      Filename main_dir;
-      PyObject *file_attr = nullptr;
-      if (main_module != nullptr) {
-        file_attr = PyObject_GetAttrString(main_module, "__file__");
-      }
-      if (file_attr == nullptr) {
-        // Must be running in the interactive interpreter.  Use the CWD.
-        main_dir = ExecutionEnvironment::get_cwd();
-      } else {
-#if PY_MAJOR_VERSION >= 3
-        Py_ssize_t length;
-        wchar_t *buffer = PyUnicode_AsWideCharString(file_attr, &length);
-        if (buffer != nullptr) {
-          main_dir = Filename::from_os_specific_w(std::wstring(buffer, length));
-          main_dir.make_absolute();
-          main_dir = main_dir.get_dirname();
-          PyMem_Free(buffer);
-        }
-#else
-        char *buffer;
-        Py_ssize_t length;
-        if (PyString_AsStringAndSize(file_attr, &buffer, &length) != -1) {
-          main_dir = Filename::from_os_specific(std::string(buffer, length));
-          main_dir.make_absolute();
-          main_dir = main_dir.get_dirname();
-        }
-#endif
-        else {
-          std::cerr << "Invalid string for __main__.__file__\n";
-        }
-      }
-      ExecutionEnvironment::shadow_environment_variable("MAIN_DIR", main_dir.to_os_specific());
-      PyErr_Clear();
-    }
-    initialized_main_dir = true;
-
-    // Also, while we are at it, initialize the thread swap hook.
-#if defined(HAVE_THREADS) && defined(SIMPLE_THREADS)
-    global_thread_state_swap = PyThreadState_Swap;
-#endif
-  }
-
   PyModule_AddIntConstant(module, "Dtool_PyNativeInterface", 1);
   return module;
 }