Skip to content

Commit

Permalink
Dependency: Add vendored node binary (onivim#52)
Browse files Browse the repository at this point in the history 
* Add vendored node

* Hardcode path; add test

* Simple JS execution test

* Expand setup to include other binaries like node

* Formatting

* Remove unused open

* Update lockfile; add OSX vendored node

* Get tests green on OSX

* Add linux node

* Add linux node
  • Loading branch information
@bryphe
bryphe authored Feb 16, 2019
1 parent 66a0e71 commit 7192332
Show file tree
Hide file tree
Showing 27 changed files with 1,849 additions and 83 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,4 @@ esy.lock/

.DS_Store
setup.txt
setup.json
1,307 changes: 1,307 additions & 0 deletions ThirdPartyLicenses.txt
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/configuration/dune
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(install
(section bin)
(package Oni2)
(files setup.txt))
(files setup.json))
179 changes: 167 additions & 12 deletions esy.lock/index.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"checksum": "062f9b4bef90a3164ee66ebb998bdcd8",
"checksum": "377e076f15f0e9339e5f05586399cdf6",
"root": "Oni2@link-dev:./package.json",
"node": {
"revery@github:revery-ui/revery#ccac6fc@d41d8cd9": {
Expand Down Expand Up @@ -282,6 +282,9 @@
"revery@github:revery-ui/revery#ccac6fc@d41d8cd9",
"[email protected]@d41d8cd9", "[email protected]@d41d8cd9",
"@reason-native/[email protected]@d41d8cd9", "@opam/zed@opam:1.6@004ea65e",
"@opam/yojson@opam:1.5.0@890db858",
"@opam/ppx_deriving_yojson@opam:3.3@80aab5d8",
"@opam/ppx_deriving@opam:4.2.1@7927b93a",
"@opam/ocamlbuild@opam:0.12.0@6c616094",
"@opam/msgpck@opam:1.4@eb408207", "@opam/lwt@opam:4.1.0@111fc2bf",
"@opam/dune@opam:1.7.1@6f40bfee",
Expand Down Expand Up @@ -393,20 +396,20 @@
"@opam/base-bytes@opam:base@19d0c2ff"
]
},
"@opam/yojson@opam:1.6.0@f7ec7c12": {
"id": "@opam/yojson@opam:1.6.0@f7ec7c12",
"@opam/yojson@opam:1.5.0@890db858": {
"id": "@opam/yojson@opam:1.5.0@890db858",
"name": "@opam/yojson",
"version": "opam:1.6.0",
"version": "opam:1.5.0",
"source": {
"type": "install",
"source": [
"archive:https://opam.ocaml.org/cache/md5/8c/8ca16557d3068253cc375452af3bde96#md5:8ca16557d3068253cc375452af3bde96",
"archive:https://github.com/ocaml-community/yojson/releases/download/1.6.0/yojson-1.6.0.tbz#md5:8ca16557d3068253cc375452af3bde96"
"archive:https://opam.ocaml.org/cache/md5/d8/d80de1bacdde292af42f7c78b323da7b#md5:d80de1bacdde292af42f7c78b323da7b",
"archive:https://github.com/ocaml-community/yojson/releases/download/1.5.0/yojson-1.5.0.tbz#md5:d80de1bacdde292af42f7c78b323da7b"
],
"opam": {
"name": "yojson",
"version": "1.6.0",
"path": "esy.lock/opam/yojson.1.6.0"
"version": "1.5.0",
"path": "esy.lock/opam/yojson.1.5.0"
}
},
"overrides": [],
Expand Down Expand Up @@ -565,6 +568,34 @@
"[email protected]@d41d8cd9", "@opam/seq@opam:base@d8d7de1d"
]
},
"@opam/ppxfind@opam:1.2@0443ec6f": {
"id": "@opam/ppxfind@opam:1.2@0443ec6f",
"name": "@opam/ppxfind",
"version": "opam:1.2",
"source": {
"type": "install",
"source": [
"archive:https://opam.ocaml.org/cache/md5/3c/3c6f81800bb816e190a64f9898481f82#md5:3c6f81800bb816e190a64f9898481f82",
"archive:https://github.com/diml/ppxfind/releases/download/1.2/ppxfind-1.2.tbz#md5:3c6f81800bb816e190a64f9898481f82"
],
"opam": {
"name": "ppxfind",
"version": "1.2",
"path": "esy.lock/opam/ppxfind.1.2"
}
},
"overrides": [],
"dependencies": [
"[email protected]@d41d8cd9", "@opam/ocamlfind@opam:1.8.0@96572762",
"@opam/ocaml-migrate-parsetree@opam:1.2.0@5b3aa0d3",
"@opam/jbuilder@opam:transition@58bdfe0a",
"@esy-ocaml/[email protected]@d41d8cd9"
],
"devDependencies": [
"[email protected]@d41d8cd9", "@opam/ocamlfind@opam:1.8.0@96572762",
"@opam/ocaml-migrate-parsetree@opam:1.2.0@5b3aa0d3"
]
},
"@opam/ppx_tools_versioned@opam:5.2.1@95275a75": {
"id": "@opam/ppx_tools_versioned@opam:5.2.1@95275a75",
"name": "@opam/ppx_tools_versioned",
Expand Down Expand Up @@ -593,6 +624,101 @@
"@opam/ocaml-migrate-parsetree@opam:1.2.0@5b3aa0d3"
]
},
"@opam/ppx_tools@opam:5.1+4.06.0@a9357225": {
"id": "@opam/ppx_tools@opam:5.1+4.06.0@a9357225",
"name": "@opam/ppx_tools",
"version": "opam:5.1+4.06.0",
"source": {
"type": "install",
"source": [
"archive:https://opam.ocaml.org/cache/md5/6b/6ba2e9690b1f579ba562b86022d1c308#md5:6ba2e9690b1f579ba562b86022d1c308",
"archive:https://github.com/ocaml-ppx/ppx_tools/archive/5.1+4.06.0.tar.gz#md5:6ba2e9690b1f579ba562b86022d1c308"
],
"opam": {
"name": "ppx_tools",
"version": "5.1+4.06.0",
"path": "esy.lock/opam/ppx_tools.5.1+4.06.0"
}
},
"overrides": [],
"dependencies": [
"[email protected]@d41d8cd9", "@opam/ocamlfind@opam:1.8.0@96572762",
"@esy-ocaml/[email protected]@d41d8cd9"
],
"devDependencies": [
"[email protected]@d41d8cd9", "@opam/ocamlfind@opam:1.8.0@96572762"
]
},
"@opam/ppx_deriving_yojson@opam:3.3@80aab5d8": {
"id": "@opam/ppx_deriving_yojson@opam:3.3@80aab5d8",
"name": "@opam/ppx_deriving_yojson",
"version": "opam:3.3",
"source": {
"type": "install",
"source": [
"archive:https://opam.ocaml.org/cache/sha512/e0/e04ee424d89423ca891e018b3ea6e3f5f1e3714bd1ec1b07187143da1a646e51d068d1c09bc794e25b5b5be00ccb517212f62853ec66c17969a9795ba88fae6a#sha512:e04ee424d89423ca891e018b3ea6e3f5f1e3714bd1ec1b07187143da1a646e51d068d1c09bc794e25b5b5be00ccb517212f62853ec66c17969a9795ba88fae6a",
"archive:https://github.com/ocaml-ppx/ppx_deriving_yojson/archive/v3.3.tar.gz#sha512:e04ee424d89423ca891e018b3ea6e3f5f1e3714bd1ec1b07187143da1a646e51d068d1c09bc794e25b5b5be00ccb517212f62853ec66c17969a9795ba88fae6a"
],
"opam": {
"name": "ppx_deriving_yojson",
"version": "3.3",
"path": "esy.lock/opam/ppx_deriving_yojson.3.3"
}
},
"overrides": [],
"dependencies": [
"[email protected]@d41d8cd9", "@opam/yojson@opam:1.5.0@890db858",
"@opam/result@opam:1.3@bee8bf2e", "@opam/ppxfind@opam:1.2@0443ec6f",
"@opam/ppx_tools@opam:5.1+4.06.0@a9357225",
"@opam/ppx_deriving@opam:4.2.1@7927b93a",
"@opam/dune@opam:1.7.1@6f40bfee", "@opam/cppo@opam:1.6.5@bec3dbd9",
"@esy-ocaml/[email protected]@d41d8cd9"
],
"devDependencies": [
"[email protected]@d41d8cd9", "@opam/yojson@opam:1.5.0@890db858",
"@opam/result@opam:1.3@bee8bf2e",
"@opam/ppx_deriving@opam:4.2.1@7927b93a"
]
},
"@opam/ppx_deriving@opam:4.2.1@7927b93a": {
"id": "@opam/ppx_deriving@opam:4.2.1@7927b93a",
"name": "@opam/ppx_deriving",
"version": "opam:4.2.1",
"source": {
"type": "install",
"source": [
"archive:https://opam.ocaml.org/cache/md5/21/2195fccf2a527c3ff9ec5b4e36e2f0a8#md5:2195fccf2a527c3ff9ec5b4e36e2f0a8",
"archive:https://github.com/ocaml-ppx/ppx_deriving/archive/v4.2.1.tar.gz#md5:2195fccf2a527c3ff9ec5b4e36e2f0a8"
],
"opam": {
"name": "ppx_deriving",
"version": "4.2.1",
"path": "esy.lock/opam/ppx_deriving.4.2.1"
}
},
"overrides": [
{
"opamoverride":
"esy.lock/overrides/opam__s__ppx__deriving_opam__c__4.2.1_opam_override"
}
],
"dependencies": [
"[email protected]@d41d8cd9", "@opam/result@opam:1.3@bee8bf2e",
"@opam/ppx_tools@opam:5.1+4.06.0@a9357225",
"@opam/ppx_derivers@opam:1.0@78655ff8",
"@opam/ocamlfind@opam:1.8.0@96572762",
"@opam/ocamlbuild@opam:0.12.0@6c616094",
"@opam/ocaml-migrate-parsetree@opam:1.2.0@5b3aa0d3",
"@opam/cppo_ocamlbuild@opam:1.6.0@7c1eb503",
"@opam/cppo@opam:1.6.5@bec3dbd9", "@esy-ocaml/[email protected]@d41d8cd9"
],
"devDependencies": [
"[email protected]@d41d8cd9", "@opam/result@opam:1.3@bee8bf2e",
"@opam/ppx_tools@opam:5.1+4.06.0@a9357225",
"@opam/ppx_derivers@opam:1.0@78655ff8",
"@opam/ocaml-migrate-parsetree@opam:1.2.0@5b3aa0d3"
]
},
"@opam/ppx_derivers@opam:1.0@78655ff8": {
"id": "@opam/ppx_derivers@opam:1.0@78655ff8",
"name": "@opam/ppx_derivers",
Expand Down Expand Up @@ -806,12 +932,12 @@
},
"overrides": [],
"dependencies": [
"[email protected]@d41d8cd9", "@opam/yojson@opam:1.6.0@f7ec7c12",
"[email protected]@d41d8cd9", "@opam/yojson@opam:1.5.0@890db858",
"@opam/ocamlfind@opam:1.8.0@96572762",
"@opam/dune@opam:1.7.1@6f40bfee", "@esy-ocaml/[email protected]@d41d8cd9"
],
"devDependencies": [
"[email protected]@d41d8cd9", "@opam/yojson@opam:1.6.0@f7ec7c12",
"[email protected]@d41d8cd9", "@opam/yojson@opam:1.5.0@890db858",
"@opam/ocamlfind@opam:1.8.0@96572762"
]
},
Expand Down Expand Up @@ -1069,14 +1195,14 @@
},
"overrides": [],
"dependencies": [
"[email protected]@d41d8cd9", "@opam/yojson@opam:1.6.0@f7ec7c12",
"[email protected]@d41d8cd9", "@opam/yojson@opam:1.5.0@890db858",
"@opam/ocamlfind@opam:1.8.0@96572762",
"@opam/dune@opam:1.7.1@6f40bfee", "@opam/cppo@opam:1.6.5@bec3dbd9",
"@opam/cmdliner@opam:1.0.2@b29b7491",
"@esy-ocaml/[email protected]@d41d8cd9"
],
"devDependencies": [
"[email protected]@d41d8cd9", "@opam/yojson@opam:1.6.0@f7ec7c12",
"[email protected]@d41d8cd9", "@opam/yojson@opam:1.5.0@890db858",
"@opam/cppo@opam:1.6.5@bec3dbd9",
"@opam/cmdliner@opam:1.0.2@b29b7491"
]
Expand Down Expand Up @@ -1240,6 +1366,35 @@
"@opam/base-threads@opam:base@36803084"
]
},
"@opam/cppo_ocamlbuild@opam:1.6.0@7c1eb503": {
"id": "@opam/cppo_ocamlbuild@opam:1.6.0@7c1eb503",
"name": "@opam/cppo_ocamlbuild",
"version": "opam:1.6.0",
"source": {
"type": "install",
"source": [
"archive:https://opam.ocaml.org/cache/md5/ae/aee411b3546bc5d198c71ae9185cade4#md5:aee411b3546bc5d198c71ae9185cade4",
"archive:https://github.com/mjambon/cppo/archive/v1.6.0.tar.gz#md5:aee411b3546bc5d198c71ae9185cade4"
],
"opam": {
"name": "cppo_ocamlbuild",
"version": "1.6.0",
"path": "esy.lock/opam/cppo_ocamlbuild.1.6.0"
}
},
"overrides": [],
"dependencies": [
"[email protected]@d41d8cd9", "@opam/ocamlfind@opam:1.8.0@96572762",
"@opam/ocamlbuild@opam:0.12.0@6c616094",
"@opam/jbuilder@opam:transition@58bdfe0a",
"@opam/cppo@opam:1.6.5@bec3dbd9", "@esy-ocaml/[email protected]@d41d8cd9"
],
"devDependencies": [
"[email protected]@d41d8cd9", "@opam/ocamlfind@opam:1.8.0@96572762",
"@opam/ocamlbuild@opam:0.12.0@6c616094",
"@opam/cppo@opam:1.6.5@bec3dbd9"
]
},
"@opam/cppo@opam:1.6.5@bec3dbd9": {
"id": "@opam/cppo@opam:1.6.5@bec3dbd9",
"name": "@opam/cppo",
Expand Down
25 changes: 25 additions & 0 deletions esy.lock/opam/cppo_ocamlbuild.1.6.0/opam
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
opam-version: "2.0"
maintainer: "[email protected]"
authors: ["Martin Jambon"]
homepage: "http://mjambon.com/cppo.html"
dev-repo: "git+https://github.com/mjambon/cppo.git"
bug-reports: "https://github.com/mjambon/cppo/issues"
license: "BSD-3-Clause"

build: [
["jbuilder" "subst" "-p" name] {pinned}
["jbuilder" "build" "-p" name "-j" jobs]
]

depends: [
"ocaml"
"jbuilder" {build & >= "1.0+beta10"}
"ocamlbuild"
"ocamlfind"
"cppo" {>= "1.6.0"}
]
synopsis: "ocamlbuild support for cppo, OCaml-friendly source preprocessor"
url {
src: "https://github.com/mjambon/cppo/archive/v1.6.0.tar.gz"
checksum: "md5=aee411b3546bc5d198c71ae9185cade4"
}
48 changes: 48 additions & 0 deletions esy.lock/opam/ppx_deriving.4.2.1/opam
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
opam-version: "2.0"
maintainer: "whitequark <[email protected]>"
authors: [ "whitequark <[email protected]>" ]
license: "MIT"
homepage: "https://github.com/whitequark/ppx_deriving"
doc: "https://whitequark.github.io/ppx_deriving"
bug-reports: "https://github.com/whitequark/ppx_deriving/issues"
dev-repo: "git+https://github.com/whitequark/ppx_deriving.git"
tags: [ "syntax" ]
substs: [ "pkg/META" ]
build: [
[
"ocaml"
"pkg/build.ml"
"native=%{ocaml:native-dynlink}%"
"native-dynlink=%{ocaml:native-dynlink}%"
]
[
"ocamlbuild"
"-classic-display"
"-use-ocamlfind"
"src_test/test_ppx_deriving.byte"
"--"
] {with-test}
[make "doc"] {with-doc}
]
depends: [
"ocaml" {> "4.03.0"}
"ocamlbuild" {build}
"ocamlfind" {build & >= "1.6.0"}
"cppo" {build}
"cppo_ocamlbuild" {build}
"ocaml-migrate-parsetree"
"ppx_derivers"
"ppx_tools" {>= "4.02.3"}
"result"
"ounit" {with-test}
]
available: opam-version >= "1.2"
synopsis: "Type-driven code generation for OCaml >=4.02"
description: """
ppx_deriving provides common infrastructure for generating
code based on type definitions, and a set of useful plugins
for common tasks."""
url {
src: "https://github.com/ocaml-ppx/ppx_deriving/archive/v4.2.1.tar.gz"
checksum: "md5=2195fccf2a527c3ff9ec5b4e36e2f0a8"
}
36 changes: 36 additions & 0 deletions esy.lock/opam/ppx_deriving_yojson.3.3/opam
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
opam-version: "2.0"
maintainer: "whitequark <[email protected]>"
authors: [ "whitequark <[email protected]>" ]
license: "MIT"
homepage: "https://github.com/whitequark/ppx_deriving_yojson"
doc: "http://whitequark.github.io/ppx_deriving_yojson"
bug-reports: "https://github.com/whitequark/ppx_deriving_yojson/issues"
dev-repo: "git://github.com/whitequark/ppx_deriving_yojson.git"
tags: [ "syntax" "json" ]
build: [
["dune" "subst"] {pinned}
["dune" "build" "-p" name "-j" jobs]
["dune" "runtest" "-p" name] {with-test}
]
depends: [
"ocaml" {>= "4.04.0"}
"yojson" {< "1.6.0"}
"result"
"ppx_deriving" {>= "4.0" & < "5.0"}
"ppx_tools" {build}
"ppxfind" {build}
"dune" {build & >= "1.2"}
"cppo" {build}
"ounit" {with-test & >= "2.0.0"}
]
conflicts: [
"ppx_deriving" {= "4.2"}
]
synopsis: "JSON codec generator for OCaml"
description: """
ppx_deriving_yojson is a ppx_deriving plugin that provides
a JSON codec generator."""
url {
src: "https://github.com/ocaml-ppx/ppx_deriving_yojson/archive/v3.3.tar.gz"
checksum: "sha512=e04ee424d89423ca891e018b3ea6e3f5f1e3714bd1ec1b07187143da1a646e51d068d1c09bc794e25b5b5be00ccb517212f62853ec66c17969a9795ba88fae6a"
}
21 changes: 21 additions & 0 deletions esy.lock/opam/ppx_tools.5.1+4.06.0/opam
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
opam-version: "2.0"
maintainer: "[email protected]"
authors: [ "Alain Frisch <[email protected]>" ]
license: "MIT"
homepage: "https://github.com/ocaml-ppx/ppx_tools"
bug-reports: "https://github.com/ocaml-ppx/ppx_tools/issues"
dev-repo: "git://github.com/ocaml-ppx/ppx_tools.git"
tags: [ "syntax" ]
build: [[make "all"]]
install: [[make "install"]]
remove: [["ocamlfind" "remove" "ppx_tools"]]
depends: [
"ocaml" {>= "4.06.0" & < "4.08"}
"ocamlfind" {>= "1.5.0"}
]
synopsis: "Tools for authors of ppx rewriters and other syntactic tools"
flags: light-uninstall
url {
src: "https://github.com/ocaml-ppx/ppx_tools/archive/5.1+4.06.0.tar.gz"
checksum: "md5=6ba2e9690b1f579ba562b86022d1c308"
}
Loading

0 comments on commit 7192332

Please sign in to comment.