TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove pystub dependency from interrogate and friends

Browse Source
This commit is contained in:
rdb 2018-11-06 21:49:17 +01:00
parent 98e767c370
commit b8ed9b1275
5 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dtool/src/interrogate/interrogate.cxx
View File

@ -19,7 +19,6 @@
#include "pnotify.h" #include "pnotify.h"
#include "panda_getopt_long.h" #include "panda_getopt_long.h"
#include "preprocess_argv.h" #include "preprocess_argv.h"
#include "pystub.h"
#include <time.h> #include <time.h>
using std::cerr; using std::cerr;
@ -309,8 +308,6 @@ predefine_macro(CPPParser& parser, const string& inoption) {
int int
main(int argc, char **argv) { main(int argc, char **argv) {
pystub();
preprocess_argv(argc, argv); preprocess_argv(argc, argv);
string command_line; string command_line;
int i; int i;

3
dtool/src/interrogate/interrogate_module.cxx
View File

@ -19,7 +19,6 @@
#include "interrogate_interface.h" #include "interrogate_interface.h"
#include "interrogate_request.h" #include "interrogate_request.h"
#include "load_dso.h" #include "load_dso.h"
#include "pystub.h"
#include "pnotify.h" #include "pnotify.h"
#include "panda_getopt_long.h" #include "panda_getopt_long.h"
#include "preprocess_argv.h" #include "preprocess_argv.h"
@ -541,8 +540,6 @@ int main(int argc, char *argv[]) {
extern int optind; extern int optind;
int flag; int flag;
pystub();
preprocess_argv(argc, argv); preprocess_argv(argc, argv);
flag = getopt_long_only(argc, argv, short_options, long_options, nullptr); flag = getopt_long_only(argc, argv, short_options, long_options, nullptr);
while (flag != EOF) { while (flag != EOF) {

3
dtool/src/interrogate/parse_file.cxx
View File

@ -22,7 +22,6 @@
#include "cppGlobals.h" #include "cppGlobals.h"
#include "panda_getopt_long.h" #include "panda_getopt_long.h"
#include "preprocess_argv.h" #include "preprocess_argv.h"
#include "pystub.h"
#include <stdlib.h> #include <stdlib.h>
using std::cerr; using std::cerr;
@ -206,8 +205,6 @@ show_nested_types(const string &str) {
int int
main(int argc, char **argv) { main(int argc, char **argv) {
pystub();
extern char *optarg; extern char *optarg;
extern int optind; extern int optind;
const char *optstr = "I:S:D:o:l:vp"; const char *optstr = "I:S:D:o:l:vp";

3
dtool/src/test_interrogate/test_interrogate.cxx
View File

@ -17,7 +17,6 @@
#include "interrogate_request.h" #include "interrogate_request.h"
#include "load_dso.h" #include "load_dso.h"
#include "filename.h" #include "filename.h"
#include "pystub.h"
#include "panda_getopt.h" #include "panda_getopt.h"
#include "preprocess_argv.h" #include "preprocess_argv.h"
@ -526,8 +525,6 @@ main(int argc, char **argv) {
extern int optind; extern int optind;
const char *optstr = "p:ftqh"; const char *optstr = "p:ftqh";
pystub();
bool all_functions = false; bool all_functions = false;
bool all_types = false; bool all_types = false;
bool quick_load = false; bool quick_load = false;

5
makepanda/makepanda.py
View File

@ -3478,7 +3478,6 @@ if (not RUNTIME):
TargetAdd('interrogate.exe', input='libp3cppParser.ilb') TargetAdd('interrogate.exe', input='libp3cppParser.ilb')
TargetAdd('interrogate.exe', input=COMMON_DTOOL_LIBS) TargetAdd('interrogate.exe', input=COMMON_DTOOL_LIBS)
TargetAdd('interrogate.exe', input='libp3interrogatedb.dll') TargetAdd('interrogate.exe', input='libp3interrogatedb.dll')
TargetAdd('interrogate.exe', input='libp3pystub.lib')
TargetAdd('interrogate.exe', opts=['ADVAPI', 'OPENSSL', 'WINSHELL', 'WINGDI', 'WINUSER']) TargetAdd('interrogate.exe', opts=['ADVAPI', 'OPENSSL', 'WINSHELL', 'WINGDI', 'WINUSER'])
preamble = WriteEmbeddedStringFile('interrogate_preamble_python_native', inputs=[ preamble = WriteEmbeddedStringFile('interrogate_preamble_python_native', inputs=[
@ -3494,7 +3493,6 @@ if (not RUNTIME):
TargetAdd('interrogate_module.exe', input='libp3cppParser.ilb') TargetAdd('interrogate_module.exe', input='libp3cppParser.ilb')
TargetAdd('interrogate_module.exe', input=COMMON_DTOOL_LIBS) TargetAdd('interrogate_module.exe', input=COMMON_DTOOL_LIBS)
TargetAdd('interrogate_module.exe', input='libp3interrogatedb.dll') TargetAdd('interrogate_module.exe', input='libp3interrogatedb.dll')
TargetAdd('interrogate_module.exe', input='libp3pystub.lib')
TargetAdd('interrogate_module.exe', opts=['ADVAPI', 'OPENSSL', 'WINSHELL', 'WINGDI', 'WINUSER']) TargetAdd('interrogate_module.exe', opts=['ADVAPI', 'OPENSSL', 'WINSHELL', 'WINGDI', 'WINUSER'])
if (not RTDIST): if (not RTDIST):
@ -3503,7 +3501,6 @@ if (not RUNTIME):
TargetAdd('parse_file.exe', input='libp3cppParser.ilb') TargetAdd('parse_file.exe', input='libp3cppParser.ilb')
TargetAdd('parse_file.exe', input=COMMON_DTOOL_LIBS) TargetAdd('parse_file.exe', input=COMMON_DTOOL_LIBS)
TargetAdd('parse_file.exe', input='libp3interrogatedb.dll') TargetAdd('parse_file.exe', input='libp3interrogatedb.dll')
TargetAdd('parse_file.exe', input='libp3pystub.lib')
TargetAdd('parse_file.exe', opts=['ADVAPI', 'OPENSSL', 'WINSHELL', 'WINGDI', 'WINUSER']) TargetAdd('parse_file.exe', opts=['ADVAPI', 'OPENSSL', 'WINSHELL', 'WINGDI', 'WINUSER'])
# #
@ -3527,7 +3524,6 @@ if (not RTDIST and not RUNTIME):
TargetAdd('test_interrogate.exe', input='test_interrogate_test_interrogate.obj') TargetAdd('test_interrogate.exe', input='test_interrogate_test_interrogate.obj')
TargetAdd('test_interrogate.exe', input='libp3interrogatedb.dll') TargetAdd('test_interrogate.exe', input='libp3interrogatedb.dll')
TargetAdd('test_interrogate.exe', input=COMMON_DTOOL_LIBS) TargetAdd('test_interrogate.exe', input=COMMON_DTOOL_LIBS)
TargetAdd('test_interrogate.exe', input='libp3pystub.lib')
TargetAdd('test_interrogate.exe', opts=['ADVAPI', 'OPENSSL', 'WINSHELL', 'WINGDI', 'WINUSER']) TargetAdd('test_interrogate.exe', opts=['ADVAPI', 'OPENSSL', 'WINSHELL', 'WINGDI', 'WINUSER'])
# #
@ -6280,7 +6276,6 @@ if not PkgSkip("PANDATOOL") and not PkgSkip("EGG"):
# TargetAdd('bin2c.exe', input='libp3progbase.lib') # TargetAdd('bin2c.exe', input='libp3progbase.lib')
# TargetAdd('bin2c.exe', input='libp3pandatoolbase.lib') # TargetAdd('bin2c.exe', input='libp3pandatoolbase.lib')
# TargetAdd('bin2c.exe', input=COMMON_PANDA_LIBS) # TargetAdd('bin2c.exe', input=COMMON_PANDA_LIBS)
# TargetAdd('bin2c.exe', input='libp3pystub.lib')
# TargetAdd('bin2c.exe', opts=['ADVAPI']) # TargetAdd('bin2c.exe', opts=['ADVAPI'])
# #