Commits

Peter Szilagyi  committed 6ed3976

Integrated ocaml/contrib/ocp-indent into build, install, and elisp.

  • Participants
  • Parent commits 5847326

Comments (0)

Files changed (6)

 
 .deps
 
+bin/ocp-indent
 elisp/contrib/auctex/Makefile
 elisp/contrib/auctex/auctex.el
 elisp/contrib/auctex/auto-loads.el
 elisp/contrib/tex-site.el
 elisp/omake/scratch.el
 ocaml/contrib/ocaml_inotify/inotify_test
+ocaml/contrib/ocp-indent/Makefile.config
+ocaml/contrib/ocp-indent/config.log
+ocaml/contrib/ocp-indent/config.status
+ocaml/contrib/ocp-indent/src/globals.ml
 ocaml/omake/OMakefile
 ocp-indent/ocp.ml
 ocp-indent/tuareg.ml
-Subdirs ()
+Subdirs()

File bin/install.sh

 
 #(cd "$dot/".. && omake)
 test -x "$dot/"../ocaml/omake/omake_server.exe
+test -x "$dot/"ocp-indent
 
 ln -sf $(cd "$dot/".. && pwd) "$jane_elisp"
 for office in $offices

File elisp/jane/jane-common.el

   (add-to-list 'load-path (expand-file-name dir jane-home)))
 
 (require 'ocp-indent)
+;; Ocp.indent-program defaults to ../../ocp-indent/ocp-indent-stdin,
+;; which runs ocp-indent from $PATH.  If the user or site doesn't have
+;; their own ocp-indent, find the one included with jane-elisp.
+(let ((bin (expand-file-name "../../bin" jane-jane-lisp)))
+  (add-to-list 'exec-path bin 'append)
+  ;; The more important part: exec-path is not used for $PATH:
+  (setenv "PATH" (concat (getenv "PATH") ":" bin)))
 
 (require 'jane-deprecated)
 (require 'jane-micro-features)

File ocaml/OMakefile

-
-.SUBDIRS : omake
-# Subdirs()
+Subdirs()

File ocaml/contrib/OMakefile

-Subdirs()
+#Subdirs()
+
+../../bin/ocp-indent:
+	cd ocp-indent && \
+	./configure --prefix=$(shell cd ../.. && pwd) && \
+	make && \
+	make install && \
+	make clean
+
+.DEFAULT: ../../bin/ocp-indent