/[escript]/trunk/run-escript.in
ViewVC logotype

Diff of /trunk/run-escript.in

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 4058 by caltinay, Fri Nov 2 06:47:06 2012 UTC revision 4078 by jfenwick, Fri Nov 16 07:50:49 2012 UTC
# Line 58  else Line 58  else
58  fi  fi
59  ##### End finding ESCRIPT_ROOT ########  ##### End finding ESCRIPT_ROOT ########
60    
   
   
61  PYTHON_MPI_NULL="$ESCRIPT_ROOT/lib/pythonMPI"  PYTHON_MPI_NULL="$ESCRIPT_ROOT/lib/pythonMPI"
62  PYTHON_MPI_REDIRECT="$ESCRIPT_ROOT/lib/pythonMPIredirect"  PYTHON_MPI_REDIRECT="$ESCRIPT_ROOT/lib/pythonMPIredirect"
63  PYTHON_CMD=python  PYTHON_CMD=python
# Line 70  PYTHON_CMD=python Line 68  PYTHON_CMD=python
68  EXTRA_DYLD_LIBRARY_PATH=""  EXTRA_DYLD_LIBRARY_PATH=""
69  EXTRA_PATH=$ESCRIPT_ROOT/bin  EXTRA_PATH=$ESCRIPT_ROOT/bin
70  EXTRA_PYTHONPATH=$ESCRIPT_ROOT  EXTRA_PYTHONPATH=$ESCRIPT_ROOT
71  EXTRA_LD_LIBRARY_PATH=$ESCRIPT_ROOT/lib  
72    if [ $STDLOCATION -eq 1 ]
73    then
74        EXTRA_LD_LIBRARY_PATH=/usr/lib/escript
75    else
76        EXTRA_LD_LIBRARY_PATH=$ESCRIPT_ROOT/lib
77    fi
78    
79    
80  if [ $STANDALONE -eq 1 ]  if [ $STANDALONE -eq 1 ]
81  then  then
# Line 83  fi Line 88  fi
88    
89    
90  BUILDINFO_FILE=$ESCRIPT_ROOT/lib/buildvars  BUILDINFO_FILE=$ESCRIPT_ROOT/lib/buildvars
91    if [ "$STDLOCATION" = "1" ]
92    then
93        BUILDINFO_FILE=/usr/lib/escript/buildvars
94    fi
95  if [ ! -r $BUILDINFO_FILE ]; then  if [ ! -r $BUILDINFO_FILE ]; then
96      if [ "$1" = "-e" ]; then      if [ "$1" = "-e" ]; then
97          echo "export LD_LIBRARY_PATH=$EXTRA_LD_LIBRARY_PATH:\$LD_LIBRARY_PATH"          echo "export LD_LIBRARY_PATH=$EXTRA_LD_LIBRARY_PATH:\$LD_LIBRARY_PATH"
# Line 156  do Line 165  do
165          ;;          ;;
166        "f")  ESCRIPT_HOSTFILE=$OPTARG        "f")  ESCRIPT_HOSTFILE=$OPTARG
167          ;;          ;;
168        "c")  cat $ESCRIPT_ROOT/lib/buildvars        "c")  cat $BUILDINFO_FILE
169          exit 0          exit 0
170          ;;          ;;
171        "V")  echo "escript-development(build "`get_buildvar svn_revision`")"        "V")  echo "escript-development(build "`get_buildvar svn_revision`")"

Legend:
Removed from v.4058  
changed lines
  Added in v.4078

  ViewVC Help
Powered by ViewVC 1.1.26