Skip to content

Commit 6d06a88

Browse files
cknittcknitt
authored
Merge pull request #19 from cknitt/feature/esy-refmterr-update
esy 0.2.11; refmterr update
2 parents 88b628b + 40e759e commit 6d06a88

File tree

3 files changed

+44
-41
lines changed

3 files changed

+44
-41
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ os:
55
- linux
66
- osx
77
install:
8-
- npm install --global esy@0.2.10
8+
- npm install --global esy@0.2.11
99
- esy install
1010
script:
1111
- esy build

‎esy.lock.json‎

Lines changed: 42 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"hash": "9350b216342c05f38ce9761259bd3807",
2+
"hash": "04636acc6a72954534ee78aa338f9076",
33
"root": "bs-react-intl-extractor@path:.",
44
"node": {
55
"refmterr@3.1.7": {
@@ -60,7 +60,7 @@
6060
},
6161
"dependencies": [
6262
"@esy-ocaml/substs@0.0.1", "@opam/biniou@opam:1.2.0",
63-
"@opam/cppo@opam:1.6.4", "@opam/easy-format@opam:1.3.1",
63+
"@opam/cppo@opam:1.6.5", "@opam/easy-format@opam:1.3.1",
6464
"@opam/jbuilder@opam:transition"
6565
]
6666
},
@@ -191,11 +191,6 @@
191191
"name": "ocaml-stub",
192192
"content":
193193
"#!/bin/sh\n\nBINDIR=$(dirname \"$(command -v ocamlc)\")\n\"$BINDIR/ocaml\" -I \"$OCAML_TOPLEVEL_PATH\" \"$@\"\n"
194-
},
195-
{
196-
"name": "_esy/build",
197-
"content":
198-
"#!/bin/bash\n\nset -euo pipefail\nset -x\n\n#\n# Shim OCAMLLIB so that we can write topfind there\n#\n\nREAL_OCAMLLIB=\"$1\"\n\nmkdir -p $cur__install/lib/ocaml\ncd $cur__install/lib/ocaml\n\nfor filename in `ls -1 $REAL_OCAMLLIB`; do\n ln -s $REAL_OCAMLLIB/$filename $filename;\ndone\n\n#\n# Build\n#\n\ncd $cur__root\n\nexport OCAMLLIB=\"$cur__install/lib/ocaml\"\n\n./configure \\\n -bindir $cur__install/bin \\\n -sitelib $cur__install/lib \\\n -mandir $cur__install/man \\\n -config $cur__install/lib/findlib.conf \\\n -no-custom \\\n -no-camlp4\n\nmake all\nmake opt\nmake install\n\n(opam-installer --prefix=$cur__install || true)\n"
199194
}
200195
],
201196
"opam": {
@@ -204,19 +199,27 @@
204199
"opam":
205200
"opam-version: \"1.2\"\nname: \"ocamlfind\"\nversion: \"1.8.0\"\nmaintainer: \"Thomas Gazagnaire <thomas@gazagnaire.org>\"\nauthors: \"Gerd Stolpmann <gerd@gerd-stolpmann.de>\"\nhomepage: \"http://projects.camlcity.org/projects/findlib.html\"\nbug-reports: \"https://gitlab.camlcity.org/gerd/lib-findlib/issues\"\ndepends: [\n \"conf-m4\" {build}\n]\navailable: ocaml-version >= \"4.00.0\"\nbuild: [\n [\n \"./configure\"\n \"-bindir\"\n bin\n \"-sitelib\"\n lib\n \"-mandir\"\n man\n \"-config\"\n \"%{lib}%/findlib.conf\"\n \"-no-custom\"\n \"-no-topfind\" {preinstalled}\n ]\n [make \"all\"]\n [make \"opt\"] {ocaml-native}\n]\ninstall: [\n [make \"install\"]\n [\"install\" \"-m\" \"0755\" \"ocaml-stub\" \"%{bin}%/ocaml\"] {preinstalled}\n]\nremove: [\n [\"ocamlfind\" \"remove\" \"bytes\"]\n [\n \"./configure\"\n \"-bindir\"\n bin\n \"-sitelib\"\n lib\n \"-mandir\"\n man\n \"-config\"\n \"%{lib}%/findlib.conf\"\n \"-no-topfind\" {preinstalled}\n ]\n [make \"uninstall\"]\n [\"rm\" \"-f\" \"%{bin}%/ocaml\"] {preinstalled}\n]\ndev-repo: \"git+https://gitlab.camlcity.org/gerd/lib-findlib.git\"",
206201
"override": {
207-
"build": [ [ "bash", "./_esy/build", "#{ocaml.lib / 'ocaml'}" ] ],
202+
"build": [
203+
[
204+
"./configure", "-bindir", "#{self.bin}", "-sitelib",
205+
"#{self.lib}", "-mandir", "#{self.man}", "-config",
206+
"#{self.lib}/findlib.conf", "-no-custom", "-no-topfind"
207+
],
208+
[ "make", "all" ],
209+
[ "make", "opt" ]
210+
],
211+
"install": [
212+
[ "make", "install" ],
213+
[ "install", "-m", "0755", "ocaml-stub", "#{self.bin}/ocaml" ],
214+
[ "mkdir", "-p", "#{self.toplevel}" ],
215+
[
216+
"install", "-m", "0644", "src/findlib/topfind",
217+
"#{self.toplevel}/topfind"
218+
]
219+
],
208220
"exportedEnv": {
209-
"OCAMLLIB": {
210-
"val": "#{@opam/ocamlfind.install / 'lib' / 'ocaml'}",
211-
"scope": "global"
212-
},
213-
"CAML_LD_LIBRARY_PATH": {
214-
"val":
215-
"#{@opam/ocamlfind.install / 'lib' / 'ocaml' / 'stublibs' : @opam/ocamlfind.install / 'lib' / 'ocaml' : $CAML_LD_LIBRARY_PATH}",
216-
"scope": "global"
217-
},
218221
"OCAML_TOPLEVEL_PATH": {
219-
"val": "#{@opam/ocamlfind.install / 'lib' / 'ocaml'}",
222+
"val": "#{self.toplevel}",
220223
"scope": "global"
221224
}
222225
}
@@ -230,7 +233,7 @@
230233
"name": "@opam/ocamlbuild",
231234
"version": "opam:0.12.0",
232235
"source": [
233-
"archive:https://opam.ocaml.org/archives/ocamlbuild.0.12.0+opam.tar.gz#md5:6e877d7f40c119c0c6c03f04342f2264",
236+
"archive:https://opam.ocaml.org/archives/ocamlbuild.0.12.0+opam.tar.gz#md5:43f12b7f9a57d8e967a652bfb6a9dd65",
234237
"archive:https://github.com/ocaml/ocamlbuild/archive/0.12.0.tar.gz#md5:442baa19470bd49150f153122e22907b"
235238
],
236239
"files": [
@@ -244,7 +247,7 @@
244247
"name": "ocamlbuild",
245248
"version": "0.12.0",
246249
"opam":
247-
"opam-version: \"1.2\"\nname: \"ocamlbuild\"\nversion: \"0.12.0\"\nmaintainer: \"Gabriel Scherer <gabriel.scherer@gmail.com>\"\nauthors: [\"Nicolas Pouillard\" \"Berke Durak\"]\nlicense: \"LGPL-2 with OCaml linking exception\"\nhomepage: \"https://github.com/ocaml/ocamlbuild/\"\ndoc: \"https://github.com/ocaml/ocamlbuild/blob/master/manual/manual.adoc\"\nbug-reports: \"https://github.com/ocaml/ocamlbuild/issues\"\nconflicts: [\n \"base-ocamlbuild\"\n \"ocamlfind\" {< \"1.6.2\"}\n]\navailable: ocaml-version >= \"4.03\"\nbuild: [\n [\n make\n \"-f\"\n \"configure.make\"\n \"all\"\n \"OCAMLBUILD_PREFIX=%{prefix}%\"\n \"OCAMLBUILD_BINDIR=%{bin}%\"\n \"OCAMLBUILD_LIBDIR=%{lib}%\"\n \"OCAMLBUILD_MANDIR=%{man}%\"\n \"OCAML_NATIVE=%{ocaml-native}%\"\n \"OCAML_NATIVE_TOOLS=%{ocaml-native}%\"\n ]\n [make \"check-if-preinstalled\" \"all\" \"opam-install\"]\n]\ndev-repo: \"git+https://github.com/ocaml/ocamlbuild.git\"",
250+
"opam-version: \"1.2\"\nname: \"ocamlbuild\"\nversion: \"0.12.0\"\nmaintainer: \"Gabriel Scherer <gabriel.scherer@gmail.com>\"\nauthors: [\"Nicolas Pouillard\" \"Berke Durak\"]\nlicense: \"LGPL-2 with OCaml linking exception\"\nhomepage: \"https://github.com/ocaml/ocamlbuild/\"\ndoc: \"https://github.com/ocaml/ocamlbuild/blob/master/manual/manual.adoc\"\nbug-reports: \"https://github.com/ocaml/ocamlbuild/issues\"\nconflicts: [\n \"base-ocamlbuild\"\n \"ocamlfind\" {< \"1.6.2\"}\n]\navailable: ocaml-version >= \"4.03\" & ocaml-version < \"4.08.0\"\nbuild: [\n [\n make\n \"-f\"\n \"configure.make\"\n \"all\"\n \"OCAMLBUILD_PREFIX=%{prefix}%\"\n \"OCAMLBUILD_BINDIR=%{bin}%\"\n \"OCAMLBUILD_LIBDIR=%{lib}%\"\n \"OCAMLBUILD_MANDIR=%{man}%\"\n \"OCAML_NATIVE=%{ocaml-native}%\"\n \"OCAML_NATIVE_TOOLS=%{ocaml-native}%\"\n ]\n [make \"check-if-preinstalled\" \"all\" \"opam-install\"]\n]\ndev-repo: \"git+https://github.com/ocaml/ocamlbuild.git\"",
248251
"override": {
249252
"build": [
250253
[
@@ -323,35 +326,35 @@
323326
}
324327
},
325328
"dependencies": [
326-
"@esy-ocaml/substs@0.0.1", "@opam/cppo@opam:1.6.4",
329+
"@esy-ocaml/substs@0.0.1", "@opam/cppo@opam:1.6.5",
327330
"@opam/ocamlfind@opam:1.8.0"
328331
]
329332
},
330-
"@opam/menhir@opam:20170712": {
333+
"@opam/menhir@opam:20171013": {
331334
"record": {
332335
"name": "@opam/menhir",
333-
"version": "opam:20170712",
336+
"version": "opam:20171013",
334337
"source": [
335-
"archive:https://opam.ocaml.org/archives/menhir.20170712+opam.tar.gz#md5:18aaf814e51aeb4fbfd8b7c1fb7ffbba",
336-
"archive:http://gallium.inria.fr/~fpottier/menhir/menhir-20170712.tar.gz#md5:85a5c2aef1d3f2224dab7c53d79892e5"
338+
"archive:https://opam.ocaml.org/archives/menhir.20171013+opam.tar.gz#md5:b361a87378407e26b9ea2dde7ddf41a0",
339+
"archive:http://gallium.inria.fr/~fpottier/menhir/menhir-20171013.tar.gz#md5:620863edea40437390ee5e5bd82fba11"
337340
],
338341
"files": [
339342
{
340-
"name": "_esy/menhir-20170712.patch",
343+
"name": "_esy/menhir-20171013.patch",
341344
"content":
342-
"--- ./Makefile\n+++ ./Makefile\n@@ -60,10 +60,11 @@\n # If the compiler is MSVC, then the name of the executable file ends in .exe,\n # and object file names end in .obj instead of .o.\n \n-ifneq (,$(shell ocamlc -config | grep -E \"ccomp_type: msvc\"))\n+OS_TYPE:=$(shell ocamlc -config | tr -d '\\15' | awk '/^os_type:/ {print $$2}')\n+ifeq ($(OS_TYPE),$(filter $(OS_TYPE),Win32 Cygwin))\n MENHIREXE := menhir.exe\n- OBJ := obj\n-# LIBSUFFIX := lib\n+ OBJ := $(shell ocamlc -config | tr -d '\\15' | awk '/^ext_obj:/ {print $$2}' | tr -d '.')\n+# LIBSUFFIX := $(shell ocamlc -config | tr -d '\\15' | awk '/^ext_lib:/ {print $$2}' | tr -d '.')\n else\n MENHIREXE := menhir\n OBJ := o\n@@ -85,8 +86,8 @@\n # performed if \"os_type\" is \"Win32\" or \"Win64\", and must not be performed if\n # \"os_type\" is \"Cygwin\" or \"Unix\".\n \n-ifneq (,$(shell ocamlc -config | grep -E \"os_type: (Win32|Win64)\"))\n-installation_libdir := $(shell cygpath -m $(libdir))\n+ifeq ($(OS_TYPE),Win32)\n+installation_libdir := $(shell cygpath -m $(libdir) || echo $(libdir))\n else\n installation_libdir := $(libdir)\n endif\n--- ./src/cmly_write.ml\n+++ ./src/cmly_write.ml\n@@ -168,6 +168,6 @@\n output_value oc (t : grammar)\n \n let write filename =\n- let oc = open_out filename in\n+ let oc = open_out_bin filename in\n write oc (encode());\n close_out oc\n"
345+
"--- ./Makefile\n+++ ./Makefile\n@@ -59,13 +59,8 @@\n \n # If the compiler is MSVC, then object file names end in .obj instead of .o.\n \n-ifneq (,$(shell ocamlc -config | grep -E \"ccomp_type: msvc\"))\n- OBJ := obj\n-# LIBSUFFIX := lib\n-else\n- OBJ := o\n-# LIBSUFFIX := a\n-endif\n+OBJ := $(shell ocamlc -config | awk -F '[\\t \\r]+' '/^ext_obj:/ {print $$2}' | tr -d '.')\n+#LIBSUFFIX := $(shell ocamlc -config | awk -F '[\\t \\r]+' '/^ext_lib:/ {print $$2}' | tr -d '.')\n \n # If we are under Windows (regardless of whether we are using MSVC or mingw)\n # then the name of the executable file ends in .exe.\n@@ -91,8 +86,9 @@\n # performed if \"os_type\" is \"Win32\" or \"Win64\", and must not be performed if\n # \"os_type\" is \"Cygwin\" or \"Unix\".\n \n-ifneq (,$(shell ocamlc -config | grep -E \"os_type: (Win32|Win64)\"))\n-installation_libdir := $(shell cygpath -m $(libdir))\n+OS_TYPE:=\t$(shell ocamlc -config | awk -F '[\\t \\r]+' '/^os_type:/ {print $$2}')\n+ifeq ($(OS_TYPE),Win32)\n+installation_libdir := $(shell cygpath -m $(libdir) || echo $(libdir))\n else\n installation_libdir := $(libdir)\n endif\n--- ./src/cmly_write.ml\n+++ ./src/cmly_write.ml\n@@ -168,6 +168,6 @@\n output_value oc (t : grammar)\n \n let write filename =\n- let oc = open_out filename in\n+ let oc = open_out_bin filename in\n write oc (encode());\n close_out oc\n"
343346
}
344347
],
345348
"opam": {
346349
"name": "menhir",
347-
"version": "20170712",
350+
"version": "20171013",
348351
"opam":
349-
"opam-version: \"1.2\"\nname: \"menhir\"\nversion: \"20170712\"\nmaintainer: \"francois.pottier@inria.fr\"\nauthors: [\n \"François Pottier <francois.pottier@inria.fr>\"\n \"Yann Régis-Gianas <yrg@pps.univ-paris-diderot.fr>\"\n]\nhomepage: \"http://gallium.inria.fr/~fpottier/menhir/\"\nbug-reports: \"menhir@inria.fr\"\ndepends: [\n \"ocamlfind\"\n \"ocamlbuild\" {build}\n]\navailable: ocaml-version >= \"4.02\"\nbuild: [\n make\n \"-f\"\n \"Makefile\"\n \"PREFIX=%{prefix}%\"\n \"USE_OCAMLFIND=true\"\n \"docdir=%{doc}%/menhir\"\n \"libdir=%{lib}%/menhir\"\n \"mandir=%{man}%/man1\"\n]\ninstall: [\n make\n \"-f\"\n \"Makefile\"\n \"install\"\n \"PREFIX=%{prefix}%\"\n \"docdir=%{doc}%/menhir\"\n \"libdir=%{lib}%/menhir\"\n \"mandir=%{man}%/man1\"\n]\nremove: [\n make\n \"-f\"\n \"Makefile\"\n \"uninstall\"\n \"PREFIX=%{prefix}%\"\n \"docdir=%{doc}%/menhir\"\n \"libdir=%{lib}%/menhir\"\n \"mandir=%{man}%/man1\"\n]\ndev-repo: \"git+https://gitlab.inria.fr/fpottier/menhir.git\"",
352+
"opam-version: \"1.2\"\nname: \"menhir\"\nversion: \"20171013\"\nmaintainer: \"francois.pottier@inria.fr\"\nauthors: [\n \"François Pottier <francois.pottier@inria.fr>\"\n \"Yann Régis-Gianas <yrg@pps.univ-paris-diderot.fr>\"\n]\nhomepage: \"http://gallium.inria.fr/~fpottier/menhir/\"\nbug-reports: \"menhir@inria.fr\"\ndepends: [\n \"ocamlfind\"\n \"ocamlbuild\" {build}\n]\navailable: ocaml-version >= \"4.02\"\nbuild: [\n make\n \"-f\"\n \"Makefile\"\n \"PREFIX=%{prefix}%\"\n \"USE_OCAMLFIND=true\"\n \"docdir=%{doc}%/menhir\"\n \"libdir=%{lib}%/menhir\"\n \"mandir=%{man}%/man1\"\n]\ninstall: [\n make\n \"-f\"\n \"Makefile\"\n \"install\"\n \"PREFIX=%{prefix}%\"\n \"docdir=%{doc}%/menhir\"\n \"libdir=%{lib}%/menhir\"\n \"mandir=%{man}%/man1\"\n]\nremove: [\n make\n \"-f\"\n \"Makefile\"\n \"uninstall\"\n \"PREFIX=%{prefix}%\"\n \"docdir=%{doc}%/menhir\"\n \"libdir=%{lib}%/menhir\"\n \"mandir=%{man}%/man1\"\n]\ndev-repo: \"git+https://gitlab.inria.fr/fpottier/menhir.git\"",
350353
"override": {
351354
"build": [
352355
[
353356
"bash", "-c",
354-
"#{os == 'windows' ? 'patch -p1 < _esy/menhir-20170712.patch' : 'true'}"
357+
"#{os == 'windows' ? 'patch -p1 < _esy/menhir-20171013.patch' : 'true'}"
355358
],
356359
[
357360
"make", "-f", "Makefile", "PREFIX=#{self.install}",
@@ -454,26 +457,26 @@
454457
},
455458
"dependencies": [ "@esy-ocaml/substs@0.0.1" ]
456459
},
457-
"@opam/cppo@opam:1.6.4": {
460+
"@opam/cppo@opam:1.6.5": {
458461
"record": {
459462
"name": "@opam/cppo",
460-
"version": "opam:1.6.4",
463+
"version": "opam:1.6.5",
461464
"source": [
462-
"archive:https://opam.ocaml.org/archives/cppo.1.6.4+opam.tar.gz#md5:c6651a3677048b442859d085138c2cc2",
463-
"archive:https://github.com/mjambon/cppo/archive/v1.6.4.tar.gz#md5:f7a4a6a0e83b76562b45db3a93ffd204"
465+
"archive:https://opam.ocaml.org/archives/cppo.1.6.5+opam.tar.gz#md5:07b0faeb722c1d625befb89fdc39617f",
466+
"archive:https://github.com/mjambon/cppo/archive/v1.6.5.tar.gz#md5:1cd25741d31417995b0973fe0b6f6c82"
464467
],
465468
"files": [],
466469
"opam": {
467470
"name": "cppo",
468-
"version": "1.6.4",
471+
"version": "1.6.5",
469472
"opam":
470-
"opam-version: \"1.2\"\nname: \"cppo\"\nversion: \"1.6.4\"\nmaintainer: \"martin@mjambon.com\"\nauthors: \"Martin Jambon\"\nlicense: \"BSD-3-Clause\"\nhomepage: \"https://github.com/mjambon/cppo\"\nbug-reports: \"https://github.com/mjambon/cppo/issues\"\ndepends: [\n \"jbuilder\" {build & >= \"1.0+beta17\"}\n \"base-bytes\"\n \"base-unix\"\n]\nbuild: [\n [\"jbuilder\" \"subst\" \"-p\" name] {pinned}\n [\"jbuilder\" \"build\" \"-p\" name \"-j\" jobs]\n]\nrun-test: [\"jbuilder\" \"runtest\" \"-p\" name]\ndev-repo: \"git+https://github.com/mjambon/cppo.git\"",
473+
"opam-version: \"1.2\"\nname: \"cppo\"\nversion: \"1.6.5\"\nmaintainer: \"martin@mjambon.com\"\nauthors: \"Martin Jambon\"\nlicense: \"BSD-3-Clause\"\nhomepage: \"https://github.com/mjambon/cppo\"\nbug-reports: \"https://github.com/mjambon/cppo/issues\"\ndepends: [\n \"jbuilder\" {build & >= \"1.0+beta17\"}\n \"base-unix\"\n]\nbuild: [\n [\"jbuilder\" \"subst\" \"-p\" name] {pinned}\n [\"jbuilder\" \"build\" \"-p\" name \"-j\" jobs]\n]\nrun-test: [\"jbuilder\" \"runtest\" \"-p\" name]\ndev-repo: \"git+https://github.com/mjambon/cppo.git\"",
471474
"override": null
472475
}
473476
},
474477
"dependencies": [
475-
"@esy-ocaml/substs@0.0.1", "@opam/base-bytes@opam:base",
476-
"@opam/base-unix@opam:base", "@opam/jbuilder@opam:transition"
478+
"@esy-ocaml/substs@0.0.1", "@opam/base-unix@opam:base",
479+
"@opam/jbuilder@opam:transition"
477480
]
478481
},
479482
"@opam/conf-which@opam:1": {
@@ -655,7 +658,7 @@
655658
},
656659
"dependencies": [
657660
"@esy-ocaml/esy-installer@0.0.0", "@esy-ocaml/substs@0.0.1",
658-
"@opam/jbuilder@opam:transition", "@opam/menhir@opam:20170712",
661+
"@opam/jbuilder@opam:transition", "@opam/menhir@opam:20171013",
659662
"@opam/merlin-extend@opam:0.3",
660663
"@opam/ocaml-migrate-parsetree@opam:1.0.11",
661664
"@opam/ocamlfind@opam:1.8.0", "@opam/result@opam:1.3"

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"@opam/dune": "^1.1.1",
2323
"@opam/yojson": "^1.4.1",
2424
"ocaml": "~4.6.1",
25-
"refmterr": "^3.0.4"
25+
"refmterr": "^3.1.7"
2626
},
2727
"devDependencies": {
2828
"@esy-ocaml/merlin": "*"

0 commit comments

Comments
 (0)