Split out interrogate jobs for dtool directories from express

dtool/src/dtoolbase/dtool_platform.h

@@ -72,10 +72,8 @@
 #define DTOOL_PLATFORM "linux_ppc"
 #endif
 
-#ifndef DTOOL_PLATFORM
+#if !defined(DTOOL_PLATFORM) && !defined(CPPPARSER)
 #error "Can't determine platform; please define DTOOL_PLATFORM in Config.pp file."
 #endif
 
-
-
 #endif

dtool/src/dtoolbase/typeHandle.N

@@ -0,0 +1 @@
+defconstruct TypeHandle TypeHandle(TypeHandle::none())

dtool/src/dtoolutil/config_dtoolutil.N

@@ -0,0 +1,9 @@
+forcetype ofstream
+forcetype ifstream
+forcetype fstream
+
+forcetype ios_base
+forcetype ios
+forcetype istream
+forcetype ostream
+forcetype iostream

dtool/src/dtoolutil/config_dtoolutil.h

@@ -16,4 +16,7 @@
 
 #include "dtoolbase.h"
 
+// Include this so interrogate can find it.
+#include <iostream>
+
 #endif

dtool/src/dtoolutil/p3dtoolutil_ext_composite.cxx

@@ -0,0 +1,2 @@
+#include "filename_ext.cxx"
+#include "globPattern_ext.cxx"

dtool/src/dtoolutil/pfstream.h

@@ -17,7 +17,7 @@
 #include "pfstreamBuf.h"
 
 class EXPCL_DTOOL IPipeStream : public istream {
-PUBLISHED:
+public:
   INLINE IPipeStream(const std::string);
 
 #if _MSC_VER >= 1800
@@ -33,7 +33,7 @@ private:
 };
 
 class EXPCL_DTOOL OPipeStream : public ostream {
-PUBLISHED:
+public:
   INLINE OPipeStream(const std::string);
 
 #if _MSC_VER >= 1800

dtool/src/prc/p3prc_ext_composite.cxx

@@ -0,0 +1,2 @@
+#include "streamReader_ext.cxx"
+#include "streamWriter_ext.cxx"

makepanda/makepanda.py

@@ -3407,6 +3407,59 @@ if (not RTDIST and not RUNTIME):
   TargetAdd('test_interrogate.exe', input='libp3pystub.lib')
   TargetAdd('test_interrogate.exe', opts=['ADVAPI',  'OPENSSL', 'WINSHELL', 'WINGDI', 'WINUSER'])
 
+#
+# DIRECTORY: dtool/src/dtoolbase/
+#
+
+OPTS=['DIR:dtool/src/dtoolbase', 'PYTHON']
+IGATEFILES=GetDirectoryContents('dtool/src/dtoolbase', ["*_composite*.cxx"])
+IGATEFILES += [
+    "typeHandle.h",
+    "typeHandle_ext.h",
+    "typeRegistry.h",
+    "typedObject.h",
+    "neverFreeMemory.h",
+]
+TargetAdd('libp3dtoolbase.in', opts=OPTS, input=IGATEFILES)
+TargetAdd('libp3dtoolbase.in', opts=['IMOD:panda3d.core', 'ILIB:libp3dtoolbase', 'SRCDIR:dtool/src/dtoolbase'])
+TargetAdd('libp3dtoolbase_igate.obj', input='libp3dtoolbase.in', opts=["DEPENDENCYONLY"])
+TargetAdd('p3dtoolbase_typeHandle_ext.obj', opts=OPTS, input='typeHandle_ext.cxx')
+
+#
+# DIRECTORY: dtool/src/dtoolutil/
+#
+
+OPTS=['DIR:dtool/src/dtoolutil', 'PYTHON']
+IGATEFILES=GetDirectoryContents('dtool/src/dtoolutil', ["*_composite*.cxx"])
+IGATEFILES += [
+    "config_dtoolutil.h",
+    "pandaSystem.h",
+    "dSearchPath.h",
+    "executionEnvironment.h",
+    "textEncoder.h",
+    "filename.h",
+    "filename_ext.h",
+    "globPattern.h",
+    "globPattern_ext.h",
+    "pandaFileStream.h",
+    "lineStream.h",
+]
+TargetAdd('libp3dtoolutil.in', opts=OPTS, input=IGATEFILES)
+TargetAdd('libp3dtoolutil.in', opts=['IMOD:panda3d.core', 'ILIB:libp3dtoolutil', 'SRCDIR:dtool/src/dtoolutil'])
+TargetAdd('libp3dtoolutil_igate.obj', input='libp3dtoolutil.in', opts=["DEPENDENCYONLY"])
+TargetAdd('p3dtoolutil_ext_composite.obj', opts=OPTS, input='p3dtoolutil_ext_composite.cxx')
+
+#
+# DIRECTORY: dtool/src/prc/
+#
+
+OPTS=['DIR:dtool/src/prc', 'PYTHON']
+IGATEFILES=GetDirectoryContents('dtool/src/prc', ["*.h", "*_composite*.cxx"])
+TargetAdd('libp3prc.in', opts=OPTS, input=IGATEFILES)
+TargetAdd('libp3prc.in', opts=['IMOD:panda3d.core', 'ILIB:libp3prc', 'SRCDIR:dtool/src/prc'])
+TargetAdd('libp3prc_igate.obj', input='libp3prc.in', opts=["DEPENDENCYONLY"])
+TargetAdd('p3prc_ext_composite.obj', opts=OPTS, input='p3prc_ext_composite.cxx')
+
 #
 # DIRECTORY: panda/src/pandabase/
 #
@@ -4041,6 +4094,10 @@ if (not RUNTIME):
   TargetAdd('libpanda.dll', dep='dtool_have_freetype.dat')
   TargetAdd('libpanda.dll', opts=OPTS)
 
+  TargetAdd('core_module.obj', input='libp3dtoolbase.in')
+  TargetAdd('core_module.obj', input='libp3dtoolutil.in')
+  TargetAdd('core_module.obj', input='libp3prc.in')
+
   TargetAdd('core_module.obj', input='libp3downloader.in')
   TargetAdd('core_module.obj', input='libp3express.in')
 
@@ -4080,6 +4137,13 @@ if (not RUNTIME):
   TargetAdd('core_module.obj', opts=['PYTHON'])
   TargetAdd('core_module.obj', opts=['IMOD:panda3d.core', 'ILIB:core'])
 
+  TargetAdd('core.pyd', input='libp3dtoolbase_igate.obj')
+  TargetAdd('core.pyd', input='p3dtoolbase_typeHandle_ext.obj')
+  TargetAdd('core.pyd', input='libp3dtoolutil_igate.obj')
+  TargetAdd('core.pyd', input='p3dtoolutil_ext_composite.obj')
+  TargetAdd('core.pyd', input='libp3prc_igate.obj')
+  TargetAdd('core.pyd', input='p3prc_ext_composite.obj')
+
   TargetAdd('core.pyd', input='libp3downloader_igate.obj')
   TargetAdd('core.pyd', input='p3downloader_stringStream_ext.obj')
   TargetAdd('core.pyd', input='p3express_ext_composite.obj')

makepanda/makepandacore.py

@@ -3163,6 +3163,13 @@ def TargetAdd(target, dummy=0, opts=[], input=[], dep=[], ipath=None, winrc=None
             woutc = GetOutputDir()+"/tmp/"+outbase+"_igate.cxx"
             t.deps[woutc] = 1
 
+        if target.endswith(".in"):
+            # Add any .N files.
+            base, ext = os.path.splitext(fullinput)
+            fulln = base + ".N"
+            if os.path.isfile(fulln):
+                t.deps[fulln] = 1
+
     for x in dep:
         fulldep = FindLocation(x, ipath)
         t.deps[fulldep] = 1

panda/src/express/config_express.N

@@ -1,60 +1,4 @@
-defconstruct TypeHandle TypeHandle(TypeHandle::none())
-
-forcetype PandaSystem
-forcetype DSearchPath
-forcetype DSearchPath::Results
-forcetype ExecutionEnvironment
-forcetype TextEncoder
-forcetype Filename
-forcetype GlobPattern
-forcetype Notify
-forcetype NotifyCategory
-forcetype NotifySeverity
-forcetype TypedObject
-forcetype TypeHandle
-forcetype TypeRegistry
-forcetype StreamReader
-forcetype StreamWriter
-forcetype NeverFreeMemory
-forcetype IFileStream
-forcetype OFileStream
-forcetype FileStream
-forcetype IDecryptStream
-forcetype OEncryptStream
-forcetype LineStream
-
-forcetype ofstream
-forcetype ifstream
-forcetype fstream
-
 forcetype DConfig
-forcetype ConfigFlags
-forcetype ConfigPage
-forcetype ConfigPageManager
-forcetype ConfigDeclaration
-forcetype ConfigVariableCore
-forcetype ConfigVariable
-forcetype ConfigVariableBase
-forcetype ConfigVariableBool
-forcetype ConfigVariableDouble
-forcetype ConfigVariableFilename
-forcetype ConfigVariableInt
-forcetype ConfigVariableInt64
-forcetype ConfigVariableList
-forcetype ConfigVariableManager
-forcetype ConfigVariableSearchPath
-forcetype ConfigVariableString
-
-forcetype ios_base
-forcetype ios
-forcetype istream
-forcetype ostream
-forcetype iostream
-
-forcetype StreamWrapperBase
-forcetype IStreamWrapper
-forcetype OStreamWrapper
-forcetype StreamWrapper
 
 forcetype PTA_uchar
 forcetype CPTA_uchar

panda/src/express/p3express_ext_composite.cxx

@@ -1,9 +1,4 @@
-#include "filename_ext.cxx"
-#include "globPattern_ext.cxx"
 #include "memoryUsagePointers_ext.cxx"
 #include "ramfile_ext.cxx"
-#include "streamReader_ext.cxx"
-#include "streamWriter_ext.cxx"
-#include "typeHandle_ext.cxx"
 #include "virtualFileSystem_ext.cxx"
 #include "virtualFile_ext.cxx"