Browse Source

MAKE_BAT_SCRIPTS

David Rose 15 years ago
parent
commit
36635a00b9
4 changed files with 12 additions and 8 deletions
  1. 1 1
      direct/src/ffi/Sources.pp
  2. 3 3
      direct/src/ffi/genPyCode.pp
  3. 4 4
      direct/src/p3d/Sources.pp
  4. 4 0
      dtool/Config.pp

+ 1 - 1
direct/src/ffi/Sources.pp

@@ -3,7 +3,7 @@
 
 
 // If we're on Win32 without Cygwin, install the genPyCode.bat file;
 // If we're on Win32 without Cygwin, install the genPyCode.bat file;
 // for all other platforms, install the genPyCode sh script.
 // for all other platforms, install the genPyCode sh script.
-#if $[eq $[PLATFORM],Win32]
+#if $[MAKE_BAT_SCRIPTS]
   #define INSTALL_SCRIPTS $[INSTALL_SCRIPTS] genPyCode.bat
   #define INSTALL_SCRIPTS $[INSTALL_SCRIPTS] genPyCode.bat
 #else
 #else
   #define INSTALL_SCRIPTS $[INSTALL_SCRIPTS] genPyCode
   #define INSTALL_SCRIPTS $[INSTALL_SCRIPTS] genPyCode

+ 3 - 3
direct/src/ffi/genPyCode.pp

@@ -25,7 +25,7 @@
 // we generate the script anyway to be consistent with Win32, which
 // we generate the script anyway to be consistent with Win32, which
 // does require it.
 // does require it.
 
 
-#if $[eq $[PLATFORM],Win32]
+#if $[MAKE_BAT_SCRIPTS]
 
 
 #output genPyCode.bat
 #output genPyCode.bat
 @echo off
 @echo off
@@ -35,7 +35,7 @@ rem ################################# DO NOT EDIT ###########################
 $[python] -u $[osfilename $[install_bin_dir]/genPyCode.py] %1 %2 %3 %4 %5 %6 %7 %8 %9
 $[python] -u $[osfilename $[install_bin_dir]/genPyCode.py] %1 %2 %3 %4 %5 %6 %7 %8 %9
 #end genPyCode.bat
 #end genPyCode.bat
 
 
-#else  // Win32
+#else  // MAKE_BAT_SCRIPTS
 
 
 #output genPyCode $[if $[>= $[PPREMAKE_VERSION],1.21],binary]
 #output genPyCode $[if $[>= $[PPREMAKE_VERSION],1.21],binary]
 #! /bin/sh
 #! /bin/sh
@@ -55,7 +55,7 @@ $[python] -u '$[osfilename $[install_bin_dir]/genPyCode.py]' "$@"
 #endif
 #endif
 #end genPyCode
 #end genPyCode
 
 
-#endif  // Win32
+#endif  // MAKE_BAT_SCRIPTS
 
 
 #output genPyCode.py
 #output genPyCode.py
 #! /usr/bin/env $[python]
 #! /usr/bin/env $[python]

+ 4 - 4
direct/src/p3d/Sources.pp

@@ -31,13 +31,13 @@
   #endif
   #endif
 
 
   #foreach scriptname $[BUILD_P3D_SCRIPTS]
   #foreach scriptname $[BUILD_P3D_SCRIPTS]
-    #if $[eq $[PLATFORM],Win32]
+    #if $[MAKE_BAT_SCRIPTS]
       #set INSTALL_SCRIPTS $[INSTALL_SCRIPTS] $[scriptname].bat
       #set INSTALL_SCRIPTS $[INSTALL_SCRIPTS] $[scriptname].bat
     #else
     #else
       #set INSTALL_SCRIPTS $[INSTALL_SCRIPTS] $[scriptname]
       #set INSTALL_SCRIPTS $[INSTALL_SCRIPTS] $[scriptname]
     #endif
     #endif
 
 
-    #if $[eq $[PLATFORM],Win32]
+    #if $[MAT_BAT_SCRIPTS]
   #output $[scriptname].bat notouch
   #output $[scriptname].bat notouch
 @echo off
 @echo off
 rem #### Generated automatically by $[PPREMAKE] $[PPREMAKE_VERSION] from $[notdir $[THISFILENAME]].
 rem #### Generated automatically by $[PPREMAKE] $[PPREMAKE_VERSION] from $[notdir $[THISFILENAME]].
@@ -46,7 +46,7 @@ rem ################################# DO NOT EDIT ###########################
 $[python] -u $[osfilename $[install_bin_dir]/$[scriptname].py] %1 %2 %3 %4 %5 %6 %7 %8 %9
 $[python] -u $[osfilename $[install_bin_dir]/$[scriptname].py] %1 %2 %3 %4 %5 %6 %7 %8 %9
   #end $[scriptname].bat
   #end $[scriptname].bat
 
 
-  #else  // Win32
+  #else  // MAKE_BAT_SCRIPTS
 
 
   #output $[scriptname] binary notouch
   #output $[scriptname] binary notouch
 #! /bin/sh
 #! /bin/sh
@@ -66,7 +66,7 @@ $[python] -u '$[osfilename $[install_bin_dir]/$[scriptname].py]' "$@"
   #endif
   #endif
   #end $[scriptname]
   #end $[scriptname]
 
 
-  #endif  // Win32
+  #endif  // MAKE_BAT_SCRIPTS
 
 
   #end scriptname
   #end scriptname
 
 

+ 4 - 0
dtool/Config.pp

@@ -1085,6 +1085,10 @@
 // on Windows.  Some Windows compilers may not support this syntax.
 // on Windows.  Some Windows compilers may not support this syntax.
 #defer EXPORT_TEMPLATES yes
 #defer EXPORT_TEMPLATES yes
 
 
+// Define this to generate .bat files when a Sources.pp makes a
+// script; leave it clear to generate Unix-style sh scripts.
+#defer MAKE_BAT_SCRIPTS $[eq $[PLATFORM],Win32]
+
 // Define USE_COMPILER to switch the particular compiler that should
 // Define USE_COMPILER to switch the particular compiler that should
 // be used.  A handful of tokens are recognized, depending on BUILD_TYPE.
 // be used.  A handful of tokens are recognized, depending on BUILD_TYPE.
 // This may also be further customized within Global.$[BUILD_TYPE].pp.
 // This may also be further customized within Global.$[BUILD_TYPE].pp.