浏览代码

allow removing interrogate from the build process

David Rose 24 年之前
父节点
当前提交
61c08e254e
共有 5 个文件被更改,包括 11 次插入13 次删除
  1. 6 0
      dtool/Config.pp
  2. 1 0
      dtool/pptempl/Global.pp
  3. 2 0
      dtool/src/cppparser/Sources.pp
  4. 2 0
      dtool/src/interrogate/Sources.pp
  5. 0 13
      dtool/src/interrogatedb/Sources.pp

+ 6 - 0
dtool/Config.pp

@@ -120,6 +120,12 @@
 // Studio code.
 // Studio code.
 #define INTERROGATE_C_INTERFACE
 #define INTERROGATE_C_INTERFACE
 
 
+// Do you even want to build interrogate at all?  This is the program
+// that reads our C++ source files and generates one of the above
+// interfaces.  If you won't be building the interfaces, you don't
+// need the program.
+#defer HAVE_INTERROGATE $[or $[INTERROGATE_PYTHON_INTERFACE],$[INTERROGATE_C_INTERFACE]]
+
 // What additional options should be passed to interrogate when
 // What additional options should be passed to interrogate when
 // generating either of the above two interfaces?  Generally, you
 // generating either of the above two interfaces?  Generally, you
 // probably don't want to mess with this.
 // probably don't want to mess with this.

+ 1 - 0
dtool/pptempl/Global.pp

@@ -237,6 +237,7 @@
      $[or $[not $[DIRECTORY_IF_IPC]],$[HAVE_IPC]], \
      $[or $[not $[DIRECTORY_IF_IPC]],$[HAVE_IPC]], \
      $[or $[not $[DIRECTORY_IF_NET]],$[HAVE_NET]], \
      $[or $[not $[DIRECTORY_IF_NET]],$[HAVE_NET]], \
      $[or $[not $[DIRECTORY_IF_AUDIO]],$[HAVE_AUDIO]], \
      $[or $[not $[DIRECTORY_IF_AUDIO]],$[HAVE_AUDIO]], \
+     $[or $[not $[DIRECTORY_IF_INTERROGATE]],$[HAVE_INTERROGATE]], \
       1 ]
       1 ]
 
 
 // This variable, when evaluated in the scope of a particular target,
 // This variable, when evaluated in the scope of a particular target,

+ 2 - 0
dtool/src/cppparser/Sources.pp

@@ -1,3 +1,5 @@
+#define DIRECTORY_IF_INTERROGATE yes
+
 #define LOCAL_LIBS dtoolutil dtoolbase
 #define LOCAL_LIBS dtoolutil dtoolbase
 #define YACC_PREFIX cppyy
 #define YACC_PREFIX cppyy
 
 

+ 2 - 0
dtool/src/interrogate/Sources.pp

@@ -1,3 +1,5 @@
+#define DIRECTORY_IF_INTERROGATE yes
+
 #define LOCAL_LIBS cppParser pystub interrogatedb dconfig dtoolutil dtoolbase
 #define LOCAL_LIBS cppParser pystub interrogatedb dconfig dtoolutil dtoolbase
 
 
 #begin bin_target
 #begin bin_target

+ 0 - 13
dtool/src/interrogatedb/Sources.pp

@@ -29,17 +29,4 @@
     interrogate_interface.h interrogate_request.h vector_int.h \
     interrogate_interface.h interrogate_request.h vector_int.h \
     config_interrogatedb.h
     config_interrogatedb.h
 
 
-// These are temporary; they need not be installed in the future.  These are
-// necessary only when using template stopgap.
-  #define INSTALL_HEADERS \
-    $[INSTALL_HEADERS] \
-    interrogateComponent.h interrogateComponent.I \
-    interrogateType.h interrogateType.I \
-    interrogateFunction.h interrogateFunction.I \
-    interrogateFunctionWrapper.h interrogateFunctionWrapper.I \
-    interrogateManifest.h interrogateManifest.I \
-    interrogateElement.h interrogateElement.I \
-    interrogateDatabase.h interrogateDatabase.I \
-    indexRemapper.h
-
 #end lib_target
 #end lib_target