Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(melange): run melc ppx with merlin #6476

Merged
merged 25 commits into from
Nov 30, 2022
Merged

fix(melange): run melc ppx with merlin #6476

merged 25 commits into from
Nov 30, 2022

Commits on Nov 15, 2022

  1. fix(melange): run melc ppx with merlin 

    Signed-off-by: Javier Chavarri <javier.chavarri@gmail.com>
    @jchavarri
    jchavarri committed Nov 15, 2022
    Configuration menu
    Copy the full SHA
    0d971e5 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2022

  1. Merge branch 'main' into melange/fix-melc-ppx 

    * main:
  test(melange): demonstrate error in melange compilation trying to build @ALL (ocaml#6485)
  chore(nix): make it faster to get melange (ocaml#6347)
  refactor: status db style tweaks (ocaml#6478)
  fix: improve error message for status db (ocaml#6479)
  refactor: remove unused [flags] parameter (ocaml#6480)
  refactor(ctypes): remove pesky aliases (ocaml#6482)
  chore: tweak `hacking.rst` following `dune.exe` move to _boot (ocaml#6484)
  feature(coq): automatic detection of native
  chore(coq): bump Coq lang to 0.7
  test: disable formatting for a single dune file (ocaml#6465)
  refactor: clean up module compilation (ocaml#6461)
  doc: add button to copy code blocks in Dune manual (ocaml#6428)
  refactor: deforest a set conversion (ocaml#6473)
  refactor: remove temporary map used for sorting (ocaml#6472)
  fix(melange): handle include_subdirs unqualified (ocaml#6475)
    @jchavarri
    jchavarri committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    c866b7e View commit details
    Browse the repository at this point in the history

  2. pass compiler flags to ppx directive 

    Signed-off-by: Javier Chavarri <javier.chavarri@gmail.com>
    @jchavarri
    jchavarri committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    5de0797 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into melange/fix-melc-ppx

    @jchavarri
    jchavarri authored Nov 16, 2022
    Configuration menu
    Copy the full SHA
    b5c979e View commit details
    Browse the repository at this point in the history

  4. Revert "pass compiler flags to ppx directive" 

    This reverts commit 5de0797.
    @jchavarri
    jchavarri committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    993c0ff View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2022

  1. Merge branch 'main' into melange/fix-melc-ppx

    @jchavarri
    jchavarri authored Nov 23, 2022
    Configuration menu
    Copy the full SHA
    4fd850e View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2022

  1. Merge branch 'main' into melange/fix-melc-ppx 

    * main:
  test: formatting of alternative dune files (ocaml#6567)
  refactor: remove Modules.is_empty (ocaml#6564)
  refactor: module kinds (ocaml#6562)
  refactor(coq): resolve lack of coqc properly
  Cache file contents in action builder by name. (ocaml#6555)
  fix: re-enable dune on older macos sdk's (ocaml#6515)
  fix: do not hide lib interface module (ocaml#6549)
  test: remove pkg-config output for reproducibility (ocaml#6543)
  melange: add test for ocaml flags (ocaml#6548)
  fix: improve virtual library error messages
  test: virtual library and impl locations
  test: alias module regression (ocaml#6544)
  refactor(merlin): dump config sub command (ocaml#6547)
    @jchavarri
    jchavarri committed Nov 24, 2022
    Configuration menu
    Copy the full SHA
    7abc35c View commit details
    Browse the repository at this point in the history

  2. use dune ocaml merlin dump-config /home/me/code/dune 

    Signed-off-by: Javier Chavarri <javier.chavarri@gmail.com>
    @jchavarri
    jchavarri committed Nov 24, 2022
    Configuration menu
    Copy the full SHA
    4acd9e1 View commit details
    Browse the repository at this point in the history

  3. remove flags from dune file 

    Signed-off-by: Javier Chavarri <javier.chavarri@gmail.com>
    @jchavarri
    jchavarri committed Nov 24, 2022
    Configuration menu
    Copy the full SHA
    858dac6 View commit details
    Browse the repository at this point in the history

  4. fix dump-dot-merlin 

    Signed-off-by: Javier Chavarri <javier.chavarri@gmail.com>
    @jchavarri
    jchavarri committed Nov 24, 2022
    Configuration menu
    Copy the full SHA
    c4a6d2b View commit details
    Browse the repository at this point in the history

  5. quote melc ppx flag 

    Signed-off-by: Javier Chavarri <javier.chavarri@gmail.com>
    @jchavarri
    jchavarri committed Nov 24, 2022
    Configuration menu
    Copy the full SHA
    5c34973 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2022

  1. fix test 

    Signed-off-by: Javier Chavarri <javier.chavarri@gmail.com>
    @jchavarri
    jchavarri committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    f2b7a96 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into melange/fix-melc-ppx

    @jchavarri
    jchavarri committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    c16eec2 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2022

  1. merlin: print absolute path to melc 

    Signed-off-by: Javier Chavarri <javier.chavarri@gmail.com>
    @jchavarri
    jchavarri committed Nov 29, 2022
    Configuration menu
    Copy the full SHA
    c6e8bd6 View commit details
    Browse the repository at this point in the history

  2. merlin: lift melc_flags to Processed.config 

    Signed-off-by: Javier Chavarri <javier.chavarri@gmail.com>
    @jchavarri
    jchavarri committed Nov 29, 2022
    Configuration menu
    Copy the full SHA
    f698bd6 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into melange/fix-melc-ppx 

    Signed-off-by: Javier Chavarri <javier.chavarri@gmail.com>
    @jchavarri
    jchavarri committed Nov 29, 2022
    Configuration menu
    Copy the full SHA
    9146f1b View commit details
    Browse the repository at this point in the history

  4. merlin: fix after breakage upstream 

    Signed-off-by: Javier Chavarri <javier.chavarri@gmail.com>
    @jchavarri
    jchavarri committed Nov 29, 2022
    Configuration menu
    Copy the full SHA
    e759821 View commit details
    Browse the repository at this point in the history

  5. _ 

    Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
    @rgrinberg
    rgrinberg committed Nov 29, 2022
    Configuration menu
    Copy the full SHA
    97c0115 View commit details
    Browse the repository at this point in the history

  6. merlin: fix tests 

    Signed-off-by: Javier Chavarri <javier.chavarri@gmail.com>
    @jchavarri
    jchavarri committed Nov 29, 2022
    Configuration menu
    Copy the full SHA
    437fabd View commit details
    Browse the repository at this point in the history

  7. merlin: remove opt 

    Signed-off-by: Javier Chavarri <javier.chavarri@gmail.com>
    @jchavarri
    jchavarri committed Nov 29, 2022
    Configuration menu
    Copy the full SHA
    dfff493 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2022

  1. merlin: don't add melange flags to ocaml builds 

    Signed-off-by: Javier Chavarri <javier.chavarri@gmail.com>
    @jchavarri
    jchavarri committed Nov 30, 2022
    Configuration menu
    Copy the full SHA
    dadc896 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into melange/fix-melc-ppx 

    Signed-off-by: Javier Chavarri <javier.chavarri@gmail.com>
    @jchavarri
    jchavarri committed Nov 30, 2022
    Configuration menu
    Copy the full SHA
    9bc6c7d View commit details
    Browse the repository at this point in the history

  3. merlin: pass all flags at once 

    Signed-off-by: Javier Chavarri <javier.chavarri@gmail.com>
    @jchavarri
    jchavarri committed Nov 30, 2022
    Configuration menu
    Copy the full SHA
    8bacbb7 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into melange/fix-melc-ppx 

    Signed-off-by: Javier Chavarri <javier.chavarri@gmail.com>
    @jchavarri
    jchavarri committed Nov 30, 2022
    Configuration menu
    Copy the full SHA
    2d27c73 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into melange/fix-melc-ppx

    @rgrinberg
    rgrinberg authored Nov 30, 2022
    Configuration menu
    Copy the full SHA
    8ac63ba View commit details
    Browse the repository at this point in the history