Browse Source

add MAYA_LICENSE_FILE

David Rose 23 years ago
parent
commit
14cefb8241
3 changed files with 9 additions and 2 deletions
  1. 3 0
      dtool/Config.pp
  2. 2 2
      pandatool/src/mayaprogs/Sources.pp
  3. 4 0
      pandatool/src/mayaprogs/mayapath_script

+ 3 - 0
dtool/Config.pp

@@ -408,6 +408,9 @@
 // Is Maya installed?  This matters only to programs in PANDATOOL.
 #define MAYA_LOCATION /usr/aw/maya
 #defer MAYA_LIBS $[if $[WINDOWS_PLATFORM],Foundation.lib OpenMaya.lib OpenMayaAnim.lib,Foundation OpenMaya OpenMayaAnim]
+// Optionally define this to the value of LM_LICENSE_FILE that should
+// be set before invoking Maya.
+#define MAYA_LICENSE_FILE
 #defer HAVE_MAYA $[isdir $[MAYA_LOCATION]/include/maya]
 
 

+ 2 - 2
pandatool/src/mayaprogs/Sources.pp

@@ -17,7 +17,7 @@
   #define TARGET maya2egg
 
   #define SOURCE mayapath_script
-  #define COMMAND s:xxx:$[MAYA_LOCATION]:g;s:yyy:$[TARGET]:g;
+  #define COMMAND s:xxx:$[MAYA_LOCATION]:g;s:yyy:$[TARGET]:g;s:zzz:$[MAYA_LICENSE_FILE]:g;
 
 #end sed_bin_target
 
@@ -25,7 +25,7 @@
   #define TARGET mayacopy
 
   #define SOURCE mayapath_script
-  #define COMMAND s:xxx:$[MAYA_LOCATION]:g;s:yyy:$[TARGET]:g;
+  #define COMMAND s:xxx:$[MAYA_LOCATION]:g;s:yyy:$[TARGET]:g;s:zzz:$[MAYA_LICENSE_FILE]:g;
 
 #end sed_bin_target
 

+ 4 - 0
pandatool/src/mayaprogs/mayapath_script

@@ -6,5 +6,9 @@ if test "$LD_LIBRARY_PATH" = ""; then
 else
   LD_LIBRARY_PATH=$MAYA_LOCATION/lib:$LD_LIBRARY_PATH
 fi
+if test "zzz" != ""; then
+  LM_LICENSE_FILE="zzz"
+  export LM_LICENSE_FILE
+fi
 export LD_LIBRARY_PATH
 exec `dirname $0`/yyy_bin $*