Permalink
Browse files

Use native compilers ; use echo -e in test/Makefile

  • Loading branch information...
1 parent 5b7529f commit 0153bcc7c10b9079fb152d9781e02b416aa0f464 @tturpin tturpin committed Jul 3, 2011
View
@@ -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 ../tool/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
@@ -15,7 +15,9 @@ have to:
- change the install dir with by giving the configure script a
--prefix option
- manually copy the file emacs/ocamlwizard.el into your ~/.emacs.d/
-- append the contents of emacs/52ocamlwizard.el to your ~/.emacs
+- Append the following to your ~/.emacs:
+ (add-to-list 'load-path "~/.emacs.d/")
+ <contents of emacs/52ocamlwizard.el>
Compilation and installation
View
@@ -1,3 +1,4 @@
+- Library: remove the need for .cmi in /usr/local/lib/ocaml
- Rename: replace in multiple files
- Rename: check that we always lookup in the right environment
- Rename: do more testing
@@ -157,7 +157,7 @@ let main ce =
in
match_exp.Typedtree.exp_env, match_exp.Typedtree.exp_type
| Other -> assert false
- | Error _ -> assert false
+ | Error e -> raise e
in
Format.eprintf "pattern_type = %a\n%!" Printtyp.type_expr pattern_type;
@@ -40,6 +40,7 @@ module Occurrence =
type t = Location.t * (Env.t * occurrence_kind)
module IteratorArgument(Action : sig val found : t -> unit end) = struct
include DefaultIteratorArgument
+ open Path
let found loc env occ = Action.found (loc, (env, occ))
@@ -68,7 +69,7 @@ module Occurrence =
let enter_structure_item i =
match i.str_desc with
- | Tstr_open _ -> found i.str_loc (assert false) `str_open
+ | Tstr_open m -> found m.loc (assert false) `str_open
| _ -> ()
@@ -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)

0 comments on commit 0153bcc

Please sign in to comment.