From ef368fc5ae6f264f1c70c176e96c1ad4b7ac69d5 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Fri, 8 Jul 2005 18:31:17 +0000
Subject: [PATCH] define KEEP_TIMESTAMPS

---
 dtool/Config.pp                 | 12 ++++++++++--
 dtool/pptempl/Template.gmsvc.pp | 34 ++++++++++++++++-----------------
 2 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/dtool/Config.pp b/dtool/Config.pp
index 40550eadf0..f9f1d9409e 100644
--- a/dtool/Config.pp
+++ b/dtool/Config.pp
@@ -226,6 +226,13 @@
 // below, is also true.
 #define INTERROGATE_PYTHON_INTERFACE 1
 
+// Define this true to use the new interrogate feature to generate
+// Python-native objects directly, rather than requiring a separate
+// FFI step.  This loads and runs much more quickly than the original
+// mechanism.  Define this false (that is, empty) to use the original
+// interfaces.
+#define PYTHON_NATIVE 1
+
 // Do you want to generate a C-callable interrogate interface?  This
 // generates an interface similar to the Python interface above, with
 // a C calling convention.  It should be useful for most other kinds
@@ -809,8 +816,9 @@
 // a running program without crashing the running instance.  However,
 // it doesn't understanding installing a program from a subdirectory,
 // so we have to cd into the source directory first.
-#defer INSTALL $[if $[ne $[dir $[local]], ./],cd ./$[dir $[local]] &&] install -m $[INSTALL_UMASK_DATA] -p $[notdir $[local]] $[dest]/
-#defer INSTALL_PROG $[if $[ne $[dir $[local]], ./],cd ./$[dir $[local]] &&] install -m $[INSTALL_UMASK_PROG] -p $[notdir $[local]] $[dest]/
+#defer install_dash_p $[if $[KEEP_TIMESTAMPS],-p,]
+#defer INSTALL $[if $[ne $[dir $[local]], ./],cd ./$[dir $[local]] &&] install -m $[INSTALL_UMASK_DATA] $[install_dash_p] $[notdir $[local]] $[dest]/
+#defer INSTALL_PROG $[if $[ne $[dir $[local]], ./],cd ./$[dir $[local]] &&] install -m $[INSTALL_UMASK_PROG] $[install_dash_p] $[notdir $[local]] $[dest]/
 
 // Variable definitions for building with the Irix MIPSPro compiler.
 #if $[eq $[USE_COMPILER], MIPS]
diff --git a/dtool/pptempl/Template.gmsvc.pp b/dtool/pptempl/Template.gmsvc.pp
index 124ff875d6..592b8d7ee9 100644
--- a/dtool/pptempl/Template.gmsvc.pp
+++ b/dtool/pptempl/Template.gmsvc.pp
@@ -427,19 +427,19 @@ $[TAB] rm -f $[sort $[installed_files]]
 $[install_lib_dir]/$[get_dllname $[TARGET]].$[dlllib] : $[ODIR]/$[get_dllname $[TARGET]].$[dlllib]
 #define local $[get_dllname $[TARGET]].$[dlllib]
 #define dest $[install_lib_dir]
-$[TAB] cp -p -f $[ODIR]/$[local] $[dest]/
+$[TAB] cp $[install_dash_p] -f $[ODIR]/$[local] $[dest]/
 #endif
 
 $[install_lib_dir]/$[get_dllname $[TARGET]].lib : $[ODIR]/$[get_dllname $[TARGET]].lib
 #define local $[get_dllname $[TARGET]].lib
 #define dest $[install_lib_dir]
-$[TAB] cp -p -f $[ODIR]/$[local] $[dest]/
+$[TAB] cp $[install_dash_p] -f $[ODIR]/$[local] $[dest]/
 
 #if $[and $[build_dlls],$[build_pdbs]]
 $[install_lib_dir]/$[get_dllname $[TARGET]].pdb : $[ODIR]/$[get_dllname $[TARGET]].pdb
 #define local $[get_dllname $[TARGET]].pdb
 #define dest $[install_lib_dir]
-$[TAB] cp -p -f $[ODIR]/$[local] $[dest]/
+$[TAB] cp $[install_dash_p] -f $[ODIR]/$[local] $[dest]/
 #endif
 
 #if $[igatescan]
@@ -458,7 +458,7 @@ $[TAB] cp -p -f $[ODIR]/$[local] $[dest]/
 $[igatedb:$[ODIR]/%=$[install_igatedb_dir]/%] : $[igatedb]
 #define local $[igatedb]
 #define dest $[install_igatedb_dir]
-$[TAB] cp -p -f $[local] $[dest]/
+$[TAB] cp $[install_dash_p] -f $[local] $[dest]/
 
 // We have to split this out as a separate rule to properly support
 // parallel make.
@@ -610,7 +610,7 @@ $[TAB] rm -f $[sort $[installed_files]]
 $[install_lib_dir]/$[get_dllname $[TARGET]].lib : $[ODIR]/$[get_dllname $[TARGET]].lib
 #define local $[get_dllname $[TARGET]].lib
 #define dest $[install_lib_dir]
-$[TAB] cp -p -f $[ODIR]/$[local] $[dest]/
+$[TAB] cp $[install_dash_p] -f $[ODIR]/$[local] $[dest]/
 
 #end static_lib_target ss_lib_target
 
@@ -645,7 +645,7 @@ $[TAB] rm -f $[sort $[installed_files]]
 #define local $[TARGET]
 #define dest $[install_bin_dir]
 $[install_bin_dir]/$[TARGET] : $[ODIR]/$[TARGET]
-$[TAB] cp -p -f $[ODIR]/$[local] $[dest]/
+$[TAB] cp $[install_dash_p] -f $[ODIR]/$[local] $[dest]/
 
 #end sed_bin_target
 
@@ -699,13 +699,13 @@ $[TAB] rm -f $[sort $[installed_files]]
 $[install_bin_dir]/$[TARGET].exe : $[ODIR]/$[TARGET].exe
 #define local $[TARGET].exe
 #define dest $[install_bin_dir]
-$[TAB] cp -p -f $[ODIR]/$[local] $[dest]/
+$[TAB] cp $[install_dash_p] -f $[ODIR]/$[local] $[dest]/
 
 #if $[build_pdbs]
 $[install_bin_dir]/$[TARGET].pdb : $[ODIR]/$[TARGET].pdb
 #define local $[TARGET].pdb
 #define dest $[install_bin_dir]
-$[TAB] cp -p -f $[ODIR]/$[local] $[dest]/
+$[TAB] cp $[install_dash_p] -f $[ODIR]/$[local] $[dest]/
 #endif
 
 #if $[bin_postprocess_target]
@@ -717,7 +717,7 @@ $[TAB] rm -f $[output_exe]
 $[TAB] $[bin_postprocess_cmd] $[bin_postprocess_arg1] $[input_exe] $[bin_postprocess_arg2] $[output_exe]
 
 $[install_bin_dir]/$[bin_postprocess_target].exe : $[output_exe]
-$[TAB] cp -p -f $[output_exe] $[install_bin_dir]/
+$[TAB] cp $[install_dash_p] -f $[output_exe] $[install_bin_dir]/
 #endif
 
 #end bin_target
@@ -850,14 +850,14 @@ $[TAB] $[COMPILE_C++]
 $[install_bin_dir]/$[file] : $[file]
 #define local $[file]
 #define dest $[install_bin_dir]
-$[TAB] chmod +x $[local]; cp -p -f $[local] $[dest]/
+$[TAB] chmod +x $[local]; cp $[install_dash_p] -f $[local] $[dest]/
 #end file
 
 #foreach file $[install_headers]
 $[install_headers_dir]/$[file] : $[file]
 #define local $[file]
 #define dest $[install_headers_dir]
-$[TAB] cp -p -f $[local] $[dest]/
+$[TAB] cp $[install_dash_p] -f $[local] $[dest]/
 #end file
 
 #foreach file $[install_parser_inc]
@@ -866,12 +866,12 @@ $[install_parser_inc_dir]/$[file] : $[notdir $[file]]
   #define local $[notdir $[file]]
   #define dest $[install_parser_inc_dir]/$[dir $[file]]
 $[TAB] mkdir -p $[install_parser_inc_dir]/$[dir $[file]] || echo
-$[TAB] cp -p -f $[local] $[dest]
+$[TAB] cp $[install_dash_p] -f $[local] $[dest]
 #else
 $[install_parser_inc_dir]/$[file] : $[file]
   #define local $[file]
   #define dest $[install_parser_inc_dir]
-$[TAB] cp -p -f $[local] $[dest]/
+$[TAB] cp $[install_dash_p] -f $[local] $[dest]/
 #endif
 #end file
 
@@ -879,21 +879,21 @@ $[TAB] cp -p -f $[local] $[dest]/
 $[install_data_dir]/$[file] : $[file]
 #define local $[file]
 #define dest $[install_data_dir]
-$[TAB] cp -p -f $[local] $[dest]/
+$[TAB] cp $[install_dash_p] -f $[local] $[dest]/
 #end file
 
 #foreach file $[install_config]
 $[install_config_dir]/$[file] : $[file]
 #define local $[file]
 #define dest $[install_config_dir]
-$[TAB] cp -p -f $[local] $[dest]/
+$[TAB] cp $[install_dash_p] -f $[local] $[dest]/
 #end file
 
 #foreach file $[install_py]
 $[install_py_dir]/$[file] : $[file]
 #define local $[file]
 #define dest $[install_py_dir]
-$[TAB] cp -p -f $[local] $[dest]/
+$[TAB] cp $[install_dash_p] -f $[local] $[dest]/
 #end file
 
 #if $[install_py]
@@ -1049,7 +1049,7 @@ $[TAB] @test -d $[install_headers_dir] || mkdir -p $[install_headers_dir]
 $[install_headers_dir]/$[CONFIG_HEADER] : $[CONFIG_HEADER]
 #define local $[CONFIG_HEADER]
 #define dest $[install_headers_dir]
-$[TAB] cp -p -f $[local] $[dest]/
+$[TAB] cp $[install_dash_p] -f $[local] $[dest]/
 #endif
 
 // Finally, the rules to freshen the Makefile itself.