Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Copied additions made to the trunk since adding ident locations

  • Loading branch information...
commit 55eaf2a13cf4f8a8d9d534f93ce3bca67ef3b097 1 parent 4359d0d
@tturpin tturpin authored
View
15 ocamlwizard/Makefile.in
@@ -42,12 +42,11 @@ SITE_START_DIR=/etc/emacs/site-start.d
# OCAMLWIN32 = @OCAMLWIN32@
# EXE = @EXE@
-OCAMLC = ../boot/ocamlrun ../ocamlc
-OCAMLOPT = ../boot/ocamlrun ../ocamlopt
-OCAMLDEP = ../boot/ocamlrun ../ocamldep
-OCAMLLEX = ../boot/ocamlrun ../boot/ocamllex
+OCAMLC = ../ocamlc.opt
+OCAMLOPT = ../ocamlopt.opt
+OCAMLDEP = ../tools/ocamldep.opt
+OCAMLLEX = ../lex/ocamllex.opt
OCAMLYACC = ../boot/ocamlyacc
-OCAMLDEP = ../boot/ocamlrun ../tools/ocamldep
OCAMLBEST = opt
PATH_OWZ = ./
@@ -528,8 +527,10 @@ install: $(BIN).$(OCAMLBEST)
install emacs/ocamlwizard.el $(SITE_LISP)
install emacs/52ocamlwizard.el $(SITE_START_DIR)
-# mkdir -p $(LIBDIR)
-# cp -f standard_library/*.owz $(LIBDIR)
+# If they don't exist, they're probably not in the search path
+# install -d $(SITE_LISP)
+# install -d $(SITE_START_DIR)
+
# -mkdir ~/.ocamlwizard
# -mkdir ~/.ocamlwizard/standard_library
View
8 ocamlwizard/test/Makefile
@@ -44,7 +44,7 @@ match_cases_res.ml: $(M_TESTS)
%_mres.ml: %.ml %_mcomp.ml
tail -n 1 $< >$@ ; echo "=>" >>$@ ; \
head -c `grep -o -b \\\\$$ $< | cut -d : -f 1` $< | tail -n 1 >>$@ ; \
- cat $(subst .ml,_mcomp.ml, $<) >>$@ ; echo EOF\\n >>$@
+ cat $(subst .ml,_mcomp.ml, $<) >>$@ ; echo -e EOF\\n >>$@
%_mcomp.ml: %.ml %_no_dollar.ml $(OWZ)
$(OCAMLWIZARD) completion $(subst .ml,_no_dollar.ml, $<) \
@@ -67,7 +67,7 @@ expansion_res.ml: $(PE_TESTS)
%_peres.ml: %.ml %_pecomp.ml
tail -n 1 $< >$@ ; echo "=>" >>$@ ; \
head -c `grep -o -b \\\\$$ $< | cut -d : -f 1` $< | tail -n 1 >>$@ ; \
- cat $(subst .ml,_pecomp.ml, $<) >>$@ ; echo EOF\\n >>$@
+ cat $(subst .ml,_pecomp.ml, $<) >>$@ ; echo -e EOF\\n >>$@
# We use tail to perform +1 and +2 :-(
%_pecomp.ml: %.ml %_no_dollar.ml $(OWZ)
@@ -93,7 +93,7 @@ path_res.ml: $(PC_TESTS)
%_pcres.ml: %.ml %_pccomp.ml
tail -n 1 $< >$@ ; echo "=>" >>$@ ; \
head -c `grep -o -b \\\\$$ $< | cut -d : -f 1` $< | tail -n 1 >>$@ ; \
- cat $(subst .ml,_pccomp.ml, $<) >>$@ ; echo EOF\\n >>$@
+ cat $(subst .ml,_pccomp.ml, $<) >>$@ ; echo -e EOF\\n >>$@
# We use tail to perform +1 and +2 :-(
%_pccomp.ml: %.ml %_no_dollar.ml $(OWZ)
@@ -107,7 +107,7 @@ path_res.ml: $(PC_TESTS)
errors_res.ml: errors.ml errors_comp.ml
cat $< >$@ ; echo "=>" >>$@ ; \
head -c `grep -o -b \\\\$$ $< | cut -d : -f 1` $< | tail -n 1 >>$@ ; \
- cat $(subst .ml,_comp.ml, $<) >>$@ ; echo EOF\\n >>$@
+ cat $(subst .ml,_comp.ml, $<) >>$@ ; echo -e EOF\\n >>$@
# We use tail to perform +1 and +2 :-(
errors_comp.ml: errors.ml errors_no_dollar.ml $(OWZ)
View
7 ocamlwizard/test/renameMultiple.ml
@@ -0,0 +1,7 @@
+module M : sig
+
+ val x : unit
+
+end = struct
+ let $x€ = ()
+end
Please sign in to comment.
Something went wrong with that request. Please try again.