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

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

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

{panda3d_interrogate-0.3.0 → panda3d_interrogate-0.4.0}/cmake/macros/Python.cmake

@@ -58,7 +58,7 @@ function(add_python_target target)
 
   if(CMAKE_VERSION VERSION_LESS "3.26")
     add_library(${target} ${MODULE_TYPE} ${sources})
-    target_link_libraries(${target} PKG::PYTHON)
+    target_link_libraries(${target} PUBLIC PKG::PYTHON)
   else()
     if(MODULE_TYPE STREQUAL "MODULE" AND NOT PYTHON_FREETHREADED)
       Python_add_library(${target} MODULE USE_SABI 3.3 ${sources})

{panda3d_interrogate-0.3.0 → panda3d_interrogate-0.4.0}/cmake/scripts/ConcatenateToCXX.cmake

@@ -51,6 +51,9 @@ foreach(infile ${INPUT_FILES})
       break()
     endif()
 
+    # Replace newlines
+    string(REPLACE "0d0a" "0a" data "${data}")
+
     # Count the bytes we're adding
     string(LENGTH "${data}" strlen)
     math(EXPR byte_count "${byte_count} + (${strlen} / 2)")

{panda3d_interrogate-0.3.0 → panda3d_interrogate-0.4.0}/parser-inc/algorithm

@@ -25,7 +25,11 @@ namespace std {
   constexpr const T &min(const T &a, const T &b);
   template<class T>
   constexpr const T &max(const T &a, const T &b);
+
+  template<class RandomIt>
+  void sort(RandomIt first, RandomIt last);
+  template<class RandomIt, class Compare>
+  void sort(RandomIt first, RandomIt last, Compare comp);
 }
 
 #endif
-

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

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

{panda3d_interrogate-0.3.0 → panda3d_interrogate-0.4.0}/src/interrogate/CMakeLists.txt

@@ -124,5 +124,5 @@ if(SKBUILD)
   install(TARGETS interrogate_module COMPONENT tools DESTINATION interrogate_module)
 else()
   install(TARGETS interrogate interrogate_module COMPONENT tools DESTINATION ${CMAKE_INSTALL_BINDIR})
-  install(FILES ${INTERROGATE_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)
+  #install(FILES ${INTERROGATE_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/interrogate)
 endif()

{panda3d_interrogate-0.3.0 → panda3d_interrogate-0.4.0}/src/interrogate/interfaceMakerPythonNative.cxx

@@ -1760,14 +1760,38 @@ write_module_support(ostream &out, ostream *out_h, InterrogateModuleDef *def) {
 
   out << "  {nullptr, nullptr, 0, nullptr}\n" << "};\n\n";
 
+  if (!no_database) {
+    out << "static const InterrogateModuleDef _in_module_def = {\n"
+        << "  " << def->file_identifier << ",  /* file_identifier */\n"
+        << "  \"" << def->library_name << "\",  /* library_name */\n"
+        << "  \"" << def->library_hash_name << "\",  /* library_hash_name */\n"
+        << "  \"" << def->module_name << "\",  /* module_name */\n";
+    if (def->database_filename != nullptr) {
+      out << "  \"" << def->database_filename
+          << "\",  /* database_filename */\n";
+    } else {
+      out << "  (const char *)0,  /* database_filename */\n";
+    }
+
+    out << "  nullptr,  /* unique_names */\n"
+        << "  0,  /* num_unique_names */\n";
+    out << "  nullptr,  /* fptrs */\n"
+        << "  0,  /* num_fptrs */\n";
+    out << "  1,  /* first_index */\n"
+        << "  " << InterrogateDatabase::get_ptr()->get_next_index()
+        << "  /* next_index */\n"
+        << "};\n\n";
+  }
+
+  const char *def_ptr = no_database ? "nullptr" : "&_in_module_def";
   if (_external_imports.empty()) {
-    out << "extern const struct LibraryDef " << def->library_name << "_moddef = {python_simple_funcs, exports, nullptr};\n";
+    out << "extern const struct LibraryDef " << def->library_name << "_moddef = {python_simple_funcs, exports, nullptr, " << def_ptr << "};\n";
   } else {
     out <<
       "#ifdef LINK_ALL_STATIC\n"
-      "extern const struct LibraryDef " << def->library_name << "_moddef = {python_simple_funcs, exports, nullptr};\n"
+      "extern const struct LibraryDef " << def->library_name << "_moddef = {python_simple_funcs, exports, nullptr, " << def_ptr << "};\n"
       "#else\n"
-      "extern const struct LibraryDef " << def->library_name << "_moddef = {python_simple_funcs, exports, imports};\n"
+      "extern const struct LibraryDef " << def->library_name << "_moddef = {python_simple_funcs, exports, imports, " << def_ptr << "};\n"
       "#endif\n";
   }
   if (out_h != nullptr) {

{panda3d_interrogate-0.3.0 → panda3d_interrogate-0.4.0}/src/interrogate/interrogateBuilder.cxx

@@ -508,6 +508,7 @@ write_code(ostream &out_code,ostream * out_include, InterrogateModuleDef *def) {
     out_code << "};\n\n";
   }
 
+#if 0
   if (!no_database) {
     // Now build the module definition structure to add ourselves to the
     // global interrogate database.
@@ -551,6 +552,7 @@ write_code(ostream &out_code,ostream * out_include, InterrogateModuleDef *def) {
         << "  interrogate_request_module(&_in_module_def);\n"
         << "}\n\n";
   }
+#endif
 }
 
 /**

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

@@ -158,9 +158,7 @@ static bool print_dependent_types(const string &lib1, const string &lib2) {
 }
 
 int write_python_table_native(std::ostream &out) {
-  out << "\n#include \"dtoolbase.h\"\n"
-      << "#include \"interrogate_request.h\"\n\n"
-      << "#include \"py_panda.h\"\n\n";
+  out << "#include \"py_panda.h\"\n\n";
 
   int count = 0;
 
@@ -298,10 +296,18 @@ int write_python_table_native(std::ostream &out) {
 
   out.put('\n');
 
+  out << "#if defined(_WIN32) && !defined(CPPPARSER) && !defined(LINK_ALL_STATIC)\n"
+      << "#define EXPORT_INIT_FUNC __declspec(dllexport)\n"
+      << "#elif __GNUC__ >= 4 && !defined(CPPPARSER) && !defined(LINK_ALL_STATIC)\n"
+      << "#define EXPORT_INIT_FUNC __attribute__((visibility(\"default\")))\n"
+      << "#else\n"
+      << "#define EXPORT_INIT_FUNC\n"
+      << "#endif\n\n";
+
   out << "#if PY_MAJOR_VERSION >= 3\n"
-      << "extern \"C\" EXPORT_CLASS PyObject *PyInit_" << library_name << "();\n"
+      << "extern \"C\" EXPORT_INIT_FUNC PyObject *PyInit_" << library_name << "();\n"
       << "#else\n"
-      << "extern \"C\" EXPORT_CLASS void init" << library_name << "();\n"
+      << "extern \"C\" EXPORT_INIT_FUNC void init" << library_name << "();\n"
       << "#endif\n";
 
   out << "\n"

{panda3d_interrogate-0.3.0 → panda3d_interrogate-0.4.0}/src/interrogatedb/CMakeLists.txt

@@ -42,9 +42,9 @@ target_link_libraries(interrogatedb dtoolutil)
 install(TARGETS interrogatedb
   DESTINATION ${CMAKE_INSTALL_LIBDIR}
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)
-install(FILES ${INTERROGATEDB_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)
-install(FILES ${IGATERUNTIME_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)
+  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/interrogatedb)
+install(FILES ${INTERROGATEDB_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/interrogatedb)
+install(FILES ${IGATERUNTIME_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/interrogatedb)
 
 # ALSO: This has an Interrogate binding! Take care of that if we want it.
 # Note we don't use the regular Interrogate macros; this has some custom flags

{panda3d_interrogate-0.3.0 → panda3d_interrogate-0.4.0}/src/interrogatedb/py_compat.h

@@ -65,7 +65,7 @@ typedef int Py_ssize_t;
 
 /* Python 2.6 */
 
-#ifndef Py_TYPE
+#if PY_VERSION_HEX < 0x02060000
 #  define Py_TYPE(ob) (((PyObject*)(ob))->ob_type)
 #endif
 
@@ -221,8 +221,12 @@ INLINE PyObject *_PyLong_Lshift(PyObject *a, size_t shiftby) {
 
 /* Python 3.9 */
 
+#if PY_VERSION_HEX < 0x030900A4 && !defined(Py_IS_TYPE)
+#  define Py_IS_TYPE(ob, type) (Py_TYPE((PyObject *)ob) == type)
+#endif
+
 #ifndef PyCFunction_CheckExact
-#  define PyCFunction_CheckExact(op) (Py_TYPE(op) == &PyCFunction_Type)
+#  define PyCFunction_CheckExact(op) (Py_IS_TYPE(op, &PyCFunction_Type))
 #endif
 
 #if PY_VERSION_HEX < 0x03090000

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

@@ -5,7 +5,6 @@
  */
 
 #include "py_panda.h"
-#include "config_interrogatedb.h"
 #include "executionEnvironment.h"
 
 #ifdef HAVE_PYTHON
@@ -321,7 +320,7 @@ static PyObject *Dtool_EnumType_New(PyTypeObject *subtype, PyObject *args, PyObj
                         subtype->tp_name);
   }
 
-  if (Py_TYPE(arg) == subtype) {
+  if (Py_IS_TYPE(arg, subtype)) {
     return Py_NewRef(arg);
   }
 
@@ -701,17 +700,17 @@ PyObject *Dtool_PyModuleInitHelper(const LibraryDef *defs[], const char *modulen
   // 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()) {
+    /*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) {
-        interrogatedb_cat.warning() << "Unable to import __main__\n";
+        std::cerr << "Warning: unable to import __main__\n";
       }
 
       // Extract the __file__ attribute, if present.
@@ -743,7 +742,7 @@ PyObject *Dtool_PyModuleInitHelper(const LibraryDef *defs[], const char *modulen
         }
 #endif
         else {
-          interrogatedb_cat.warning() << "Invalid string for __main__.__file__\n";
+          std::cerr << "Invalid string for __main__.__file__\n";
         }
       }
       ExecutionEnvironment::shadow_environment_variable("MAIN_DIR", main_dir.to_os_specific());

{panda3d_interrogate-0.3.0 → panda3d_interrogate-0.4.0}/src/interrogatedb/py_panda.h

@@ -12,6 +12,7 @@
 #include "pnotify.h"
 #include "vector_uchar.h"
 #include "register_type.h"
+#include "interrogate_request.h"
 
 #if defined(HAVE_PYTHON) && !defined(CPPPARSER)
 
@@ -338,6 +339,7 @@ struct LibraryDef {
   PyMethodDef *const _methods;
   const Dtool_TypeDef *const _types;
   Dtool_TypeDef *const _external_types;
+  const InterrogateModuleDef *const _module_def;
 };
 
 #if PY_MAJOR_VERSION >= 3