Commit 80a6870f authored by Timothy Shippert's avatar Timothy Shippert
Browse files

Merge branch 'master' of code.arm.gov:vap/langley

parents bfe7fca3 986fa86c
......@@ -247,4 +247,21 @@ else
exit 1
fi
shopt -s nullglob
for f in *.sh.in
do
outfile=${f%.sh.in}
sed -e "s,@IDL_DIR@,$IDL_DIR,g" \
-e "s,@IDL_PATH@,$IDL_PATH,g" \
-e "s,@IDL_DLM_PATH@,$IDL_DLM_PATH,g" \
-e "s,@IDLnn@,$IDLnn,g" \
-e "s,@SAV_FILE@,$sav_file,g" \
< $f > $bindir/$outfile
chmod 0755 $bindir/$outfile
echo "installed: $bindir/$outfile"
done
cd ..
exit 0
......@@ -653,14 +653,16 @@ void create_quicklooks (void)
* Note that the output from IDL will go to stdout.
*/
// sprintf (command, "%s/bin/idl", getenv ("IDL_DIR"));
sprintf (command, "/apps/base/rsi/idl86/bin/idl");
sprintf (argument, "-rt=%s/bytecode/%s_batch.sav", getenv("VAP_HOME"),
vapname);
//sprintf (command, "/apps/base/rsi/idl86/bin/idl");
//sprintf (argument, "-rt=%s/bytecode/%s_batch.sav", getenv("VAP_HOME"), vapname);
sprintf(command, "%s/bin/%s_batch", getenv("VAP_HOME"), vapname);
/*
* Execute the IDL command. If successful, the exit of the
* exec command will terminate the life of the child process
*/
execl (command, "idl", argument, (char *)0);
printf("\n\nCommand: %s\n", command);
//execl (command, "idl", argument, (char *)0);
execl(command, (char *)0);
/*
* This line should never be reached if exec finishes correctly
* We will later trap for this flag to see if everything went
......
#!/bin/bash
bin=`dirname "$(readlink -f "$0")"`
export ADI_IDL_WRAPPER=$(basename $0)
IDL_DIR="@IDL_DIR@"
if [ "$@IDLnn@_DIR" ]; then
IDL_DIR=$@IDLnn@_DIR
fi
export IDL_DIR
IDL_PATH="@IDL_PATH@"
if [ "$@IDLnn@_PATH" ]; then
IDL_PATH=$@IDLnn@_PATH
fi
export IDL_PATH
IDL_DLM_PATH="@IDL_DLM_PATH@"
if [ "$@IDLnn@_DLM_PATH" ]; then
IDL_DLM_PATH=$@IDLnn@_DLM_PATH
fi
export IDL_DLM_PATH
$IDL_DIR/bin/idl -rt=${bin}/../bytecode/@SAV_FILE@ -args $@
exit $?
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment