From 675027f0b531275ed519997befe4259ed98f2836 Mon Sep 17 00:00:00 2001 From: pmp-p Date: Thu, 22 Feb 2018 06:02:08 +0100 Subject: [PATCH 1/2] fix panda3d.lui.__name__ interrogate_module.cpp should contains : PyObject *module = Dtool_PyModuleInitHelper(defs, "panda3d.lui"); actually is: PyObject *module = Dtool_PyModuleInitHelper(defs, "lui"); --- scripts/interrogate.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/interrogate.py b/scripts/interrogate.py index 0fbd824..ac530f4 100644 --- a/scripts/interrogate.py +++ b/scripts/interrogate.py @@ -19,7 +19,8 @@ # Parameters -MODULE_NAME = sys.argv[1] +MODULE_NAME = "panda3d."+sys.argv[1] +LIB_NAME = sys.argv[1] VERBOSE_LVL = int(sys.argv[2]) # Assume the user did specify something valid @@ -73,7 +74,7 @@ def interrogate(): cmd += ["-oc", "interrogate_wrapper.cpp"] cmd += ["-od", "interrogate.in"] cmd += ["-module", MODULE_NAME] - cmd += ["-library", MODULE_NAME] + cmd += ["-library", LIB_NAME] if PandaSystem.get_major_version() > 1 or PandaSystem.get_minor_version() > 9: # Add nomangle option, but only for recent builds @@ -120,7 +121,7 @@ def interrogate_module(): cmd += ["-import", "panda3d.core"] cmd += ["-module", MODULE_NAME] - cmd += ["-library", MODULE_NAME] + cmd += ["-library", LIB_NAME] cmd += ["-oc", "interrogate_module.cpp"] cmd += ["interrogate.in"] From c2f849f83342913997189be8d424f55f162e7f6a Mon Sep 17 00:00:00 2001 From: pmp-p Date: Sun, 25 Feb 2018 10:47:02 +0100 Subject: [PATCH 2/2] Update interrogate.py --- scripts/interrogate.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/interrogate.py b/scripts/interrogate.py index ac530f4..ecf0841 100644 --- a/scripts/interrogate.py +++ b/scripts/interrogate.py @@ -6,7 +6,7 @@ """ import sys -from os import listdir, chdir +from os import listdir, chdir, getenv from os.path import join, isfile, isdir from panda3d.core import PandaSystem @@ -19,7 +19,7 @@ # Parameters -MODULE_NAME = "panda3d."+sys.argv[1] +MODULE_NAME = getenv( "MODULE_FQN", sys.argv[1] ) LIB_NAME = sys.argv[1] VERBOSE_LVL = int(sys.argv[2]) # Assume the user did specify something valid