From 14cefb82411972d993eacb478445c838e57005d7 Mon Sep 17 00:00:00 2001 From: David Rose Date: Fri, 21 Mar 2003 01:17:19 +0000 Subject: [PATCH] add MAYA_LICENSE_FILE --- dtool/Config.pp | 3 +++ pandatool/src/mayaprogs/Sources.pp | 4 ++-- pandatool/src/mayaprogs/mayapath_script | 4 ++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dtool/Config.pp b/dtool/Config.pp index 9f6232e020..ca56eb3e48 100644 --- a/dtool/Config.pp +++ b/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] diff --git a/pandatool/src/mayaprogs/Sources.pp b/pandatool/src/mayaprogs/Sources.pp index 3c23f7ee05..599ef9eeaa 100644 --- a/pandatool/src/mayaprogs/Sources.pp +++ b/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 diff --git a/pandatool/src/mayaprogs/mayapath_script b/pandatool/src/mayaprogs/mayapath_script index 1f48765c0f..0da12a31c6 100644 --- a/pandatool/src/mayaprogs/mayapath_script +++ b/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 $*