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

Try a new layout for compiler flags for OCaml 4.12.0 (and add 4.12.0~alpha1) #17541

Merged
merged 22 commits into from
Nov 16, 2020
Merged

Try a new layout for compiler flags for OCaml 4.12.0 (and add 4.12.0~alpha1) #17541

merged 22 commits into from
Nov 16, 2020

Commits on Oct 30, 2020

  1. Try a new layout for compiler flags for OCaml 4.12.0 

    Instead of many variants, the compiler is now `ocaml-variants.4.12.0~alpha1`,
and the variants are selected using the different `ocaml-options-*` packages.

Use `ocaml-options-vanilla` if you want to ensure no special options will be
selected, even if some packages depend on them.
    @AltGr
    AltGr committed Oct 30, 2020
    Configuration menu
    Copy the full SHA
    ae22a4a View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2020

  1. ocaml-options packages: add maintainer field

    @AltGr
    AltGr committed Nov 2, 2020
    Configuration menu
    Copy the full SHA
    2e200d4 View commit details
    Browse the repository at this point in the history

  2. Rename 'ocaml-options-*-only' to 'ocaml-options-only-*'

    @AltGr
    AltGr committed Nov 2, 2020
    Configuration menu
    Copy the full SHA
    8a54959 View commit details
    Browse the repository at this point in the history

  3. ocaml-variants: limit restriction to 'ocaml-beta' for opam 2.0 

    opam 2.1 can handle the new 'hidden-version' flag that can more nicely replace
this artificial dependency.
    @AltGr
    AltGr committed Nov 2, 2020
    Configuration menu
    Copy the full SHA
    e215c2e View commit details
    Browse the repository at this point in the history

  4. ocaml-variants trunk: skip config cache install

    @AltGr
    AltGr committed Nov 2, 2020
    Configuration menu
    Copy the full SHA
    8f9d082 View commit details
    Browse the repository at this point in the history

  5. Re-add 'ocaml-base-compiler' as the choices for 'ocaml' 

    The package doesn't exist yet though... alpha/betas used to be under `variants`,
do we want to change that ?
    @AltGr
    AltGr committed Nov 2, 2020
    Configuration menu
    Copy the full SHA
    534193e View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2020

  1. Rename 'ocaml-variants.4.12.0' to '+options' to avoid confusion with … 

    …base-compiler

esp. for opam 2.0 and for the 'opam switch create NAME VERSION' shortcut
    @AltGr
    AltGr committed Nov 3, 2020
    Configuration menu
    Copy the full SHA
    735a22a View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2020

  1. Fix 4.12.0~alpha1 synopsis

    @AltGr
    AltGr committed Nov 5, 2020
    Configuration menu
    Copy the full SHA
    1b05d09 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2020

  1. Fix stray 'ocaml-compiler'

    @AltGr
    AltGr committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    df40a66 View commit details
    Browse the repository at this point in the history

  2. Add the 'compiler' flag to ocaml-options packages 

    Not strictly needed, but that avoids a warning on opam 2.0; they will show up in 'opam switch list-available' though
    @AltGr
    AltGr committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    82dfe31 View commit details
    Browse the repository at this point in the history

  3. Update ocaml-config

    @dra27 @AltGr
    dra27 authored and AltGr committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    e69ffd5 View commit details
    Browse the repository at this point in the history

  4. Add ocaml-base-compiler.4.12.0~alpha1

    @dra27 @AltGr
    dra27 authored and AltGr committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    08a6a25 View commit details
    Browse the repository at this point in the history

  5. Fix ocaml-options-vanilla 

    Removing the conflict is OK because the 3 depend options are mutually exclusive
    @AltGr
    AltGr committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    fcd7a0d View commit details
    Browse the repository at this point in the history

  6. Remove custom ocaml ./configure for freebsd 

    (again)
    @AltGr
    AltGr committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    86d7a2e View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2020

  1. ocaml-config.2: handle backward-compat of the 'ocaml:compiler' variab… 

    …le with options
    @AltGr
    AltGr committed Nov 12, 2020
    Configuration menu
    Copy the full SHA
    1c10232 View commit details
    Browse the repository at this point in the history

  2. Spacetime is no longer available on 4.12

    @AltGr
    AltGr committed Nov 12, 2020
    Configuration menu
    Copy the full SHA
    b599bec View commit details
    Browse the repository at this point in the history

  3. Rename 'ocaml-options-*' to 'ocaml-option-*'

    @AltGr
    AltGr committed Nov 12, 2020
    Configuration menu
    Copy the full SHA
    9453110 View commit details
    Browse the repository at this point in the history

  4. Add more 'ocaml-options-only' packages 

    To match previously existing variants
    @AltGr
    AltGr committed Nov 12, 2020
    Configuration menu
    Copy the full SHA
    b917702 View commit details
    Browse the repository at this point in the history

  5. Add ocaml-options-only-fp

    @AltGr
    AltGr committed Nov 12, 2020
    Configuration menu
    Copy the full SHA
    8f59243 View commit details
    Browse the repository at this point in the history

  6. Apply suggestions from code review 

    Co-authored-by: David Allsopp <david.allsopp@metastack.com>
    @AltGr @dra27
    AltGr and dra27 authored Nov 12, 2020
    Configuration menu
    Copy the full SHA
    4e8fc98 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2020

  1. ocaml-config.2: Fix md5

    @kit-ty-kate
    kit-ty-kate committed Nov 16, 2020
    Configuration menu
    Copy the full SHA
    00c540c View commit details
    Browse the repository at this point in the history

  2. Make ocaml-base-compiler pull ocaml-options-vanilla

    @kit-ty-kate
    kit-ty-kate committed Nov 16, 2020
    Configuration menu
    Copy the full SHA
    7cc7d51 View commit details
    Browse the repository at this point in the history