Commits

Stephen Weeks committed be2883e Merge

auto merge

Comments (0)

Files changed (2)

bin/ocamlspot

-#!/bin/bash
-
-set -e -u -o pipefail
-
-log=/tmp/z.ocamlspot.$(whoami).log
-
-dir=$(pwd)
-args="$@"
-
-function failure-header {
-    echo "ocamlspot failure"
-    echo "date: $(date)"
-    echo "dir: $dir"
-    echo "args: $args"
-
-}
-
-function dashes {
-        cat <<EOF
---------------------------------------------------------------------------------
-EOF
-}
-
-function die {
-    {
-        failure-header
-        echo "$1"
-        dashes
-    } >>$log
-    echo >&2 "$1"
-    exit 1
-}
-
-function cd-to-omakeroot {
-    if ! [ -r OMakeroot ]; then
-        if [ $(pwd) = '/' ]; then
-            die "Could not find OMakeroot."
-        fi
-        cd ..
-        cd-to-omakeroot
-    fi
-}
-
-cd-to-omakeroot
-whitespace='[[:space:]]'
-sed_script="s;^${whitespace}*PATH${whitespace}*=${whitespace}*(/janelibs.*/bin)${whitespace}+.*$;\1;p"
-bin=$(sed <OMakeroot -rn "$sed_script" | tail -1)
-
-if [ -z "$bin" ]; then
-    die "Could not extract janelibs bin dir from $(pwd)/OMakeroot"
-fi
-
-exe=$bin/ocamlspot.opt
-
-if ! [ -e "$exe" ]; then
-    die "$exe does not exist"
-fi
-
-output=$(mktemp)
-echo 'running'
-cd $dir
-if $exe "$@" >$output 2>&1; then
-    status=0
-else
-    status=1
-    {
-        failure-header
-        cat $output
-        dashes
-    } >>$log
-fi
-cat $output
-rm $output
-exit $status
   ;; files and not bytecode-compiled, we explcitly do (load-library "ocamlspot.el").
   (load-library "ocamlspot.el")
   (custom-set-variables
-   '(ocamlspot-command (format "%s/bin/ocamlspot" js-elisp-dir)))
+   ;; This is a wrapper script for ocamlspot that greps the OMakeroot to determine the
+   ;; correct ocamlspot executable to use.
+   '(ocamlspot-command "/mnt/global/base/bin/ocamlspot"))
   ;; 2012-02-27 sweeks: emacs-ocamlspot stopped working for people because emacs was
   ;; passing a full path name to ocamlspot, whereas ocamlspot was expecting a basename.
   ;; The full path is unnecessary because emacs alread cd's to the correct directory.  So,
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.