Skip to content

Commit

Permalink
flambda-backend: Revert whitespace changes in dune files, to match up…
Browse files Browse the repository at this point in the history 
…stream
  • Loading branch information
@mshinwell
mshinwell committed Nov 1, 2022
1 parent c86bf6e commit 6d758cd
Show file tree
Hide file tree
Showing 3 changed files with 148 additions and 145 deletions.
153 changes: 75 additions & 78 deletions runtime/caml/dune
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,90 +14,87 @@

(rule
(targets jumptbl.h)
(mode fallback)
(deps
(:h instruct.h))
(mode fallback)
(deps (:h instruct.h))
(action
(with-stdout-to
%{targets}
(bash
"cat %{h} | tr -d '\\r' | sed -n -e '/^ /s/ \\([A-Z]\\)/ \\&\\&lbl_\\1/gp' -e '/^}/q'"))))
(with-stdout-to %{targets}
(bash "cat %{h} | tr -d '\\r' | \
sed -n -e '/^ /s/ \\([A-Z]\\)/ \\&\\&lbl_\\1/gp' -e '/^}/q'"))))

(rule
(targets opnames.h)
(deps instruct.h ../sak)
(action
(run make -s -C .. COMPUTE_DEPS=false caml/opnames.h)))
(targets opnames.h)
(deps instruct.h ../sak)
(action (run make -s -C .. COMPUTE_DEPS=false caml/opnames.h)))

(rule
(targets version.h)
(mode fallback)
(mode fallback)
(action
(with-stdout-to
%{targets}
(run %{dep:../../tools/make-version-header.sh} %{dep:../../VERSION}))))
(with-stdout-to %{targets}
(run %{dep:../../tools/make-version-header.sh} %{dep:../../VERSION}))))

(install
(files
(domain_state.tbl as caml/domain_state.tbl)
(address_class.h as caml/address_class.h)
(alloc.h as caml/alloc.h)
(backtrace.h as caml/backtrace.h)
(backtrace_prim.h as caml/backtrace_prim.h)
(bigarray.h as caml/bigarray.h)
(callback.h as caml/callback.h)
(codefrag.h as caml/codefrag.h)
(compact.h as caml/compact.h)
(compare.h as caml/compare.h)
(compatibility.h as caml/compatibility.h)
(config.h as caml/config.h)
(custom.h as caml/custom.h)
(debugger.h as caml/debugger.h)
(domain.h as caml/domain.h)
(domain_state.h as caml/domain_state.h)
(dynlink.h as caml/dynlink.h)
(eventlog.h as caml/eventlog.h)
(exec.h as caml/exec.h)
(fail.h as caml/fail.h)
(finalise.h as caml/finalise.h)
(fix_code.h as caml/fix_code.h)
(freelist.h as caml/freelist.h)
(gc.h as caml/gc.h)
(gc_ctrl.h as caml/gc_ctrl.h)
(globroots.h as caml/globroots.h)
(hash.h as caml/hash.h)
(hooks.h as caml/hooks.h)
(instrtrace.h as caml/instrtrace.h)
(instruct.h as caml/instruct.h)
(interp.h as caml/interp.h)
(intext.h as caml/intext.h)
(io.h as caml/io.h)
(jumptbl.h as caml/jumptbl.h)
(m.h as caml/m.h)
(major_gc.h as caml/major_gc.h)
(md5.h as caml/md5.h)
(memory.h as caml/memory.h)
(memprof.h as caml/memprof.h)
(minor_gc.h as caml/minor_gc.h)
(misc.h as caml/misc.h)
(mlvalues.h as caml/mlvalues.h)
(opnames.h as caml/opnames.h)
(osdeps.h as caml/osdeps.h)
(prims.h as caml/prims.h)
(printexc.h as caml/printexc.h)
(reverse.h as caml/reverse.h)
(roots.h as caml/roots.h)
(s.h as caml/s.h)
(signals.h as caml/signals.h)
(skiplist.h as caml/skiplist.h)
(signals_machdep.h as caml/signals_machdep.h)
(stack.h as caml/stack.h)
(stacks.h as caml/stacks.h)
(startup.h as caml/startup.h)
(startup_aux.h as caml/startup_aux.h)
(sys.h as caml/sys.h)
(ui.h as caml/ui.h)
(version.h as caml/version.h)
(weak.h as caml/weak.h))
(section lib)
(package ocaml_runtime_stdlib))
(files
(domain_state.tbl as caml/domain_state.tbl)
(address_class.h as caml/address_class.h)
(alloc.h as caml/alloc.h)
(backtrace.h as caml/backtrace.h)
(backtrace_prim.h as caml/backtrace_prim.h)
(bigarray.h as caml/bigarray.h)
(callback.h as caml/callback.h)
(codefrag.h as caml/codefrag.h)
(compact.h as caml/compact.h)
(compare.h as caml/compare.h)
(compatibility.h as caml/compatibility.h)
(config.h as caml/config.h)
(custom.h as caml/custom.h)
(debugger.h as caml/debugger.h)
(domain.h as caml/domain.h)
(domain_state.h as caml/domain_state.h)
(dynlink.h as caml/dynlink.h)
(eventlog.h as caml/eventlog.h)
(exec.h as caml/exec.h)
(fail.h as caml/fail.h)
(finalise.h as caml/finalise.h)
(fix_code.h as caml/fix_code.h)
(freelist.h as caml/freelist.h)
(gc.h as caml/gc.h)
(gc_ctrl.h as caml/gc_ctrl.h)
(globroots.h as caml/globroots.h)
(hash.h as caml/hash.h)
(hooks.h as caml/hooks.h)
(instrtrace.h as caml/instrtrace.h)
(instruct.h as caml/instruct.h)
(interp.h as caml/interp.h)
(intext.h as caml/intext.h)
(io.h as caml/io.h)
(jumptbl.h as caml/jumptbl.h)
(m.h as caml/m.h)
(major_gc.h as caml/major_gc.h)
(md5.h as caml/md5.h)
(memory.h as caml/memory.h)
(memprof.h as caml/memprof.h)
(minor_gc.h as caml/minor_gc.h)
(misc.h as caml/misc.h)
(mlvalues.h as caml/mlvalues.h)
(opnames.h as caml/opnames.h)
(osdeps.h as caml/osdeps.h)
(prims.h as caml/prims.h)
(printexc.h as caml/printexc.h)
(reverse.h as caml/reverse.h)
(roots.h as caml/roots.h)
(s.h as caml/s.h)
(signals.h as caml/signals.h)
(skiplist.h as caml/skiplist.h)
(signals_machdep.h as caml/signals_machdep.h)
(stack.h as caml/stack.h)
(stacks.h as caml/stacks.h)
(startup.h as caml/startup.h)
(startup_aux.h as caml/startup_aux.h)
(sys.h as caml/sys.h)
(ui.h as caml/ui.h)
(version.h as caml/version.h)
(weak.h as caml/weak.h)
)
(section lib)
(package ocaml_runtime_stdlib))
88 changes: 47 additions & 41 deletions tools/dune
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,71 +13,77 @@
;**************************************************************************

(executable
(name objinfo)
(modes byte native)
(modules objinfo)
(libraries ocamlcommon ocamlbytecomp ocamloptcomp))
(name objinfo)
(modes byte native)
(modules objinfo)
(libraries ocamlcommon ocamlbytecomp ocamloptcomp))

(executables
(names make_opcodes cvt_emit)
(names make_opcodes cvt_emit)
(modules make_opcodes cvt_emit))

(ocamllex
(modules make_opcodes)
(mode fallback))
(mode fallback))

(ocamllex
(modules cvt_emit)
(mode fallback))
(mode fallback))

(executable
(name ocamldep)
(modes byte native)
(modules ocamldep)
(libraries ocamlcommon ocamlbytecomp))
(name ocamldep)
(modes byte native)
(modules ocamldep)
(libraries ocamlcommon ocamlbytecomp))

(install
(files
(ocamldep.bc as ocamldep.byte)
(ocamldep.exe as ocamldep.opt))
(section bin)
(package ocaml))
(files
(ocamldep.bc as ocamldep.byte)
(ocamldep.exe as ocamldep.opt)
)
(section bin)
(package ocaml))

(executable
(name cmpbyt)
(modes byte)
(modules cmpbyt)
(libraries ocamlcommon ocamlbytecomp))
(name cmpbyt)
(modes byte)
(modules cmpbyt)
(libraries ocamlcommon ocamlbytecomp))

(executable
(name ocamlmklib)
(modes byte native)
(modules ocamlmklib)
(libraries ocamlcommon ocamlbytecomp))
(name ocamlmklib)
(modes byte native)
(modules ocamlmklib)
(libraries ocamlcommon ocamlbytecomp))

(install
(files
(ocamlmklib.bc as ocamlmklib.byte)
(ocamlmklib.exe as ocamlmklib.opt))
(section bin)
(package ocaml))
(files
(ocamlmklib.bc as ocamlmklib.byte)
(ocamlmklib.exe as ocamlmklib.opt)
)
(section bin)
(package ocaml))

(executable
(name ocamlmktop)
(modes byte native)
(modules ocamlmktop)
(libraries ocamlcommon ocamlbytecomp))
(name ocamlmktop)
(modes byte native)
(modules ocamlmktop)
(libraries ocamlcommon ocamlbytecomp))

(install
(files
(ocamlmktop.bc as ocamlmktop.byte)
(ocamlmktop.exe as ocamlmktop.opt))
(section bin)
(package ocaml))
(files
(ocamlmktop.bc as ocamlmktop.byte)
(ocamlmktop.exe as ocamlmktop.opt)
)
(section bin)
(package ocaml))

(install
(files eventlog_metadata)
(section lib)
(package ocaml))
(files
eventlog_metadata
)
(section lib)
(package ocaml))


; ocamlcp, ocamloptp and ocamlprof are not currently supported.
52 changes: 26 additions & 26 deletions toplevel/native/dune
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,31 +12,31 @@
;* *
;**************************************************************************

;(copy_files# ../*.ml*)
;
;(library
; (name ocamltoplevel_native)
; (wrapped false)
; (modes native)
; (flags (:standard -principal))
; (libraries ocamlcommon ocamloptcomp dynlink_internal)
; (modules :standard \ topstart expunge))
;
;(executable
; (name topstart)
; (modes native)
; (flags (:standard -principal))
; (modules topstart)
; (libraries ocamltoplevel_native))
;
;(install
; (files
; (topstart.exe as ocamlnat)
; )
; (section bin)
; (package ocaml))
;
;
; (copy_files# ../*.ml*)
;
; (library
; (name ocamltoplevel_native)
; (wrapped false)
; (modes native)
; (flags (:standard -principal))
; (libraries ocamlcommon ocamloptcomp dynlink_internal)
; (modules :standard \ topstart expunge))
;
; (executable
; (name topstart)
; (modes native)
; (flags (:standard -principal))
; (modules topstart)
; (libraries ocamltoplevel_native))
;
; (install
; (files
; (topstart.exe as ocamlnat)
; )
; (section bin)
; (package ocaml))
;
;
; (install
; (files
; (ocamltoplevel.cma as compiler-libs/ocamltoplevel.cma)
Expand All @@ -63,4 +63,4 @@
; )
; (section lib)
; (package ocaml))
;
;

0 comments on commit 6d758cd

Please sign in to comment.