Browse Source
This PR adds a GitHub action (🎉) that checks for the latest refmt syntax. This is done thanks to @thomsj which brought up the problems with formatting in the repo! 👏 #105 (comment) The current implementation is not ideal: it installs esy and then installs OCaml and @esy-ocaml/reason. A better way to do it is to distribute refmt as a standalone binary from the latest Reason release. This will be fast to install and therefore fast to integrate with CI. An approach to do so is to add an artifact to the CircleCI runs, and then use something like circleci-artifacts.now.sh to fetch the artifact, extract it and profit 💰 In the meantime, it takes <4m to run it, which is much faster than the Azure Linux build, not to mention the Windows one.remotes/origin/add-simple-redirecting-site
Gal Schlezinger
5 years ago
committed by
GitHub
27 changed files with 1836 additions and 6 deletions
@ -0,0 +1,63 @@ |
|||||||
|
name: Check formatting |
||||||
|
on: [push] |
||||||
|
|
||||||
|
# consider using docker: ocaml/opam2:4.06 |
||||||
|
# - sudo apt-get update && apt-get install -y m4 |
||||||
|
# - opam update && opam install reason |
||||||
|
# - refmt # is new |
||||||
|
|
||||||
|
jobs: |
||||||
|
# build: |
||||||
|
# name: build project |
||||||
|
# runs-on: ubuntu-latest |
||||||
|
# steps: |
||||||
|
# - uses: actions/checkout@master |
||||||
|
# with: |
||||||
|
# fetch-depth: 1 |
||||||
|
# - uses: actions/setup-node@v1 |
||||||
|
# with: |
||||||
|
# node-version: '10.x' |
||||||
|
# - run: npm install -g esy@latest |
||||||
|
# - run: esy i |
||||||
|
# - run: esy b |
||||||
|
# - run: esy export-dependencies |
||||||
|
# - run: tar -czf build.tar.gz _export |
||||||
|
# - uses: actions/upload-artifact@master |
||||||
|
# with: |
||||||
|
# name: cache-linux-build-dependencies |
||||||
|
# path: build.tar.gz |
||||||
|
|
||||||
|
test_refmt: |
||||||
|
name: run refmt |
||||||
|
runs-on: ubuntu-latest |
||||||
|
# needs: [build] |
||||||
|
steps: |
||||||
|
- uses: actions/checkout@master |
||||||
|
with: |
||||||
|
fetch-depth: 1 |
||||||
|
- uses: actions/setup-node@v1 |
||||||
|
with: |
||||||
|
node-version: '10.x' |
||||||
|
# - run: npm install -g esy@latest |
||||||
|
# - uses: actions/download-artifact@master |
||||||
|
# with: |
||||||
|
# name: cache-linux-build-dependencies |
||||||
|
# - run: tar -xzf cache-linux-build-dependencies/build.tar.gz |
||||||
|
# - run: esy import-build _export/* |
||||||
|
# - run: esy i |
||||||
|
# - run: esy fmt |
||||||
|
- run: npm i -g esy@latest |
||||||
|
- run: esy @fmt i |
||||||
|
- run: esy @fmt refmt --in-place */*.re |
||||||
|
# - run: ./scripts/fmt_all.sh |
||||||
|
# name: refmt all the files |
||||||
|
- run: | |
||||||
|
if [ -n "$(git status --porcelain)" ]; then |
||||||
|
echo "There are differences:" |
||||||
|
git status --porcelain |
||||||
|
echo "----" |
||||||
|
echo "" |
||||||
|
echo 'Please run `esy fmt` locally to fix the issues.' |
||||||
|
exit 1 |
||||||
|
fi |
||||||
|
name: "Throw if something changed" |
||||||
@ -0,0 +1,3 @@ |
|||||||
|
|
||||||
|
# Set eol to LF so files aren't converted to CRLF-eol on Windows. |
||||||
|
* text eol=lf |
||||||
@ -0,0 +1,3 @@ |
|||||||
|
|
||||||
|
# Reset any possible .gitignore, we want all esy.lock to be un-ignored. |
||||||
|
!* |
||||||
@ -0,0 +1,359 @@ |
|||||||
|
{ |
||||||
|
"checksum": "86b3a839605635d3ce86e1467d798857", |
||||||
|
"root": "fmt@link-dev:./fmt.json", |
||||||
|
"node": { |
||||||
|
"ocaml@4.6.1000@d41d8cd9": { |
||||||
|
"id": "ocaml@4.6.1000@d41d8cd9", |
||||||
|
"name": "ocaml", |
||||||
|
"version": "4.6.1000", |
||||||
|
"source": { |
||||||
|
"type": "install", |
||||||
|
"source": [ |
||||||
|
"archive:https://registry.npmjs.org/ocaml/-/ocaml-4.6.1000.tgz#sha1:99525ef559353481396454f9a072dedc96b52f44" |
||||||
|
] |
||||||
|
}, |
||||||
|
"overrides": [], |
||||||
|
"dependencies": [], |
||||||
|
"devDependencies": [] |
||||||
|
}, |
||||||
|
"fmt@link-dev:./fmt.json": { |
||||||
|
"id": "fmt@link-dev:./fmt.json", |
||||||
|
"name": "fmt", |
||||||
|
"version": "link-dev:./fmt.json", |
||||||
|
"source": { "type": "link-dev", "path": ".", "manifest": "fmt.json" }, |
||||||
|
"overrides": [], |
||||||
|
"dependencies": [], |
||||||
|
"devDependencies": [ |
||||||
|
"ocaml@4.6.1000@d41d8cd9", "@esy-ocaml/reason@3.5.2@d41d8cd9" |
||||||
|
] |
||||||
|
}, |
||||||
|
"@opam/result@opam:1.4@dc720aef": { |
||||||
|
"id": "@opam/result@opam:1.4@dc720aef", |
||||||
|
"name": "@opam/result", |
||||||
|
"version": "opam:1.4", |
||||||
|
"source": { |
||||||
|
"type": "install", |
||||||
|
"source": [ |
||||||
|
"archive:https://opam.ocaml.org/cache/md5/d3/d3162dbc501a2af65c8c71e0866541da#md5:d3162dbc501a2af65c8c71e0866541da", |
||||||
|
"archive:https://github.com/janestreet/result/archive/1.4.tar.gz#md5:d3162dbc501a2af65c8c71e0866541da" |
||||||
|
], |
||||||
|
"opam": { |
||||||
|
"name": "result", |
||||||
|
"version": "1.4", |
||||||
|
"path": "fmt.esy.lock/opam/result.1.4" |
||||||
|
} |
||||||
|
}, |
||||||
|
"overrides": [], |
||||||
|
"dependencies": [ |
||||||
|
"ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.11.3@9894df55", |
||||||
|
"@esy-ocaml/substs@0.0.1@d41d8cd9" |
||||||
|
], |
||||||
|
"devDependencies": [ |
||||||
|
"ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.11.3@9894df55" |
||||||
|
] |
||||||
|
}, |
||||||
|
"@opam/ppx_derivers@opam:1.2.1@ecf0aa45": { |
||||||
|
"id": "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", |
||||||
|
"name": "@opam/ppx_derivers", |
||||||
|
"version": "opam:1.2.1", |
||||||
|
"source": { |
||||||
|
"type": "install", |
||||||
|
"source": [ |
||||||
|
"archive:https://opam.ocaml.org/cache/md5/5d/5dc2bf130c1db3c731fe0fffc5648b41#md5:5dc2bf130c1db3c731fe0fffc5648b41", |
||||||
|
"archive:https://github.com/ocaml-ppx/ppx_derivers/archive/1.2.1.tar.gz#md5:5dc2bf130c1db3c731fe0fffc5648b41" |
||||||
|
], |
||||||
|
"opam": { |
||||||
|
"name": "ppx_derivers", |
||||||
|
"version": "1.2.1", |
||||||
|
"path": "fmt.esy.lock/opam/ppx_derivers.1.2.1" |
||||||
|
} |
||||||
|
}, |
||||||
|
"overrides": [], |
||||||
|
"dependencies": [ |
||||||
|
"ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.11.3@9894df55", |
||||||
|
"@esy-ocaml/substs@0.0.1@d41d8cd9" |
||||||
|
], |
||||||
|
"devDependencies": [ |
||||||
|
"ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.11.3@9894df55" |
||||||
|
] |
||||||
|
}, |
||||||
|
"@opam/ocamlfind@opam:1.8.1@ff07b0f9": { |
||||||
|
"id": "@opam/ocamlfind@opam:1.8.1@ff07b0f9", |
||||||
|
"name": "@opam/ocamlfind", |
||||||
|
"version": "opam:1.8.1", |
||||||
|
"source": { |
||||||
|
"type": "install", |
||||||
|
"source": [ |
||||||
|
"archive:https://opam.ocaml.org/cache/md5/18/18ca650982c15536616dea0e422cbd8c#md5:18ca650982c15536616dea0e422cbd8c", |
||||||
|
"archive:http://download2.camlcity.org/download/findlib-1.8.1.tar.gz#md5:18ca650982c15536616dea0e422cbd8c", |
||||||
|
"archive:http://download.camlcity.org/download/findlib-1.8.1.tar.gz#md5:18ca650982c15536616dea0e422cbd8c" |
||||||
|
], |
||||||
|
"opam": { |
||||||
|
"name": "ocamlfind", |
||||||
|
"version": "1.8.1", |
||||||
|
"path": "fmt.esy.lock/opam/ocamlfind.1.8.1" |
||||||
|
} |
||||||
|
}, |
||||||
|
"overrides": [ |
||||||
|
{ |
||||||
|
"opamoverride": |
||||||
|
"fmt.esy.lock/overrides/opam__s__ocamlfind_opam__c__1.8.1_opam_override" |
||||||
|
} |
||||||
|
], |
||||||
|
"dependencies": [ |
||||||
|
"ocaml@4.6.1000@d41d8cd9", "@opam/conf-m4@opam:1@3b2b148a", |
||||||
|
"@esy-ocaml/substs@0.0.1@d41d8cd9" |
||||||
|
], |
||||||
|
"devDependencies": [ "ocaml@4.6.1000@d41d8cd9" ] |
||||||
|
}, |
||||||
|
"@opam/ocamlbuild@opam:0.14.0@6ac75d03": { |
||||||
|
"id": "@opam/ocamlbuild@opam:0.14.0@6ac75d03", |
||||||
|
"name": "@opam/ocamlbuild", |
||||||
|
"version": "opam:0.14.0", |
||||||
|
"source": { |
||||||
|
"type": "install", |
||||||
|
"source": [ |
||||||
|
"archive:https://opam.ocaml.org/cache/sha256/87/87b29ce96958096c0a1a8eeafeb6268077b2d11e1bf2b3de0f5ebc9cf8d42e78#sha256:87b29ce96958096c0a1a8eeafeb6268077b2d11e1bf2b3de0f5ebc9cf8d42e78", |
||||||
|
"archive:https://github.com/ocaml/ocamlbuild/archive/0.14.0.tar.gz#sha256:87b29ce96958096c0a1a8eeafeb6268077b2d11e1bf2b3de0f5ebc9cf8d42e78" |
||||||
|
], |
||||||
|
"opam": { |
||||||
|
"name": "ocamlbuild", |
||||||
|
"version": "0.14.0", |
||||||
|
"path": "fmt.esy.lock/opam/ocamlbuild.0.14.0" |
||||||
|
} |
||||||
|
}, |
||||||
|
"overrides": [ |
||||||
|
{ |
||||||
|
"opamoverride": |
||||||
|
"fmt.esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.0_opam_override" |
||||||
|
} |
||||||
|
], |
||||||
|
"dependencies": [ |
||||||
|
"ocaml@4.6.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" |
||||||
|
], |
||||||
|
"devDependencies": [ "ocaml@4.6.1000@d41d8cd9" ] |
||||||
|
}, |
||||||
|
"@opam/ocaml-migrate-parsetree@opam:1.4.0@0c4ec62d": { |
||||||
|
"id": "@opam/ocaml-migrate-parsetree@opam:1.4.0@0c4ec62d", |
||||||
|
"name": "@opam/ocaml-migrate-parsetree", |
||||||
|
"version": "opam:1.4.0", |
||||||
|
"source": { |
||||||
|
"type": "install", |
||||||
|
"source": [ |
||||||
|
"archive:https://opam.ocaml.org/cache/sha256/23/231fbdc205187b3ee266b535d9cfe44b599067b2f6e97883c782ea7bb577d3b8#sha256:231fbdc205187b3ee266b535d9cfe44b599067b2f6e97883c782ea7bb577d3b8", |
||||||
|
"archive:https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v1.4.0/ocaml-migrate-parsetree-v1.4.0.tbz#sha256:231fbdc205187b3ee266b535d9cfe44b599067b2f6e97883c782ea7bb577d3b8" |
||||||
|
], |
||||||
|
"opam": { |
||||||
|
"name": "ocaml-migrate-parsetree", |
||||||
|
"version": "1.4.0", |
||||||
|
"path": "fmt.esy.lock/opam/ocaml-migrate-parsetree.1.4.0" |
||||||
|
} |
||||||
|
}, |
||||||
|
"overrides": [], |
||||||
|
"dependencies": [ |
||||||
|
"ocaml@4.6.1000@d41d8cd9", "@opam/result@opam:1.4@dc720aef", |
||||||
|
"@opam/ppx_derivers@opam:1.2.1@ecf0aa45", |
||||||
|
"@opam/dune@opam:1.11.3@9894df55", "@esy-ocaml/substs@0.0.1@d41d8cd9" |
||||||
|
], |
||||||
|
"devDependencies": [ |
||||||
|
"ocaml@4.6.1000@d41d8cd9", "@opam/result@opam:1.4@dc720aef", |
||||||
|
"@opam/ppx_derivers@opam:1.2.1@ecf0aa45", |
||||||
|
"@opam/dune@opam:1.11.3@9894df55" |
||||||
|
] |
||||||
|
}, |
||||||
|
"@opam/merlin-extend@opam:0.5@a5dd7d4b": { |
||||||
|
"id": "@opam/merlin-extend@opam:0.5@a5dd7d4b", |
||||||
|
"name": "@opam/merlin-extend", |
||||||
|
"version": "opam:0.5", |
||||||
|
"source": { |
||||||
|
"type": "install", |
||||||
|
"source": [ |
||||||
|
"archive:https://opam.ocaml.org/cache/sha256/ca/ca3a38c360c7d4827eb4789abf7a6aa4b6e3b4e3c3ef69a5be64dce4601ec227#sha256:ca3a38c360c7d4827eb4789abf7a6aa4b6e3b4e3c3ef69a5be64dce4601ec227", |
||||||
|
"archive:https://github.com/let-def/merlin-extend/releases/download/v0.5/merlin-extend-v0.5.tbz#sha256:ca3a38c360c7d4827eb4789abf7a6aa4b6e3b4e3c3ef69a5be64dce4601ec227" |
||||||
|
], |
||||||
|
"opam": { |
||||||
|
"name": "merlin-extend", |
||||||
|
"version": "0.5", |
||||||
|
"path": "fmt.esy.lock/opam/merlin-extend.0.5" |
||||||
|
} |
||||||
|
}, |
||||||
|
"overrides": [], |
||||||
|
"dependencies": [ |
||||||
|
"ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.11.3@9894df55", |
||||||
|
"@opam/cppo@opam:1.6.6@f4f83858", "@esy-ocaml/substs@0.0.1@d41d8cd9" |
||||||
|
], |
||||||
|
"devDependencies": [ |
||||||
|
"ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.11.3@9894df55" |
||||||
|
] |
||||||
|
}, |
||||||
|
"@opam/menhir@opam:20190924@004407ff": { |
||||||
|
"id": "@opam/menhir@opam:20190924@004407ff", |
||||||
|
"name": "@opam/menhir", |
||||||
|
"version": "opam:20190924", |
||||||
|
"source": { |
||||||
|
"type": "install", |
||||||
|
"source": [ |
||||||
|
"archive:https://opam.ocaml.org/cache/md5/67/677f1997fb73177d5a00fa1b8d61c3ef#md5:677f1997fb73177d5a00fa1b8d61c3ef", |
||||||
|
"archive:https://gitlab.inria.fr/fpottier/menhir/repository/20190924/archive.tar.gz#md5:677f1997fb73177d5a00fa1b8d61c3ef" |
||||||
|
], |
||||||
|
"opam": { |
||||||
|
"name": "menhir", |
||||||
|
"version": "20190924", |
||||||
|
"path": "fmt.esy.lock/opam/menhir.20190924" |
||||||
|
} |
||||||
|
}, |
||||||
|
"overrides": [], |
||||||
|
"dependencies": [ |
||||||
|
"ocaml@4.6.1000@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", |
||||||
|
"@opam/ocamlbuild@opam:0.14.0@6ac75d03", |
||||||
|
"@esy-ocaml/substs@0.0.1@d41d8cd9" |
||||||
|
], |
||||||
|
"devDependencies": [ "ocaml@4.6.1000@d41d8cd9" ] |
||||||
|
}, |
||||||
|
"@opam/dune@opam:1.11.3@9894df55": { |
||||||
|
"id": "@opam/dune@opam:1.11.3@9894df55", |
||||||
|
"name": "@opam/dune", |
||||||
|
"version": "opam:1.11.3", |
||||||
|
"source": { |
||||||
|
"type": "install", |
||||||
|
"source": [ |
||||||
|
"archive:https://opam.ocaml.org/cache/sha256/c8/c83a63e7e8245611b0e11d6adea07c6484dc1b4efffacb176315cd6674d4bbd2#sha256:c83a63e7e8245611b0e11d6adea07c6484dc1b4efffacb176315cd6674d4bbd2", |
||||||
|
"archive:https://github.com/ocaml/dune/releases/download/1.11.3/dune-build-info-1.11.3.tbz#sha256:c83a63e7e8245611b0e11d6adea07c6484dc1b4efffacb176315cd6674d4bbd2" |
||||||
|
], |
||||||
|
"opam": { |
||||||
|
"name": "dune", |
||||||
|
"version": "1.11.3", |
||||||
|
"path": "fmt.esy.lock/opam/dune.1.11.3" |
||||||
|
} |
||||||
|
}, |
||||||
|
"overrides": [ |
||||||
|
{ |
||||||
|
"opamoverride": |
||||||
|
"fmt.esy.lock/overrides/opam__s__dune_opam__c__1.11.3_opam_override" |
||||||
|
} |
||||||
|
], |
||||||
|
"dependencies": [ |
||||||
|
"ocaml@4.6.1000@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", |
||||||
|
"@opam/base-threads@opam:base@36803084", |
||||||
|
"@esy-ocaml/substs@0.0.1@d41d8cd9" |
||||||
|
], |
||||||
|
"devDependencies": [ |
||||||
|
"ocaml@4.6.1000@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", |
||||||
|
"@opam/base-threads@opam:base@36803084" |
||||||
|
] |
||||||
|
}, |
||||||
|
"@opam/cppo@opam:1.6.6@f4f83858": { |
||||||
|
"id": "@opam/cppo@opam:1.6.6@f4f83858", |
||||||
|
"name": "@opam/cppo", |
||||||
|
"version": "opam:1.6.6", |
||||||
|
"source": { |
||||||
|
"type": "install", |
||||||
|
"source": [ |
||||||
|
"archive:https://opam.ocaml.org/cache/sha256/e7/e7272996a7789175b87bb998efd079794a8db6625aae990d73f7b4484a07b8a0#sha256:e7272996a7789175b87bb998efd079794a8db6625aae990d73f7b4484a07b8a0", |
||||||
|
"archive:https://github.com/ocaml-community/cppo/releases/download/v1.6.6/cppo-v1.6.6.tbz#sha256:e7272996a7789175b87bb998efd079794a8db6625aae990d73f7b4484a07b8a0" |
||||||
|
], |
||||||
|
"opam": { |
||||||
|
"name": "cppo", |
||||||
|
"version": "1.6.6", |
||||||
|
"path": "fmt.esy.lock/opam/cppo.1.6.6" |
||||||
|
} |
||||||
|
}, |
||||||
|
"overrides": [], |
||||||
|
"dependencies": [ |
||||||
|
"ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.11.3@9894df55", |
||||||
|
"@opam/base-unix@opam:base@87d0b2eb", |
||||||
|
"@esy-ocaml/substs@0.0.1@d41d8cd9" |
||||||
|
], |
||||||
|
"devDependencies": [ |
||||||
|
"ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.11.3@9894df55", |
||||||
|
"@opam/base-unix@opam:base@87d0b2eb" |
||||||
|
] |
||||||
|
}, |
||||||
|
"@opam/conf-m4@opam:1@3b2b148a": { |
||||||
|
"id": "@opam/conf-m4@opam:1@3b2b148a", |
||||||
|
"name": "@opam/conf-m4", |
||||||
|
"version": "opam:1", |
||||||
|
"source": { |
||||||
|
"type": "install", |
||||||
|
"source": [ "no-source:" ], |
||||||
|
"opam": { |
||||||
|
"name": "conf-m4", |
||||||
|
"version": "1", |
||||||
|
"path": "fmt.esy.lock/opam/conf-m4.1" |
||||||
|
} |
||||||
|
}, |
||||||
|
"overrides": [], |
||||||
|
"dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], |
||||||
|
"devDependencies": [] |
||||||
|
}, |
||||||
|
"@opam/base-unix@opam:base@87d0b2eb": { |
||||||
|
"id": "@opam/base-unix@opam:base@87d0b2eb", |
||||||
|
"name": "@opam/base-unix", |
||||||
|
"version": "opam:base", |
||||||
|
"source": { |
||||||
|
"type": "install", |
||||||
|
"source": [ "no-source:" ], |
||||||
|
"opam": { |
||||||
|
"name": "base-unix", |
||||||
|
"version": "base", |
||||||
|
"path": "fmt.esy.lock/opam/base-unix.base" |
||||||
|
} |
||||||
|
}, |
||||||
|
"overrides": [], |
||||||
|
"dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], |
||||||
|
"devDependencies": [] |
||||||
|
}, |
||||||
|
"@opam/base-threads@opam:base@36803084": { |
||||||
|
"id": "@opam/base-threads@opam:base@36803084", |
||||||
|
"name": "@opam/base-threads", |
||||||
|
"version": "opam:base", |
||||||
|
"source": { |
||||||
|
"type": "install", |
||||||
|
"source": [ "no-source:" ], |
||||||
|
"opam": { |
||||||
|
"name": "base-threads", |
||||||
|
"version": "base", |
||||||
|
"path": "fmt.esy.lock/opam/base-threads.base" |
||||||
|
} |
||||||
|
}, |
||||||
|
"overrides": [], |
||||||
|
"dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], |
||||||
|
"devDependencies": [] |
||||||
|
}, |
||||||
|
"@esy-ocaml/substs@0.0.1@d41d8cd9": { |
||||||
|
"id": "@esy-ocaml/substs@0.0.1@d41d8cd9", |
||||||
|
"name": "@esy-ocaml/substs", |
||||||
|
"version": "0.0.1", |
||||||
|
"source": { |
||||||
|
"type": "install", |
||||||
|
"source": [ |
||||||
|
"archive:https://registry.npmjs.org/@esy-ocaml/substs/-/substs-0.0.1.tgz#sha1:59ebdbbaedcda123fc7ed8fb2b302b7d819e9a46" |
||||||
|
] |
||||||
|
}, |
||||||
|
"overrides": [], |
||||||
|
"dependencies": [], |
||||||
|
"devDependencies": [] |
||||||
|
}, |
||||||
|
"@esy-ocaml/reason@3.5.2@d41d8cd9": { |
||||||
|
"id": "@esy-ocaml/reason@3.5.2@d41d8cd9", |
||||||
|
"name": "@esy-ocaml/reason", |
||||||
|
"version": "3.5.2", |
||||||
|
"source": { |
||||||
|
"type": "install", |
||||||
|
"source": [ |
||||||
|
"archive:https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.5.2.tgz#sha1:ac48b63fd66fbbc1d77ab6a2b7e3a1ba21a8f40b" |
||||||
|
] |
||||||
|
}, |
||||||
|
"overrides": [], |
||||||
|
"dependencies": [ |
||||||
|
"ocaml@4.6.1000@d41d8cd9", "@opam/result@opam:1.4@dc720aef", |
||||||
|
"@opam/ocamlfind@opam:1.8.1@ff07b0f9", |
||||||
|
"@opam/ocaml-migrate-parsetree@opam:1.4.0@0c4ec62d", |
||||||
|
"@opam/merlin-extend@opam:0.5@a5dd7d4b", |
||||||
|
"@opam/menhir@opam:20190924@004407ff", |
||||||
|
"@opam/dune@opam:1.11.3@9894df55" |
||||||
|
], |
||||||
|
"devDependencies": [] |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
@ -0,0 +1,6 @@ |
|||||||
|
opam-version: "2.0" |
||||||
|
maintainer: "https://github.com/ocaml/opam-repository/issues" |
||||||
|
description: """ |
||||||
|
Threads library distributed with the OCaml compiler |
||||||
|
""" |
||||||
|
|
||||||
@ -0,0 +1,6 @@ |
|||||||
|
opam-version: "2.0" |
||||||
|
maintainer: "https://github.com/ocaml/opam-repository/issues" |
||||||
|
description: """ |
||||||
|
Unix library distributed with the OCaml compiler |
||||||
|
""" |
||||||
|
|
||||||
@ -0,0 +1,22 @@ |
|||||||
|
opam-version: "2.0" |
||||||
|
maintainer: "tim@gfxmonk.net" |
||||||
|
homepage: "http://www.gnu.org/software/m4/m4.html" |
||||||
|
bug-reports: "https://github.com/ocaml/opam-repository/issues" |
||||||
|
authors: "GNU Project" |
||||||
|
license: "GPL-3.0-only" |
||||||
|
build: [["sh" "-exc" "echo | m4"]] |
||||||
|
depexts: [ |
||||||
|
["m4"] {os-family = "debian"} |
||||||
|
["m4"] {os-distribution = "fedora"} |
||||||
|
["m4"] {os-distribution = "rhel"} |
||||||
|
["m4"] {os-distribution = "centos"} |
||||||
|
["m4"] {os-distribution = "alpine"} |
||||||
|
["m4"] {os-distribution = "nixos"} |
||||||
|
["m4"] {os-family = "suse"} |
||||||
|
["m4"] {os-distribution = "ol"} |
||||||
|
["m4"] {os-distribution = "arch"} |
||||||
|
] |
||||||
|
synopsis: "Virtual package relying on m4" |
||||||
|
description: |
||||||
|
"This package can only install if the m4 binary is installed on the system." |
||||||
|
flags: conf |
||||||
@ -0,0 +1,37 @@ |
|||||||
|
opam-version: "2.0" |
||||||
|
maintainer: "martin@mjambon.com" |
||||||
|
authors: "Martin Jambon" |
||||||
|
license: "BSD-3-Clause" |
||||||
|
homepage: "http://mjambon.com/cppo.html" |
||||||
|
doc: "https://ocaml-community.github.io/cppo/" |
||||||
|
bug-reports: "https://github.com/ocaml-community/cppo/issues" |
||||||
|
depends: [ |
||||||
|
"ocaml" {>= "4.03"} |
||||||
|
"dune" {>= "1.0"} |
||||||
|
"base-unix" |
||||||
|
] |
||||||
|
build: [ |
||||||
|
["dune" "subst"] {pinned} |
||||||
|
["dune" "build" "-p" name "-j" jobs] |
||||||
|
["dune" "runtest" "-p" name "-j" jobs] {with-test} |
||||||
|
] |
||||||
|
dev-repo: "git+https://github.com/ocaml-community/cppo.git" |
||||||
|
synopsis: "Code preprocessor like cpp for OCaml" |
||||||
|
description: """ |
||||||
|
Cppo is an equivalent of the C preprocessor for OCaml programs. |
||||||
|
It allows the definition of simple macros and file inclusion. |
||||||
|
|
||||||
|
Cppo is: |
||||||
|
|
||||||
|
* more OCaml-friendly than cpp |
||||||
|
* easy to learn without consulting a manual |
||||||
|
* reasonably fast |
||||||
|
* simple to install and to maintain |
||||||
|
""" |
||||||
|
url { |
||||||
|
src: "https://github.com/ocaml-community/cppo/releases/download/v1.6.6/cppo-v1.6.6.tbz" |
||||||
|
checksum: [ |
||||||
|
"sha256=e7272996a7789175b87bb998efd079794a8db6625aae990d73f7b4484a07b8a0" |
||||||
|
"sha512=44ecf9d225d9e45490a2feac0bde04865ca398dba6c3579e3370fcd1ea255707b8883590852af8b2df87123801062b9f3acce2455c092deabf431f9c4fb8d8eb" |
||||||
|
] |
||||||
|
} |
||||||
@ -0,0 +1,53 @@ |
|||||||
|
opam-version: "2.0" |
||||||
|
synopsis: "Fast, portable and opinionated build system" |
||||||
|
description: """ |
||||||
|
|
||||||
|
dune is a build system that was designed to simplify the release of |
||||||
|
Jane Street packages. It reads metadata from "dune" files following a |
||||||
|
very simple s-expression syntax. |
||||||
|
|
||||||
|
dune is fast, it has very low-overhead and support parallel builds on |
||||||
|
all platforms. It has no system dependencies, all you need to build |
||||||
|
dune and packages using dune is OCaml. You don't need or make or bash |
||||||
|
as long as the packages themselves don't use bash explicitly. |
||||||
|
|
||||||
|
dune supports multi-package development by simply dropping multiple |
||||||
|
repositories into the same directory. |
||||||
|
|
||||||
|
It also supports multi-context builds, such as building against |
||||||
|
several opam roots/switches simultaneously. This helps maintaining |
||||||
|
packages across several versions of OCaml and gives cross-compilation |
||||||
|
for free. |
||||||
|
""" |
||||||
|
maintainer: ["Jane Street Group, LLC <opensource@janestreet.com>"] |
||||||
|
authors: ["Jane Street Group, LLC <opensource@janestreet.com>"] |
||||||
|
license: "MIT" |
||||||
|
homepage: "https://github.com/ocaml/dune" |
||||||
|
doc: "https://dune.readthedocs.io/" |
||||||
|
bug-reports: "https://github.com/ocaml/dune/issues" |
||||||
|
depends: [ |
||||||
|
"ocaml" {>= "4.02"} |
||||||
|
"base-unix" |
||||||
|
"base-threads" |
||||||
|
] |
||||||
|
conflicts: [ |
||||||
|
"jbuilder" {!= "transition"} |
||||||
|
"odoc" {< "1.3.0"} |
||||||
|
"dune-release" {< "1.3.0"} |
||||||
|
] |
||||||
|
dev-repo: "git+https://github.com/ocaml/dune.git" |
||||||
|
build: [ |
||||||
|
# opam 2 sets OPAM_SWITCH_PREFIX, so we don't need a hardcoded path |
||||||
|
["ocaml" "configure.ml" "--libdir" lib] {opam-version < "2"} |
||||||
|
["ocaml" "bootstrap.ml"] |
||||||
|
["./boot.exe" "--release" "--subst"] {pinned} |
||||||
|
["./boot.exe" "--release" "-j" jobs] |
||||||
|
] |
||||||
|
url { |
||||||
|
src: |
||||||
|
"https://github.com/ocaml/dune/releases/download/1.11.3/dune-build-info-1.11.3.tbz" |
||||||
|
checksum: [ |
||||||
|
"sha256=c83a63e7e8245611b0e11d6adea07c6484dc1b4efffacb176315cd6674d4bbd2" |
||||||
|
"sha512=2c1532b91d223e6ea0628c5f5174792c1bb4113a464f6d8b878b3c58be1136beb84ba2d9883a330fa20e550367588aa923ba06ffb9b615a098a21374a9377e81" |
||||||
|
] |
||||||
|
} |
||||||
@ -0,0 +1,29 @@ |
|||||||
|
opam-version: "2.0" |
||||||
|
maintainer: "francois.pottier@inria.fr" |
||||||
|
authors: [ |
||||||
|
"François Pottier <francois.pottier@inria.fr>" |
||||||
|
"Yann Régis-Gianas <yrg@pps.univ-paris-diderot.fr>" |
||||||
|
] |
||||||
|
homepage: "http://gitlab.inria.fr/fpottier/menhir" |
||||||
|
dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git" |
||||||
|
bug-reports: "menhir@inria.fr" |
||||||
|
build: [ |
||||||
|
[make "-f" "Makefile" "PREFIX=%{prefix}%" "USE_OCAMLFIND=true" "docdir=%{doc}%/menhir" "libdir=%{lib}%/menhir" "mandir=%{man}%/man1"] |
||||||
|
] |
||||||
|
install: [ |
||||||
|
[make "-f" "Makefile" "install" "PREFIX=%{prefix}%" "docdir=%{doc}%/menhir" "libdir=%{lib}%/menhir" "mandir=%{man}%/man1"] |
||||||
|
] |
||||||
|
depends: [ |
||||||
|
"ocaml" {>= "4.02"} |
||||||
|
"ocamlfind" {build} |
||||||
|
"ocamlbuild" {build} |
||||||
|
] |
||||||
|
synopsis: "An LR(1) parser generator" |
||||||
|
url { |
||||||
|
src: |
||||||
|
"https://gitlab.inria.fr/fpottier/menhir/repository/20190924/archive.tar.gz" |
||||||
|
checksum: [ |
||||||
|
"md5=677f1997fb73177d5a00fa1b8d61c3ef" |
||||||
|
"sha512=ea8a9a6d773529cf6ac05e4c6c4532770fbb8e574c9b646efcefe90d9f24544741e3e8cfd94c8afea0447e34059a8c79c2829b46764ce3a3d6dcb3e7f75980fc" |
||||||
|
] |
||||||
|
} |
||||||
@ -0,0 +1,29 @@ |
|||||||
|
opam-version: "2.0" |
||||||
|
maintainer: "Frederic Bour <frederic.bour@lakaban.net>" |
||||||
|
authors: "Frederic Bour <frederic.bour@lakaban.net>" |
||||||
|
homepage: "https://github.com/let-def/merlin-extend" |
||||||
|
bug-reports: "https://github.com/let-def/merlin-extend" |
||||||
|
license: "MIT" |
||||||
|
dev-repo: "git+https://github.com/let-def/merlin-extend.git" |
||||||
|
build: [ |
||||||
|
["dune" "subst"] {pinned} |
||||||
|
["dune" "build" "-p" name "-j" jobs] |
||||||
|
] |
||||||
|
depends: [ |
||||||
|
"dune" {>= "1.0"} |
||||||
|
"cppo" {build} |
||||||
|
"ocaml" {>= "4.02.3"} |
||||||
|
] |
||||||
|
synopsis: "A protocol to provide custom frontend to Merlin" |
||||||
|
description: """ |
||||||
|
This protocol allows to replace the OCaml frontend of Merlin. |
||||||
|
It extends what used to be done with the `-pp' flag to handle a few more cases.""" |
||||||
|
doc: "https://let-def.github.io/merlin-extend" |
||||||
|
url { |
||||||
|
src: |
||||||
|
"https://github.com/let-def/merlin-extend/releases/download/v0.5/merlin-extend-v0.5.tbz" |
||||||
|
checksum: [ |
||||||
|
"sha256=ca3a38c360c7d4827eb4789abf7a6aa4b6e3b4e3c3ef69a5be64dce4601ec227" |
||||||
|
"sha512=55c5a3637337abb8ca8db679128a81ca8ccce567bc214d55b2e6444dc0e905b74c64d629bdea2457d0fe4be5306414feefcdbc4d4761fdafd59aa107550936b6" |
||||||
|
] |
||||||
|
} |
||||||
@ -0,0 +1,37 @@ |
|||||||
|
opam-version: "2.0" |
||||||
|
maintainer: "frederic.bour@lakaban.net" |
||||||
|
authors: [ |
||||||
|
"Frédéric Bour <frederic.bour@lakaban.net>" |
||||||
|
"Jérémie Dimino <jeremie@dimino.org>" |
||||||
|
] |
||||||
|
license: "LGPL-2.1-only with OCaml-LGPL-linking-exception" |
||||||
|
homepage: "https://github.com/ocaml-ppx/ocaml-migrate-parsetree" |
||||||
|
bug-reports: "https://github.com/ocaml-ppx/ocaml-migrate-parsetree/issues" |
||||||
|
dev-repo: "git+https://github.com/ocaml-ppx/ocaml-migrate-parsetree.git" |
||||||
|
doc: "https://ocaml-ppx.github.io/ocaml-migrate-parsetree/" |
||||||
|
tags: [ "syntax" "org:ocamllabs" ] |
||||||
|
build: [ |
||||||
|
["dune" "build" "-p" name "-j" jobs] |
||||||
|
] |
||||||
|
depends: [ |
||||||
|
"result" |
||||||
|
"ppx_derivers" |
||||||
|
"dune" {>= "1.9.0"} |
||||||
|
"ocaml" {>= "4.02.3"} |
||||||
|
] |
||||||
|
synopsis: "Convert OCaml parsetrees between different versions" |
||||||
|
description: """ |
||||||
|
Convert OCaml parsetrees between different versions |
||||||
|
|
||||||
|
This library converts parsetrees, outcometree and ast mappers between |
||||||
|
different OCaml versions. High-level functions help making PPX |
||||||
|
rewriters independent of a compiler version. |
||||||
|
""" |
||||||
|
url { |
||||||
|
src: |
||||||
|
"https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v1.4.0/ocaml-migrate-parsetree-v1.4.0.tbz" |
||||||
|
checksum: [ |
||||||
|
"sha256=231fbdc205187b3ee266b535d9cfe44b599067b2f6e97883c782ea7bb577d3b8" |
||||||
|
"sha512=61ee91d2d146cc2d2ff2d5dc4ef5dea4dc4d3c8dbd8b4c9586d64b6ad7302327ab35547aa0a5b0103c3f07b66b13d416a1bee6d4d117293cd3cabe44113ec6d4" |
||||||
|
] |
||||||
|
} |
||||||
@ -0,0 +1,36 @@ |
|||||||
|
opam-version: "2.0" |
||||||
|
maintainer: "Gabriel Scherer <gabriel.scherer@gmail.com>" |
||||||
|
authors: ["Nicolas Pouillard" "Berke Durak"] |
||||||
|
homepage: "https://github.com/ocaml/ocamlbuild/" |
||||||
|
bug-reports: "https://github.com/ocaml/ocamlbuild/issues" |
||||||
|
license: "LGPL-2.1-only with OCaml-LGPL-linking-exception" |
||||||
|
doc: "https://github.com/ocaml/ocamlbuild/blob/master/manual/manual.adoc" |
||||||
|
dev-repo: "git+https://github.com/ocaml/ocamlbuild.git" |
||||||
|
build: [ |
||||||
|
[ |
||||||
|
make |
||||||
|
"-f" |
||||||
|
"configure.make" |
||||||
|
"all" |
||||||
|
"OCAMLBUILD_PREFIX=%{prefix}%" |
||||||
|
"OCAMLBUILD_BINDIR=%{bin}%" |
||||||
|
"OCAMLBUILD_LIBDIR=%{lib}%" |
||||||
|
"OCAMLBUILD_MANDIR=%{man}%" |
||||||
|
"OCAML_NATIVE=%{ocaml:native}%" |
||||||
|
"OCAML_NATIVE_TOOLS=%{ocaml:native}%" |
||||||
|
] |
||||||
|
[make "check-if-preinstalled" "all" "opam-install"] |
||||||
|
] |
||||||
|
conflicts: [ |
||||||
|
"base-ocamlbuild" |
||||||
|
"ocamlfind" {< "1.6.2"} |
||||||
|
] |
||||||
|
synopsis: |
||||||
|
"OCamlbuild is a build system with builtin rules to easily build most OCaml projects." |
||||||
|
depends: [ |
||||||
|
"ocaml" {>= "4.03"} |
||||||
|
] |
||||||
|
url { |
||||||
|
src: "https://github.com/ocaml/ocamlbuild/archive/0.14.0.tar.gz" |
||||||
|
checksum: "sha256=87b29ce96958096c0a1a8eeafeb6268077b2d11e1bf2b3de0f5ebc9cf8d42e78" |
||||||
|
} |
||||||
@ -0,0 +1,4 @@ |
|||||||
|
#!/bin/sh |
||||||
|
|
||||||
|
BINDIR=$(dirname "$(command -v ocamlc)") |
||||||
|
"$BINDIR/ocaml" -I "$OCAML_TOPLEVEL_PATH" "$@" |
||||||
@ -0,0 +1,6 @@ |
|||||||
|
bin: [ |
||||||
|
"src/findlib/ocamlfind" {"ocamlfind"} |
||||||
|
"?src/findlib/ocamlfind_opt" {"ocamlfind"} |
||||||
|
"?tools/safe_camlp4" |
||||||
|
] |
||||||
|
toplevel: ["src/findlib/topfind"] |
||||||
@ -0,0 +1,50 @@ |
|||||||
|
opam-version: "2.0" |
||||||
|
synopsis: "A library manager for OCaml" |
||||||
|
maintainer: "Thomas Gazagnaire <thomas@gazagnaire.org>" |
||||||
|
authors: "Gerd Stolpmann <gerd@gerd-stolpmann.de>" |
||||||
|
homepage: "http://projects.camlcity.org/projects/findlib.html" |
||||||
|
bug-reports: "https://gitlab.camlcity.org/gerd/lib-findlib/issues" |
||||||
|
dev-repo: "git+https://gitlab.camlcity.org/gerd/lib-findlib.git" |
||||||
|
description: """ |
||||||
|
Findlib is a library manager for OCaml. It provides a convention how |
||||||
|
to store libraries, and a file format ("META") to describe the |
||||||
|
properties of libraries. There is also a tool (ocamlfind) for |
||||||
|
interpreting the META files, so that it is very easy to use libraries |
||||||
|
in programs and scripts. |
||||||
|
""" |
||||||
|
build: [ |
||||||
|
[ |
||||||
|
"./configure" |
||||||
|
"-bindir" |
||||||
|
bin |
||||||
|
"-sitelib" |
||||||
|
lib |
||||||
|
"-mandir" |
||||||
|
man |
||||||
|
"-config" |
||||||
|
"%{lib}%/findlib.conf" |
||||||
|
"-no-custom" |
||||||
|
"-no-camlp4" {!ocaml:preinstalled & ocaml:version >= "4.02.0"} |
||||||
|
"-no-topfind" {ocaml:preinstalled} |
||||||
|
] |
||||||
|
[make "all"] |
||||||
|
[make "opt"] {ocaml:native} |
||||||
|
] |
||||||
|
install: [ |
||||||
|
[make "install"] |
||||||
|
["install" "-m" "0755" "ocaml-stub" "%{bin}%/ocaml"] {ocaml:preinstalled} |
||||||
|
] |
||||||
|
depends: [ |
||||||
|
"ocaml" {>= "4.00.0"} |
||||||
|
"conf-m4" {build} |
||||||
|
] |
||||||
|
extra-files: [ |
||||||
|
["ocamlfind.install" "md5=06f2c282ab52d93aa6adeeadd82a2543"] |
||||||
|
["ocaml-stub" "md5=181f259c9e0bad9ef523e7d4abfdf87a"] |
||||||
|
] |
||||||
|
url { |
||||||
|
src: "http://download.camlcity.org/download/findlib-1.8.1.tar.gz" |
||||||
|
checksum: "md5=18ca650982c15536616dea0e422cbd8c" |
||||||
|
mirrors: "http://download2.camlcity.org/download/findlib-1.8.1.tar.gz" |
||||||
|
} |
||||||
|
depopts: ["graphics"] |
||||||
@ -0,0 +1,23 @@ |
|||||||
|
opam-version: "2.0" |
||||||
|
maintainer: "jeremie@dimino.org" |
||||||
|
authors: ["Jérémie Dimino"] |
||||||
|
license: "BSD-3-Clause" |
||||||
|
homepage: "https://github.com/ocaml-ppx/ppx_derivers" |
||||||
|
bug-reports: "https://github.com/ocaml-ppx/ppx_derivers/issues" |
||||||
|
dev-repo: "git://github.com/ocaml-ppx/ppx_derivers.git" |
||||||
|
build: [ |
||||||
|
["dune" "build" "-p" name "-j" jobs] |
||||||
|
] |
||||||
|
depends: [ |
||||||
|
"ocaml" |
||||||
|
"dune" |
||||||
|
] |
||||||
|
synopsis: "Shared [@@deriving] plugin registry" |
||||||
|
description: """ |
||||||
|
Ppx_derivers is a tiny package whose sole purpose is to allow |
||||||
|
ppx_deriving and ppx_type_conv to inter-operate gracefully when linked |
||||||
|
as part of the same ocaml-migrate-parsetree driver.""" |
||||||
|
url { |
||||||
|
src: "https://github.com/ocaml-ppx/ppx_derivers/archive/1.2.1.tar.gz" |
||||||
|
checksum: "md5=5dc2bf130c1db3c731fe0fffc5648b41" |
||||||
|
} |
||||||
@ -0,0 +1,22 @@ |
|||||||
|
opam-version: "2.0" |
||||||
|
maintainer: "opensource@janestreet.com" |
||||||
|
authors: ["Jane Street Group, LLC <opensource@janestreet.com>"] |
||||||
|
homepage: "https://github.com/janestreet/result" |
||||||
|
dev-repo: "git+https://github.com/janestreet/result.git" |
||||||
|
bug-reports: "https://github.com/janestreet/result/issues" |
||||||
|
license: "BSD-3-Clause" |
||||||
|
build: [["dune" "build" "-p" name "-j" jobs]] |
||||||
|
depends: [ |
||||||
|
"ocaml" |
||||||
|
"dune" {>= "1.0"} |
||||||
|
] |
||||||
|
synopsis: "Compatibility Result module" |
||||||
|
description: """ |
||||||
|
Projects that want to use the new result type defined in OCaml >= 4.03 |
||||||
|
while staying compatible with older version of OCaml should use the |
||||||
|
Result module defined in this library.""" |
||||||
|
url { |
||||||
|
src: |
||||||
|
"https://github.com/janestreet/result/archive/1.4.tar.gz" |
||||||
|
checksum: "md5=d3162dbc501a2af65c8c71e0866541da" |
||||||
|
} |
||||||
@ -0,0 +1,14 @@ |
|||||||
|
{ |
||||||
|
"build": [ |
||||||
|
[ |
||||||
|
"ocaml", |
||||||
|
"bootstrap.ml" |
||||||
|
], |
||||||
|
[ |
||||||
|
"./boot.exe", |
||||||
|
"--release", |
||||||
|
"-j", |
||||||
|
"4" |
||||||
|
] |
||||||
|
] |
||||||
|
} |
||||||
@ -0,0 +1,463 @@ |
|||||||
|
--- ./Makefile
|
||||||
|
+++ ./Makefile
|
||||||
|
@@ -213,7 +213,7 @@
|
||||||
|
rm -f man/ocamlbuild.1
|
||||||
|
|
||||||
|
man/options_man.byte: src/ocamlbuild_pack.cmo
|
||||||
|
- $(OCAMLC) $^ -I src man/options_man.ml -o man/options_man.byte
|
||||||
|
+ $(OCAMLC) -I +unix unix.cma $^ -I src man/options_man.ml -o man/options_man.byte
|
||||||
|
|
||||||
|
clean::
|
||||||
|
rm -f man/options_man.cm*
|
||||||
|
--- ./src/command.ml
|
||||||
|
+++ ./src/command.ml
|
||||||
|
@@ -148,9 +148,10 @@
|
||||||
|
let self = string_of_command_spec_with_calls call_with_tags call_with_target resolve_virtuals in
|
||||||
|
let b = Buffer.create 256 in
|
||||||
|
(* The best way to prevent bash from switching to its windows-style
|
||||||
|
- * quote-handling is to prepend an empty string before the command name. *)
|
||||||
|
+ * quote-handling is to prepend an empty string before the command name.
|
||||||
|
+ * space seems to work, too - and the ouput is nicer *)
|
||||||
|
if Sys.os_type = "Win32" then
|
||||||
|
- Buffer.add_string b "''";
|
||||||
|
+ Buffer.add_char b ' ';
|
||||||
|
let first = ref true in
|
||||||
|
let put_space () =
|
||||||
|
if !first then
|
||||||
|
@@ -260,7 +261,7 @@
|
||||||
|
|
||||||
|
let execute_many ?(quiet=false) ?(pretend=false) cmds =
|
||||||
|
add_parallel_stat (List.length cmds);
|
||||||
|
- let degraded = !*My_unix.is_degraded || Sys.os_type = "Win32" in
|
||||||
|
+ let degraded = !*My_unix.is_degraded in
|
||||||
|
let jobs = !jobs in
|
||||||
|
if jobs < 0 then invalid_arg "jobs < 0";
|
||||||
|
let max_jobs = if jobs = 0 then None else Some jobs in
|
||||||
|
--- ./src/findlib.ml
|
||||||
|
+++ ./src/findlib.ml
|
||||||
|
@@ -66,9 +66,6 @@
|
||||||
|
(fun command -> lexer & Lexing.from_string & run_and_read command)
|
||||||
|
command
|
||||||
|
|
||||||
|
-let run_and_read command =
|
||||||
|
- Printf.ksprintf run_and_read command
|
||||||
|
-
|
||||||
|
let rec query name =
|
||||||
|
try
|
||||||
|
Hashtbl.find packages name
|
||||||
|
@@ -135,7 +132,8 @@
|
||||||
|
with Not_found -> s
|
||||||
|
|
||||||
|
let list () =
|
||||||
|
- List.map before_space (split_nl & run_and_read "%s list" ocamlfind)
|
||||||
|
+ let cmd = Shell.quote_filename_if_needed ocamlfind ^ " list" in
|
||||||
|
+ List.map before_space (split_nl & run_and_read cmd)
|
||||||
|
|
||||||
|
(* The closure algorithm is easy because the dependencies are already closed
|
||||||
|
and sorted for each package. We only have to make the union. We could also
|
||||||
|
--- ./src/main.ml
|
||||||
|
+++ ./src/main.ml
|
||||||
|
@@ -162,6 +162,9 @@
|
||||||
|
Tags.mem "traverse" tags
|
||||||
|
|| List.exists (Pathname.is_prefix path_name) !Options.include_dirs
|
||||||
|
|| List.exists (Pathname.is_prefix path_name) target_dirs)
|
||||||
|
+ && ((* beware: !Options.build_dir is an absolute directory *)
|
||||||
|
+ Pathname.normalize !Options.build_dir
|
||||||
|
+ <> Pathname.normalize (Pathname.pwd/path_name))
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
--- ./src/my_std.ml
|
||||||
|
+++ ./src/my_std.ml
|
||||||
|
@@ -271,13 +271,107 @@
|
||||||
|
try Array.iter (fun x -> if x = basename then raise Exit) a; false
|
||||||
|
with Exit -> true
|
||||||
|
|
||||||
|
+let command_plain = function
|
||||||
|
+| [| |] -> 0
|
||||||
|
+| margv ->
|
||||||
|
+ let rec waitpid a b =
|
||||||
|
+ match Unix.waitpid a b with
|
||||||
|
+ | exception (Unix.Unix_error(Unix.EINTR,_,_)) -> waitpid a b
|
||||||
|
+ | x -> x
|
||||||
|
+ in
|
||||||
|
+ let pid = Unix.(create_process margv.(0) margv stdin stdout stderr) in
|
||||||
|
+ let pid', process_status = waitpid [] pid in
|
||||||
|
+ assert (pid = pid');
|
||||||
|
+ match process_status with
|
||||||
|
+ | Unix.WEXITED n -> n
|
||||||
|
+ | Unix.WSIGNALED _ -> 2 (* like OCaml's uncaught exceptions *)
|
||||||
|
+ | Unix.WSTOPPED _ -> 127
|
||||||
|
+
|
||||||
|
+(* can't use Lexers because of circular dependency *)
|
||||||
|
+let split_path_win str =
|
||||||
|
+ let rec aux pos =
|
||||||
|
+ try
|
||||||
|
+ let i = String.index_from str pos ';' in
|
||||||
|
+ let len = i - pos in
|
||||||
|
+ if len = 0 then
|
||||||
|
+ aux (succ i)
|
||||||
|
+ else
|
||||||
|
+ String.sub str pos (i - pos) :: aux (succ i)
|
||||||
|
+ with Not_found | Invalid_argument _ ->
|
||||||
|
+ let len = String.length str - pos in
|
||||||
|
+ if len = 0 then [] else [String.sub str pos len]
|
||||||
|
+ in
|
||||||
|
+ aux 0
|
||||||
|
+
|
||||||
|
+let windows_shell = lazy begin
|
||||||
|
+ let rec iter = function
|
||||||
|
+ | [] -> [| "bash.exe" ; "--norc" ; "--noprofile" |]
|
||||||
|
+ | hd::tl ->
|
||||||
|
+ let dash = Filename.concat hd "dash.exe" in
|
||||||
|
+ if Sys.file_exists dash then [|dash|] else
|
||||||
|
+ let bash = Filename.concat hd "bash.exe" in
|
||||||
|
+ if Sys.file_exists bash = false then iter tl else
|
||||||
|
+ (* if sh.exe and bash.exe exist in the same dir, choose sh.exe *)
|
||||||
|
+ let sh = Filename.concat hd "sh.exe" in
|
||||||
|
+ if Sys.file_exists sh then [|sh|] else [|bash ; "--norc" ; "--noprofile"|]
|
||||||
|
+ in
|
||||||
|
+ split_path_win (try Sys.getenv "PATH" with Not_found -> "") |> iter
|
||||||
|
+end
|
||||||
|
+
|
||||||
|
+let prep_windows_cmd cmd =
|
||||||
|
+ (* workaround known ocaml bug, remove later *)
|
||||||
|
+ if String.contains cmd '\t' && String.contains cmd ' ' = false then
|
||||||
|
+ " " ^ cmd
|
||||||
|
+ else
|
||||||
|
+ cmd
|
||||||
|
+
|
||||||
|
+let run_with_shell = function
|
||||||
|
+| "" -> 0
|
||||||
|
+| cmd ->
|
||||||
|
+ let cmd = prep_windows_cmd cmd in
|
||||||
|
+ let shell = Lazy.force windows_shell in
|
||||||
|
+ let qlen = Filename.quote cmd |> String.length in
|
||||||
|
+ (* old versions of dash had problems with bs *)
|
||||||
|
+ try
|
||||||
|
+ if qlen < 7_900 then
|
||||||
|
+ command_plain (Array.append shell [| "-ec" ; cmd |])
|
||||||
|
+ else begin
|
||||||
|
+ (* it can still work, if the called command is a cygwin tool *)
|
||||||
|
+ let ch_closed = ref false in
|
||||||
|
+ let file_deleted = ref false in
|
||||||
|
+ let fln,ch =
|
||||||
|
+ Filename.open_temp_file
|
||||||
|
+ ~mode:[Open_binary]
|
||||||
|
+ "ocamlbuildtmp"
|
||||||
|
+ ".sh"
|
||||||
|
+ in
|
||||||
|
+ try
|
||||||
|
+ let f_slash = String.map ( fun x -> if x = '\\' then '/' else x ) fln in
|
||||||
|
+ output_string ch cmd;
|
||||||
|
+ ch_closed:= true;
|
||||||
|
+ close_out ch;
|
||||||
|
+ let ret = command_plain (Array.append shell [| "-e" ; f_slash |]) in
|
||||||
|
+ file_deleted:= true;
|
||||||
|
+ Sys.remove fln;
|
||||||
|
+ ret
|
||||||
|
+ with
|
||||||
|
+ | x ->
|
||||||
|
+ if !ch_closed = false then
|
||||||
|
+ close_out_noerr ch;
|
||||||
|
+ if !file_deleted = false then
|
||||||
|
+ (try Sys.remove fln with _ -> ());
|
||||||
|
+ raise x
|
||||||
|
+ end
|
||||||
|
+ with
|
||||||
|
+ | (Unix.Unix_error _) as x ->
|
||||||
|
+ (* Sys.command doesn't raise an exception, so run_with_shell also won't
|
||||||
|
+ raise *)
|
||||||
|
+ Printexc.to_string x ^ ":" ^ cmd |> prerr_endline;
|
||||||
|
+ 1
|
||||||
|
+
|
||||||
|
let sys_command =
|
||||||
|
- match Sys.os_type with
|
||||||
|
- | "Win32" -> fun cmd ->
|
||||||
|
- if cmd = "" then 0 else
|
||||||
|
- let cmd = "bash --norc -c " ^ Filename.quote cmd in
|
||||||
|
- Sys.command cmd
|
||||||
|
- | _ -> fun cmd -> if cmd = "" then 0 else Sys.command cmd
|
||||||
|
+ if Sys.win32 then run_with_shell
|
||||||
|
+ else fun cmd -> if cmd = "" then 0 else Sys.command cmd
|
||||||
|
|
||||||
|
(* FIXME warning fix and use Filename.concat *)
|
||||||
|
let filename_concat x y =
|
||||||
|
--- ./src/my_std.mli
|
||||||
|
+++ ./src/my_std.mli
|
||||||
|
@@ -69,3 +69,6 @@
|
||||||
|
|
||||||
|
val split_ocaml_version : (int * int * int * string) option
|
||||||
|
(** (major, minor, patchlevel, rest) *)
|
||||||
|
+
|
||||||
|
+val windows_shell : string array Lazy.t
|
||||||
|
+val prep_windows_cmd : string -> string
|
||||||
|
--- ./src/ocamlbuild_executor.ml
|
||||||
|
+++ ./src/ocamlbuild_executor.ml
|
||||||
|
@@ -34,6 +34,8 @@
|
||||||
|
job_stdin : out_channel;
|
||||||
|
job_stderr : in_channel;
|
||||||
|
job_buffer : Buffer.t;
|
||||||
|
+ job_pid : int;
|
||||||
|
+ job_tmp_file: string option;
|
||||||
|
mutable job_dying : bool;
|
||||||
|
};;
|
||||||
|
|
||||||
|
@@ -76,6 +78,61 @@
|
||||||
|
in
|
||||||
|
loop 0
|
||||||
|
;;
|
||||||
|
+
|
||||||
|
+let open_process_full_win cmd env =
|
||||||
|
+ let (in_read, in_write) = Unix.pipe () in
|
||||||
|
+ let (out_read, out_write) = Unix.pipe () in
|
||||||
|
+ let (err_read, err_write) = Unix.pipe () in
|
||||||
|
+ Unix.set_close_on_exec in_read;
|
||||||
|
+ Unix.set_close_on_exec out_write;
|
||||||
|
+ Unix.set_close_on_exec err_read;
|
||||||
|
+ let inchan = Unix.in_channel_of_descr in_read in
|
||||||
|
+ let outchan = Unix.out_channel_of_descr out_write in
|
||||||
|
+ let errchan = Unix.in_channel_of_descr err_read in
|
||||||
|
+ let shell = Lazy.force Ocamlbuild_pack.My_std.windows_shell in
|
||||||
|
+ let test_cmd =
|
||||||
|
+ String.concat " " (List.map Filename.quote (Array.to_list shell)) ^
|
||||||
|
+ "-ec " ^
|
||||||
|
+ Filename.quote (Ocamlbuild_pack.My_std.prep_windows_cmd cmd) in
|
||||||
|
+ let argv,tmp_file =
|
||||||
|
+ if String.length test_cmd < 7_900 then
|
||||||
|
+ Array.append
|
||||||
|
+ shell
|
||||||
|
+ [| "-ec" ; Ocamlbuild_pack.My_std.prep_windows_cmd cmd |],None
|
||||||
|
+ else
|
||||||
|
+ let fln,ch = Filename.open_temp_file ~mode:[Open_binary] "ocamlbuild" ".sh" in
|
||||||
|
+ output_string ch (Ocamlbuild_pack.My_std.prep_windows_cmd cmd);
|
||||||
|
+ close_out ch;
|
||||||
|
+ let fln' = String.map (function '\\' -> '/' | c -> c) fln in
|
||||||
|
+ Array.append
|
||||||
|
+ shell
|
||||||
|
+ [| "-c" ; fln' |], Some fln in
|
||||||
|
+ let pid =
|
||||||
|
+ Unix.create_process_env argv.(0) argv env out_read in_write err_write in
|
||||||
|
+ Unix.close out_read;
|
||||||
|
+ Unix.close in_write;
|
||||||
|
+ Unix.close err_write;
|
||||||
|
+ (pid, inchan, outchan, errchan,tmp_file)
|
||||||
|
+
|
||||||
|
+let close_process_full_win (pid,inchan, outchan, errchan, tmp_file) =
|
||||||
|
+ let delete tmp_file =
|
||||||
|
+ match tmp_file with
|
||||||
|
+ | None -> ()
|
||||||
|
+ | Some x -> try Sys.remove x with Sys_error _ -> () in
|
||||||
|
+ let tmp_file_deleted = ref false in
|
||||||
|
+ try
|
||||||
|
+ close_in inchan;
|
||||||
|
+ close_out outchan;
|
||||||
|
+ close_in errchan;
|
||||||
|
+ let res = snd(Unix.waitpid [] pid) in
|
||||||
|
+ tmp_file_deleted := true;
|
||||||
|
+ delete tmp_file;
|
||||||
|
+ res
|
||||||
|
+ with
|
||||||
|
+ | x when tmp_file <> None && !tmp_file_deleted = false ->
|
||||||
|
+ delete tmp_file;
|
||||||
|
+ raise x
|
||||||
|
+
|
||||||
|
(* ***)
|
||||||
|
(*** execute *)
|
||||||
|
(* XXX: Add test for non reentrancy *)
|
||||||
|
@@ -130,10 +187,16 @@
|
||||||
|
(*** add_job *)
|
||||||
|
let add_job cmd rest result id =
|
||||||
|
(*display begin fun oc -> fp oc "Job %a is %s\n%!" print_job_id id cmd; end;*)
|
||||||
|
- let (stdout', stdin', stderr') = open_process_full cmd env in
|
||||||
|
+ let (pid,stdout', stdin', stderr', tmp_file) =
|
||||||
|
+ if Sys.win32 then open_process_full_win cmd env else
|
||||||
|
+ let a,b,c = open_process_full cmd env in
|
||||||
|
+ -1,a,b,c,None
|
||||||
|
+ in
|
||||||
|
incr jobs_active;
|
||||||
|
- set_nonblock (doi stdout');
|
||||||
|
- set_nonblock (doi stderr');
|
||||||
|
+ if not Sys.win32 then (
|
||||||
|
+ set_nonblock (doi stdout');
|
||||||
|
+ set_nonblock (doi stderr');
|
||||||
|
+ );
|
||||||
|
let job =
|
||||||
|
{ job_id = id;
|
||||||
|
job_command = cmd;
|
||||||
|
@@ -143,7 +206,9 @@
|
||||||
|
job_stdin = stdin';
|
||||||
|
job_stderr = stderr';
|
||||||
|
job_buffer = Buffer.create 1024;
|
||||||
|
- job_dying = false }
|
||||||
|
+ job_dying = false;
|
||||||
|
+ job_tmp_file = tmp_file;
|
||||||
|
+ job_pid = pid }
|
||||||
|
in
|
||||||
|
outputs := FDM.add (doi stdout') job (FDM.add (doi stderr') job !outputs);
|
||||||
|
jobs := JS.add job !jobs;
|
||||||
|
@@ -199,6 +264,7 @@
|
||||||
|
try
|
||||||
|
read fd u 0 (Bytes.length u)
|
||||||
|
with
|
||||||
|
+ | Unix.Unix_error(Unix.EPIPE,_,_) when Sys.win32 -> 0
|
||||||
|
| Unix.Unix_error(e,_,_) ->
|
||||||
|
let msg = error_message e in
|
||||||
|
display (fun oc -> fp oc
|
||||||
|
@@ -241,14 +307,19 @@
|
||||||
|
decr jobs_active;
|
||||||
|
|
||||||
|
(* PR#5371: we would get EAGAIN below otherwise *)
|
||||||
|
- clear_nonblock (doi job.job_stdout);
|
||||||
|
- clear_nonblock (doi job.job_stderr);
|
||||||
|
-
|
||||||
|
+ if not Sys.win32 then (
|
||||||
|
+ clear_nonblock (doi job.job_stdout);
|
||||||
|
+ clear_nonblock (doi job.job_stderr);
|
||||||
|
+ );
|
||||||
|
do_read ~loop:true (doi job.job_stdout) job;
|
||||||
|
do_read ~loop:true (doi job.job_stderr) job;
|
||||||
|
outputs := FDM.remove (doi job.job_stdout) (FDM.remove (doi job.job_stderr) !outputs);
|
||||||
|
jobs := JS.remove job !jobs;
|
||||||
|
- let status = close_process_full (job.job_stdout, job.job_stdin, job.job_stderr) in
|
||||||
|
+ let status =
|
||||||
|
+ if Sys.win32 then
|
||||||
|
+ close_process_full_win (job.job_pid, job.job_stdout, job.job_stdin, job.job_stderr, job.job_tmp_file)
|
||||||
|
+ else
|
||||||
|
+ close_process_full (job.job_stdout, job.job_stdin, job.job_stderr) in
|
||||||
|
|
||||||
|
let shown = ref false in
|
||||||
|
|
||||||
|
--- ./src/ocamlbuild_unix_plugin.ml
|
||||||
|
+++ ./src/ocamlbuild_unix_plugin.ml
|
||||||
|
@@ -48,12 +48,22 @@
|
||||||
|
end
|
||||||
|
|
||||||
|
let run_and_open s kont =
|
||||||
|
+ let s_orig = s in
|
||||||
|
+ let s =
|
||||||
|
+ (* Be consistent! My_unix.run_and_open uses My_std.sys_command and
|
||||||
|
+ sys_command uses bash. *)
|
||||||
|
+ if Sys.win32 = false then s else
|
||||||
|
+ let l = match Lazy.force My_std.windows_shell |> Array.to_list with
|
||||||
|
+ | hd::tl -> (Filename.quote hd)::tl
|
||||||
|
+ | _ -> assert false in
|
||||||
|
+ "\"" ^ (String.concat " " l) ^ " -ec " ^ Filename.quote (" " ^ s) ^ "\""
|
||||||
|
+ in
|
||||||
|
let ic = Unix.open_process_in s in
|
||||||
|
let close () =
|
||||||
|
match Unix.close_process_in ic with
|
||||||
|
| Unix.WEXITED 0 -> ()
|
||||||
|
| Unix.WEXITED _ | Unix.WSIGNALED _ | Unix.WSTOPPED _ ->
|
||||||
|
- failwith (Printf.sprintf "Error while running: %s" s) in
|
||||||
|
+ failwith (Printf.sprintf "Error while running: %s" s_orig) in
|
||||||
|
let res = try
|
||||||
|
kont ic
|
||||||
|
with e -> (close (); raise e)
|
||||||
|
--- ./src/options.ml
|
||||||
|
+++ ./src/options.ml
|
||||||
|
@@ -174,11 +174,24 @@
|
||||||
|
build_dir := Filename.concat (Sys.getcwd ()) s
|
||||||
|
else
|
||||||
|
build_dir := s
|
||||||
|
+
|
||||||
|
+let slashify =
|
||||||
|
+ if Sys.win32 then fun p -> String.map (function '\\' -> '/' | x -> x) p
|
||||||
|
+ else fun p ->p
|
||||||
|
+
|
||||||
|
+let sb () =
|
||||||
|
+ match Sys.os_type with
|
||||||
|
+ | "Win32" ->
|
||||||
|
+ (try set_binary_mode_out stdout true with _ -> ());
|
||||||
|
+ | _ -> ()
|
||||||
|
+
|
||||||
|
+
|
||||||
|
let spec = ref (
|
||||||
|
let print_version () =
|
||||||
|
+ sb ();
|
||||||
|
Printf.printf "ocamlbuild %s\n%!" Ocamlbuild_config.version; raise Exit_OK
|
||||||
|
in
|
||||||
|
- let print_vnum () = print_endline Ocamlbuild_config.version; raise Exit_OK in
|
||||||
|
+ let print_vnum () = sb (); print_endline Ocamlbuild_config.version; raise Exit_OK in
|
||||||
|
Arg.align
|
||||||
|
[
|
||||||
|
"-version", Unit print_version , " Display the version";
|
||||||
|
@@ -257,8 +270,8 @@
|
||||||
|
"-build-dir", String set_build_dir, "<path> Set build directory (implies no-links)";
|
||||||
|
"-install-lib-dir", Set_string Ocamlbuild_where.libdir, "<path> Set the install library directory";
|
||||||
|
"-install-bin-dir", Set_string Ocamlbuild_where.bindir, "<path> Set the install binary directory";
|
||||||
|
- "-where", Unit (fun () -> print_endline !Ocamlbuild_where.libdir; raise Exit_OK), " Display the install library directory";
|
||||||
|
- "-which", String (fun cmd -> print_endline (find_tool cmd); raise Exit_OK), "<command> Display path to the tool command";
|
||||||
|
+ "-where", Unit (fun () -> sb (); print_endline (slashify !Ocamlbuild_where.libdir); raise Exit_OK), " Display the install library directory";
|
||||||
|
+ "-which", String (fun cmd -> sb (); print_endline (slashify (find_tool cmd)); raise Exit_OK), "<command> Display path to the tool command";
|
||||||
|
"-ocamlc", set_cmd ocamlc, "<command> Set the OCaml bytecode compiler";
|
||||||
|
"-plugin-ocamlc", set_cmd plugin_ocamlc, "<command> Set the OCaml bytecode compiler \
|
||||||
|
used when building myocamlbuild.ml (only)";
|
||||||
|
--- ./src/pathname.ml
|
||||||
|
+++ ./src/pathname.ml
|
||||||
|
@@ -84,6 +84,26 @@
|
||||||
|
| x :: xs -> x :: normalize_list xs
|
||||||
|
|
||||||
|
let normalize x =
|
||||||
|
+ let x =
|
||||||
|
+ if Sys.win32 = false then
|
||||||
|
+ x
|
||||||
|
+ else
|
||||||
|
+ let len = String.length x in
|
||||||
|
+ let b = Bytes.create len in
|
||||||
|
+ for i = 0 to pred len do
|
||||||
|
+ match x.[i] with
|
||||||
|
+ | '\\' -> Bytes.set b i '/'
|
||||||
|
+ | c -> Bytes.set b i c
|
||||||
|
+ done;
|
||||||
|
+ if len > 1 then (
|
||||||
|
+ let c1 = Bytes.get b 0 in
|
||||||
|
+ let c2 = Bytes.get b 1 in
|
||||||
|
+ if c2 = ':' && c1 >= 'a' && c1 <= 'z' &&
|
||||||
|
+ ( len = 2 || Bytes.get b 2 = '/') then
|
||||||
|
+ Bytes.set b 0 (Char.uppercase_ascii c1)
|
||||||
|
+ );
|
||||||
|
+ Bytes.unsafe_to_string b
|
||||||
|
+ in
|
||||||
|
if Glob.eval not_normal_form_re x then
|
||||||
|
let root, paths = split x in
|
||||||
|
join root (normalize_list paths)
|
||||||
|
--- ./src/shell.ml
|
||||||
|
+++ ./src/shell.ml
|
||||||
|
@@ -24,12 +24,26 @@
|
||||||
|
| 'a'..'z' | 'A'..'Z' | '0'..'9' | '.' | '-' | '/' | '_' | ':' | '@' | '+' | ',' -> loop (pos + 1)
|
||||||
|
| _ -> false in
|
||||||
|
loop 0
|
||||||
|
+
|
||||||
|
+let generic_quote quotequote s =
|
||||||
|
+ let l = String.length s in
|
||||||
|
+ let b = Buffer.create (l + 20) in
|
||||||
|
+ Buffer.add_char b '\'';
|
||||||
|
+ for i = 0 to l - 1 do
|
||||||
|
+ if s.[i] = '\''
|
||||||
|
+ then Buffer.add_string b quotequote
|
||||||
|
+ else Buffer.add_char b s.[i]
|
||||||
|
+ done;
|
||||||
|
+ Buffer.add_char b '\'';
|
||||||
|
+ Buffer.contents b
|
||||||
|
+let unix_quote = generic_quote "'\\''"
|
||||||
|
+
|
||||||
|
let quote_filename_if_needed s =
|
||||||
|
if is_simple_filename s then s
|
||||||
|
(* We should probably be using [Filename.unix_quote] except that function
|
||||||
|
* isn't exported. Users on Windows will have to live with not being able to
|
||||||
|
* install OCaml into c:\o'caml. Too bad. *)
|
||||||
|
- else if Sys.os_type = "Win32" then Printf.sprintf "'%s'" s
|
||||||
|
+ else if Sys.os_type = "Win32" then unix_quote s
|
||||||
|
else Filename.quote s
|
||||||
|
let chdir dir =
|
||||||
|
reset_filesys_cache ();
|
||||||
|
@@ -37,7 +51,7 @@
|
||||||
|
let run args target =
|
||||||
|
reset_readdir_cache ();
|
||||||
|
let cmd = String.concat " " (List.map quote_filename_if_needed args) in
|
||||||
|
- if !*My_unix.is_degraded || Sys.os_type = "Win32" then
|
||||||
|
+ if !*My_unix.is_degraded then
|
||||||
|
begin
|
||||||
|
Log.event cmd target Tags.empty;
|
||||||
|
let st = sys_command cmd in
|
||||||
@ -0,0 +1,27 @@ |
|||||||
|
{ |
||||||
|
"build": [ |
||||||
|
[ |
||||||
|
"bash", |
||||||
|
"-c", |
||||||
|
"#{os == 'windows' ? 'patch -p1 < ocamlbuild-0.14.0.patch' : 'true'}" |
||||||
|
], |
||||||
|
[ |
||||||
|
"make", |
||||||
|
"-f", |
||||||
|
"configure.make", |
||||||
|
"all", |
||||||
|
"OCAMLBUILD_PREFIX=#{self.install}", |
||||||
|
"OCAMLBUILD_BINDIR=#{self.bin}", |
||||||
|
"OCAMLBUILD_LIBDIR=#{self.lib}", |
||||||
|
"OCAMLBUILD_MANDIR=#{self.man}", |
||||||
|
"OCAMLBUILD_NATIVE=true", |
||||||
|
"OCAMLBUILD_NATIVE_TOOLS=true" |
||||||
|
], |
||||||
|
[ |
||||||
|
"make", |
||||||
|
"check-if-preinstalled", |
||||||
|
"all", |
||||||
|
"#{os == 'windows' ? 'install' : 'opam-install'}" |
||||||
|
] |
||||||
|
] |
||||||
|
} |
||||||
@ -0,0 +1,471 @@ |
|||||||
|
--- ./Makefile
|
||||||
|
+++ ./Makefile
|
||||||
|
@@ -57,16 +57,16 @@
|
||||||
|
cat findlib.conf.in | \
|
||||||
|
$(SH) tools/patch '@SITELIB@' '$(OCAML_SITELIB)' >findlib.conf
|
||||||
|
if ./tools/cmd_from_same_dir ocamlc; then \
|
||||||
|
- echo 'ocamlc="ocamlc.opt"' >>findlib.conf; \
|
||||||
|
+ echo 'ocamlc="ocamlc.opt$(EXEC_SUFFIX)"' >>findlib.conf; \
|
||||||
|
fi
|
||||||
|
if ./tools/cmd_from_same_dir ocamlopt; then \
|
||||||
|
- echo 'ocamlopt="ocamlopt.opt"' >>findlib.conf; \
|
||||||
|
+ echo 'ocamlopt="ocamlopt.opt$(EXEC_SUFFIX)"' >>findlib.conf; \
|
||||||
|
fi
|
||||||
|
if ./tools/cmd_from_same_dir ocamldep; then \
|
||||||
|
- echo 'ocamldep="ocamldep.opt"' >>findlib.conf; \
|
||||||
|
+ echo 'ocamldep="ocamldep.opt$(EXEC_SUFFIX)"' >>findlib.conf; \
|
||||||
|
fi
|
||||||
|
if ./tools/cmd_from_same_dir ocamldoc; then \
|
||||||
|
- echo 'ocamldoc="ocamldoc.opt"' >>findlib.conf; \
|
||||||
|
+ echo 'ocamldoc="ocamldoc.opt$(EXEC_SUFFIX)"' >>findlib.conf; \
|
||||||
|
fi
|
||||||
|
|
||||||
|
.PHONY: install-doc
|
||||||
|
--- ./src/findlib/findlib_config.mlp
|
||||||
|
+++ ./src/findlib/findlib_config.mlp
|
||||||
|
@@ -24,3 +24,5 @@
|
||||||
|
| "MacOS" -> "" (* don't know *)
|
||||||
|
| _ -> failwith "Unknown Sys.os_type"
|
||||||
|
;;
|
||||||
|
+
|
||||||
|
+let exec_suffix = "@EXEC_SUFFIX@";;
|
||||||
|
--- ./src/findlib/findlib.ml
|
||||||
|
+++ ./src/findlib/findlib.ml
|
||||||
|
@@ -28,15 +28,20 @@
|
||||||
|
let conf_ldconf = ref "";;
|
||||||
|
let conf_ignore_dups_in = ref ([] : string list);;
|
||||||
|
|
||||||
|
-let ocamlc_default = "ocamlc";;
|
||||||
|
-let ocamlopt_default = "ocamlopt";;
|
||||||
|
-let ocamlcp_default = "ocamlcp";;
|
||||||
|
-let ocamloptp_default = "ocamloptp";;
|
||||||
|
-let ocamlmklib_default = "ocamlmklib";;
|
||||||
|
-let ocamlmktop_default = "ocamlmktop";;
|
||||||
|
-let ocamldep_default = "ocamldep";;
|
||||||
|
-let ocamlbrowser_default = "ocamlbrowser";;
|
||||||
|
-let ocamldoc_default = "ocamldoc";;
|
||||||
|
+let add_exec str =
|
||||||
|
+ match Findlib_config.exec_suffix with
|
||||||
|
+ | "" -> str
|
||||||
|
+ | a -> str ^ a ;;
|
||||||
|
+let ocamlc_default = add_exec "ocamlc";;
|
||||||
|
+let ocamlopt_default = add_exec "ocamlopt";;
|
||||||
|
+let ocamlcp_default = add_exec "ocamlcp";;
|
||||||
|
+let ocamloptp_default = add_exec "ocamloptp";;
|
||||||
|
+let ocamlmklib_default = add_exec "ocamlmklib";;
|
||||||
|
+let ocamlmktop_default = add_exec "ocamlmktop";;
|
||||||
|
+let ocamldep_default = add_exec "ocamldep";;
|
||||||
|
+let ocamlbrowser_default = add_exec "ocamlbrowser";;
|
||||||
|
+let ocamldoc_default = add_exec "ocamldoc";;
|
||||||
|
+
|
||||||
|
|
||||||
|
|
||||||
|
let init_manually
|
||||||
|
--- ./src/findlib/fl_package_base.ml
|
||||||
|
+++ ./src/findlib/fl_package_base.ml
|
||||||
|
@@ -133,7 +133,15 @@
|
||||||
|
List.find (fun def -> def.def_var = "exists_if") p.package_defs in
|
||||||
|
let files = Fl_split.in_words def.def_value in
|
||||||
|
List.exists
|
||||||
|
- (fun file -> Sys.file_exists (Filename.concat d' file))
|
||||||
|
+ (fun file ->
|
||||||
|
+ let fln = Filename.concat d' file in
|
||||||
|
+ let e = Sys.file_exists fln in
|
||||||
|
+ (* necessary for ppx executables *)
|
||||||
|
+ if e || Sys.os_type <> "Win32" || Filename.check_suffix fln ".exe" then
|
||||||
|
+ e
|
||||||
|
+ else
|
||||||
|
+ Sys.file_exists (fln ^ ".exe")
|
||||||
|
+ )
|
||||||
|
files
|
||||||
|
with Not_found -> true in
|
||||||
|
|
||||||
|
--- ./src/findlib/fl_split.ml
|
||||||
|
+++ ./src/findlib/fl_split.ml
|
||||||
|
@@ -126,10 +126,17 @@
|
||||||
|
| '/' | '\\' -> true
|
||||||
|
| _ -> false in
|
||||||
|
let norm_dir_win() =
|
||||||
|
- if l >= 1 && s.[0] = '/' then
|
||||||
|
- Buffer.add_char b '\\' else Buffer.add_char b s.[0];
|
||||||
|
- if l >= 2 && s.[1] = '/' then
|
||||||
|
- Buffer.add_char b '\\' else Buffer.add_char b s.[1];
|
||||||
|
+ if l >= 1 then (
|
||||||
|
+ if s.[0] = '/' then
|
||||||
|
+ Buffer.add_char b '\\'
|
||||||
|
+ else
|
||||||
|
+ Buffer.add_char b s.[0] ;
|
||||||
|
+ if l >= 2 then
|
||||||
|
+ if s.[1] = '/' then
|
||||||
|
+ Buffer.add_char b '\\'
|
||||||
|
+ else
|
||||||
|
+ Buffer.add_char b s.[1];
|
||||||
|
+ );
|
||||||
|
for k = 2 to l - 1 do
|
||||||
|
let c = s.[k] in
|
||||||
|
if is_slash c then (
|
||||||
|
--- ./src/findlib/frontend.ml
|
||||||
|
+++ ./src/findlib/frontend.ml
|
||||||
|
@@ -31,10 +31,18 @@
|
||||||
|
else
|
||||||
|
Sys_error (arg ^ ": " ^ Unix.error_message code)
|
||||||
|
|
||||||
|
+let is_win = Sys.os_type = "Win32"
|
||||||
|
+
|
||||||
|
+let () =
|
||||||
|
+ match Findlib_config.system with
|
||||||
|
+ | "win32" | "win64" | "mingw" | "cygwin" | "mingw64" | "cygwin64" ->
|
||||||
|
+ (try set_binary_mode_out stdout true with _ -> ());
|
||||||
|
+ (try set_binary_mode_out stderr true with _ -> ());
|
||||||
|
+ | _ -> ()
|
||||||
|
|
||||||
|
let slashify s =
|
||||||
|
match Findlib_config.system with
|
||||||
|
- | "mingw" | "mingw64" | "cygwin" ->
|
||||||
|
+ | "win32" | "win64" | "mingw" | "cygwin" | "mingw64" | "cygwin64" ->
|
||||||
|
let b = Buffer.create 80 in
|
||||||
|
String.iter
|
||||||
|
(function
|
||||||
|
@@ -49,7 +57,7 @@
|
||||||
|
|
||||||
|
let out_path ?(prefix="") s =
|
||||||
|
match Findlib_config.system with
|
||||||
|
- | "mingw" | "mingw64" | "cygwin" ->
|
||||||
|
+ | "win32" | "win64" | "mingw" | "mingw64" | "cygwin" ->
|
||||||
|
let u = slashify s in
|
||||||
|
prefix ^
|
||||||
|
(if String.contains u ' ' then
|
||||||
|
@@ -273,11 +281,9 @@
|
||||||
|
|
||||||
|
|
||||||
|
let identify_dir d =
|
||||||
|
- match Sys.os_type with
|
||||||
|
- | "Win32" ->
|
||||||
|
- failwith "identify_dir" (* not available *)
|
||||||
|
- | _ ->
|
||||||
|
- let s = Unix.stat d in
|
||||||
|
+ if is_win then
|
||||||
|
+ failwith "identify_dir"; (* not available *)
|
||||||
|
+ let s = Unix.stat d in
|
||||||
|
(s.Unix.st_dev, s.Unix.st_ino)
|
||||||
|
;;
|
||||||
|
|
||||||
|
@@ -459,6 +465,96 @@
|
||||||
|
)
|
||||||
|
packages
|
||||||
|
|
||||||
|
+let rewrite_cmd s =
|
||||||
|
+ if s = "" || not is_win then
|
||||||
|
+ s
|
||||||
|
+ else
|
||||||
|
+ let s =
|
||||||
|
+ let l = String.length s in
|
||||||
|
+ let b = Buffer.create l in
|
||||||
|
+ for i = 0 to pred l do
|
||||||
|
+ match s.[i] with
|
||||||
|
+ | '/' -> Buffer.add_char b '\\'
|
||||||
|
+ | x -> Buffer.add_char b x
|
||||||
|
+ done;
|
||||||
|
+ Buffer.contents b
|
||||||
|
+ in
|
||||||
|
+ if (Filename.is_implicit s && String.contains s '\\' = false) ||
|
||||||
|
+ Filename.check_suffix (String.lowercase s) ".exe" then
|
||||||
|
+ s
|
||||||
|
+ else
|
||||||
|
+ let s' = s ^ ".exe" in
|
||||||
|
+ if Sys.file_exists s' then
|
||||||
|
+ s'
|
||||||
|
+ else
|
||||||
|
+ s
|
||||||
|
+
|
||||||
|
+let rewrite_cmd s =
|
||||||
|
+ if s = "" || not is_win then s else
|
||||||
|
+ let s =
|
||||||
|
+ let l = String.length s in
|
||||||
|
+ let b = Buffer.create l in
|
||||||
|
+ for i = 0 to pred l do
|
||||||
|
+ match s.[i] with
|
||||||
|
+ | '/' -> Buffer.add_char b '\\'
|
||||||
|
+ | x -> Buffer.add_char b x
|
||||||
|
+ done;
|
||||||
|
+ Buffer.contents b
|
||||||
|
+ in
|
||||||
|
+ if (Filename.is_implicit s && String.contains s '\\' = false) ||
|
||||||
|
+ Filename.check_suffix (String.lowercase s) ".exe" then
|
||||||
|
+ s
|
||||||
|
+ else
|
||||||
|
+ let s' = s ^ ".exe" in
|
||||||
|
+ if Sys.file_exists s' then
|
||||||
|
+ s'
|
||||||
|
+ else
|
||||||
|
+ s
|
||||||
|
+
|
||||||
|
+let rewrite_pp cmd =
|
||||||
|
+ if not is_win then cmd else
|
||||||
|
+ let module T = struct exception Keep end in
|
||||||
|
+ let is_whitespace = function
|
||||||
|
+ | ' ' | '\011' | '\012' | '\n' | '\r' | '\t' -> true
|
||||||
|
+ | _ -> false in
|
||||||
|
+ (* characters that triggers special behaviour (cmd.exe, not unix shell) *)
|
||||||
|
+ let is_unsafe_char = function
|
||||||
|
+ | '(' | ')' | '%' | '!' | '^' | '<' | '>' | '&' -> true
|
||||||
|
+ | _ -> false in
|
||||||
|
+ let len = String.length cmd in
|
||||||
|
+ let buf = Buffer.create (len + 4) in
|
||||||
|
+ let buf_cmd = Buffer.create len in
|
||||||
|
+ let rec iter_ws i =
|
||||||
|
+ if i >= len then () else
|
||||||
|
+ let cur = cmd.[i] in
|
||||||
|
+ if is_whitespace cur then (
|
||||||
|
+ Buffer.add_char buf cur;
|
||||||
|
+ iter_ws (succ i)
|
||||||
|
+ )
|
||||||
|
+ else
|
||||||
|
+ iter_cmd i
|
||||||
|
+ and iter_cmd i =
|
||||||
|
+ if i >= len then add_buf_cmd () else
|
||||||
|
+ let cur = cmd.[i] in
|
||||||
|
+ if is_unsafe_char cur || cur = '"' || cur = '\'' then
|
||||||
|
+ raise T.Keep;
|
||||||
|
+ if is_whitespace cur then (
|
||||||
|
+ add_buf_cmd ();
|
||||||
|
+ Buffer.add_substring buf cmd i (len - i)
|
||||||
|
+ )
|
||||||
|
+ else (
|
||||||
|
+ Buffer.add_char buf_cmd cur;
|
||||||
|
+ iter_cmd (succ i)
|
||||||
|
+ )
|
||||||
|
+ and add_buf_cmd () =
|
||||||
|
+ if Buffer.length buf_cmd > 0 then
|
||||||
|
+ Buffer.add_string buf (rewrite_cmd (Buffer.contents buf_cmd))
|
||||||
|
+ in
|
||||||
|
+ try
|
||||||
|
+ iter_ws 0;
|
||||||
|
+ Buffer.contents buf
|
||||||
|
+ with
|
||||||
|
+ | T.Keep -> cmd
|
||||||
|
|
||||||
|
let process_pp_spec syntax_preds packages pp_opts =
|
||||||
|
(* Returns: pp_command *)
|
||||||
|
@@ -549,7 +645,7 @@
|
||||||
|
None -> []
|
||||||
|
| Some cmd ->
|
||||||
|
["-pp";
|
||||||
|
- cmd ^ " " ^
|
||||||
|
+ (rewrite_cmd cmd) ^ " " ^
|
||||||
|
String.concat " " (List.map Filename.quote pp_i_options) ^ " " ^
|
||||||
|
String.concat " " (List.map Filename.quote pp_archives) ^ " " ^
|
||||||
|
String.concat " " (List.map Filename.quote pp_opts)]
|
||||||
|
@@ -625,9 +721,11 @@
|
||||||
|
in
|
||||||
|
try
|
||||||
|
let preprocessor =
|
||||||
|
+ rewrite_cmd (
|
||||||
|
resolve_path
|
||||||
|
~base ~explicit:true
|
||||||
|
- (package_property predicates pname "ppx") in
|
||||||
|
+ (package_property predicates pname "ppx") )
|
||||||
|
+ in
|
||||||
|
["-ppx"; String.concat " " (preprocessor :: options)]
|
||||||
|
with Not_found -> []
|
||||||
|
)
|
||||||
|
@@ -895,6 +993,14 @@
|
||||||
|
switch (e.g. -L<path> instead of -L <path>)
|
||||||
|
*)
|
||||||
|
|
||||||
|
+(* We may need to remove files on which we do not have complete control.
|
||||||
|
+ On Windows, removing a read-only file fails so try to change the
|
||||||
|
+ mode of the file first. *)
|
||||||
|
+let remove_file fname =
|
||||||
|
+ try Sys.remove fname
|
||||||
|
+ with Sys_error _ when is_win ->
|
||||||
|
+ (try Unix.chmod fname 0o666 with Unix.Unix_error _ -> ());
|
||||||
|
+ Sys.remove fname
|
||||||
|
|
||||||
|
let ocamlc which () =
|
||||||
|
|
||||||
|
@@ -1022,9 +1128,12 @@
|
||||||
|
|
||||||
|
"-intf",
|
||||||
|
Arg.String (fun s -> pass_files := !pass_files @ [ Intf(slashify s) ]);
|
||||||
|
-
|
||||||
|
+
|
||||||
|
"-pp",
|
||||||
|
- Arg.String (fun s -> pp_specified := true; add_spec_fn "-pp" s);
|
||||||
|
+ Arg.String (fun s -> pp_specified := true; add_spec_fn "-pp" (rewrite_pp s));
|
||||||
|
+
|
||||||
|
+ "-ppx",
|
||||||
|
+ Arg.String (fun s -> add_spec_fn "-ppx" (rewrite_pp s));
|
||||||
|
|
||||||
|
"-thread",
|
||||||
|
Arg.Unit (fun _ -> threads := threads_default);
|
||||||
|
@@ -1237,7 +1346,7 @@
|
||||||
|
with
|
||||||
|
any ->
|
||||||
|
close_out initl;
|
||||||
|
- Sys.remove initl_file_name;
|
||||||
|
+ remove_file initl_file_name;
|
||||||
|
raise any
|
||||||
|
end;
|
||||||
|
|
||||||
|
@@ -1245,9 +1354,9 @@
|
||||||
|
at_exit
|
||||||
|
(fun () ->
|
||||||
|
let tr f x = try f x with _ -> () in
|
||||||
|
- tr Sys.remove initl_file_name;
|
||||||
|
- tr Sys.remove (Filename.chop_extension initl_file_name ^ ".cmi");
|
||||||
|
- tr Sys.remove (Filename.chop_extension initl_file_name ^ ".cmo");
|
||||||
|
+ tr remove_file initl_file_name;
|
||||||
|
+ tr remove_file (Filename.chop_extension initl_file_name ^ ".cmi");
|
||||||
|
+ tr remove_file (Filename.chop_extension initl_file_name ^ ".cmo");
|
||||||
|
);
|
||||||
|
|
||||||
|
let exclude_list = [ stdlibdir; threads_dir; vmthreads_dir ] in
|
||||||
|
@@ -1493,7 +1602,9 @@
|
||||||
|
[ "-v", Arg.Unit (fun () -> verbose := Verbose);
|
||||||
|
"-pp", Arg.String (fun s ->
|
||||||
|
pp_specified := true;
|
||||||
|
- options := !options @ ["-pp"; s]);
|
||||||
|
+ options := !options @ ["-pp"; rewrite_pp s]);
|
||||||
|
+ "-ppx", Arg.String (fun s ->
|
||||||
|
+ options := !options @ ["-ppx"; rewrite_pp s]);
|
||||||
|
]
|
||||||
|
)
|
||||||
|
)
|
||||||
|
@@ -1672,7 +1783,9 @@
|
||||||
|
Arg.String (fun s -> add_spec_fn "-I" (slashify (resolve_path s)));
|
||||||
|
|
||||||
|
"-pp", Arg.String (fun s -> pp_specified := true;
|
||||||
|
- add_spec_fn "-pp" s);
|
||||||
|
+ add_spec_fn "-pp" (rewrite_pp s));
|
||||||
|
+ "-ppx", Arg.String (fun s -> add_spec_fn "-ppx" (rewrite_pp s));
|
||||||
|
+
|
||||||
|
]
|
||||||
|
)
|
||||||
|
)
|
||||||
|
@@ -1830,7 +1943,10 @@
|
||||||
|
output_string ch_out append;
|
||||||
|
close_out ch_out;
|
||||||
|
close_in ch_in;
|
||||||
|
- Unix.utimes outpath s.Unix.st_mtime s.Unix.st_mtime;
|
||||||
|
+ (try Unix.utimes outpath s.Unix.st_mtime s.Unix.st_mtime
|
||||||
|
+ with Unix.Unix_error(e,_,_) ->
|
||||||
|
+ prerr_endline("Warning: setting utimes for " ^ outpath
|
||||||
|
+ ^ ": " ^ Unix.error_message e));
|
||||||
|
|
||||||
|
prerr_endline("Installed " ^ outpath);
|
||||||
|
with
|
||||||
|
@@ -1882,6 +1998,8 @@
|
||||||
|
Unix.openfile (Filename.concat dir owner_file) [Unix.O_RDONLY] 0 in
|
||||||
|
let f =
|
||||||
|
Unix.in_channel_of_descr fd in
|
||||||
|
+ if is_win then
|
||||||
|
+ set_binary_mode_in f false;
|
||||||
|
try
|
||||||
|
let line = input_line f in
|
||||||
|
let is_my_file = (line = pkg) in
|
||||||
|
@@ -2208,7 +2326,7 @@
|
||||||
|
let lines = read_ldconf !ldconf in
|
||||||
|
let dlldir_norm = Fl_split.norm_dir dlldir in
|
||||||
|
let dlldir_norm_lc = string_lowercase_ascii dlldir_norm in
|
||||||
|
- let ci_filesys = (Sys.os_type = "Win32") in
|
||||||
|
+ let ci_filesys = is_win in
|
||||||
|
let check_dir d =
|
||||||
|
let d' = Fl_split.norm_dir d in
|
||||||
|
(d' = dlldir_norm) ||
|
||||||
|
@@ -2356,7 +2474,7 @@
|
||||||
|
List.iter
|
||||||
|
(fun file ->
|
||||||
|
let absfile = Filename.concat dlldir file in
|
||||||
|
- Sys.remove absfile;
|
||||||
|
+ remove_file absfile;
|
||||||
|
prerr_endline ("Removed " ^ absfile)
|
||||||
|
)
|
||||||
|
dll_files
|
||||||
|
@@ -2365,7 +2483,7 @@
|
||||||
|
(* Remove the files from the package directory: *)
|
||||||
|
if Sys.file_exists pkgdir then begin
|
||||||
|
let files = Sys.readdir pkgdir in
|
||||||
|
- Array.iter (fun f -> Sys.remove (Filename.concat pkgdir f)) files;
|
||||||
|
+ Array.iter (fun f -> remove_file (Filename.concat pkgdir f)) files;
|
||||||
|
Unix.rmdir pkgdir;
|
||||||
|
prerr_endline ("Removed " ^ pkgdir)
|
||||||
|
end
|
||||||
|
@@ -2415,7 +2533,9 @@
|
||||||
|
|
||||||
|
|
||||||
|
let print_configuration() =
|
||||||
|
+ let sl = slashify in
|
||||||
|
let dir s =
|
||||||
|
+ let s = sl s in
|
||||||
|
if Sys.file_exists s then
|
||||||
|
s
|
||||||
|
else
|
||||||
|
@@ -2453,27 +2573,27 @@
|
||||||
|
if md = "" then "the corresponding package directories" else dir md
|
||||||
|
);
|
||||||
|
Printf.printf "The standard library is assumed to reside in:\n %s\n"
|
||||||
|
- (Findlib.ocaml_stdlib());
|
||||||
|
+ (sl (Findlib.ocaml_stdlib()));
|
||||||
|
Printf.printf "The ld.conf file can be found here:\n %s\n"
|
||||||
|
- (Findlib.ocaml_ldconf());
|
||||||
|
+ (sl (Findlib.ocaml_ldconf()));
|
||||||
|
flush stdout
|
||||||
|
| Some "conf" ->
|
||||||
|
- print_endline (Findlib.config_file())
|
||||||
|
+ print_endline (sl (Findlib.config_file()))
|
||||||
|
| Some "path" ->
|
||||||
|
- List.iter print_endline (Findlib.search_path())
|
||||||
|
+ List.iter ( fun x -> print_endline (sl x)) (Findlib.search_path())
|
||||||
|
| Some "destdir" ->
|
||||||
|
- print_endline (Findlib.default_location())
|
||||||
|
+ print_endline ( sl (Findlib.default_location()))
|
||||||
|
| Some "metadir" ->
|
||||||
|
- print_endline (Findlib.meta_directory())
|
||||||
|
+ print_endline ( sl (Findlib.meta_directory()))
|
||||||
|
| Some "metapath" ->
|
||||||
|
let mdir = Findlib.meta_directory() in
|
||||||
|
let ddir = Findlib.default_location() in
|
||||||
|
- print_endline
|
||||||
|
- (if mdir <> "" then mdir ^ "/META.%s" else ddir ^ "/%s/META")
|
||||||
|
+ print_endline ( sl
|
||||||
|
+ (if mdir <> "" then mdir ^ "/META.%s" else ddir ^ "/%s/META"))
|
||||||
|
| Some "stdlib" ->
|
||||||
|
- print_endline (Findlib.ocaml_stdlib())
|
||||||
|
+ print_endline ( sl (Findlib.ocaml_stdlib()))
|
||||||
|
| Some "ldconf" ->
|
||||||
|
- print_endline (Findlib.ocaml_ldconf())
|
||||||
|
+ print_endline ( sl (Findlib.ocaml_ldconf()))
|
||||||
|
| _ ->
|
||||||
|
assert false
|
||||||
|
;;
|
||||||
|
@@ -2481,7 +2601,7 @@
|
||||||
|
|
||||||
|
let ocamlcall pkg cmd =
|
||||||
|
let dir = package_directory pkg in
|
||||||
|
- let path = Filename.concat dir cmd in
|
||||||
|
+ let path = rewrite_cmd (Filename.concat dir cmd) in
|
||||||
|
begin
|
||||||
|
try Unix.access path [ Unix.X_OK ]
|
||||||
|
with
|
||||||
|
@@ -2647,6 +2767,10 @@
|
||||||
|
| Sys_error f ->
|
||||||
|
prerr_endline ("ocamlfind: " ^ f);
|
||||||
|
exit 2
|
||||||
|
+ | Unix.Unix_error (e, fn, f) ->
|
||||||
|
+ prerr_endline ("ocamlfind: " ^ fn ^ " " ^ f
|
||||||
|
+ ^ ": " ^ Unix.error_message e);
|
||||||
|
+ exit 2
|
||||||
|
| Findlib.No_such_package(pkg,info) ->
|
||||||
|
prerr_endline ("ocamlfind: Package `" ^ pkg ^ "' not found" ^
|
||||||
|
(if info <> "" then " - " ^ info else ""));
|
||||||
|
--- ./src/findlib/Makefile
|
||||||
|
+++ ./src/findlib/Makefile
|
||||||
|
@@ -90,6 +90,7 @@
|
||||||
|
cat findlib_config.mlp | \
|
||||||
|
$(SH) $(TOP)/tools/patch '@CONFIGFILE@' '$(OCAMLFIND_CONF)' | \
|
||||||
|
$(SH) $(TOP)/tools/patch '@STDLIB@' '$(OCAML_CORE_STDLIB)' | \
|
||||||
|
+ $(SH) $(TOP)/tools/patch '@EXEC_SUFFIX@' '$(EXEC_SUFFIX)' | \
|
||||||
|
sed -e 's;@AUTOLINK@;$(OCAML_AUTOLINK);g' \
|
||||||
|
-e 's;@SYSTEM@;$(SYSTEM);g' \
|
||||||
|
>findlib_config.ml
|
||||||
@ -0,0 +1,61 @@ |
|||||||
|
{ |
||||||
|
"build": [ |
||||||
|
[ |
||||||
|
"bash", |
||||||
|
"-c", |
||||||
|
"#{os == 'windows' ? 'patch -p1 < findlib-1.8.1.patch' : 'true'}" |
||||||
|
], |
||||||
|
[ |
||||||
|
"./configure", |
||||||
|
"-bindir", |
||||||
|
"#{self.bin}", |
||||||
|
"-sitelib", |
||||||
|
"#{self.lib}", |
||||||
|
"-mandir", |
||||||
|
"#{self.man}", |
||||||
|
"-config", |
||||||
|
"#{self.lib}/findlib.conf", |
||||||
|
"-no-custom", |
||||||
|
"-no-topfind" |
||||||
|
], |
||||||
|
[ |
||||||
|
"make", |
||||||
|
"all" |
||||||
|
], |
||||||
|
[ |
||||||
|
"make", |
||||||
|
"opt" |
||||||
|
] |
||||||
|
], |
||||||
|
"install": [ |
||||||
|
[ |
||||||
|
"make", |
||||||
|
"install" |
||||||
|
], |
||||||
|
[ |
||||||
|
"install", |
||||||
|
"-m", |
||||||
|
"0755", |
||||||
|
"ocaml-stub", |
||||||
|
"#{self.bin}/ocaml" |
||||||
|
], |
||||||
|
[ |
||||||
|
"mkdir", |
||||||
|
"-p", |
||||||
|
"#{self.toplevel}" |
||||||
|
], |
||||||
|
[ |
||||||
|
"install", |
||||||
|
"-m", |
||||||
|
"0644", |
||||||
|
"src/findlib/topfind", |
||||||
|
"#{self.toplevel}/topfind" |
||||||
|
] |
||||||
|
], |
||||||
|
"exportedEnv": { |
||||||
|
"OCAML_TOPLEVEL_PATH": { |
||||||
|
"val": "#{self.toplevel}", |
||||||
|
"scope": "global" |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
@ -0,0 +1,6 @@ |
|||||||
|
{ |
||||||
|
"devDependencies": { |
||||||
|
"ocaml": "~4.6.0", |
||||||
|
"@esy-ocaml/reason": "*" |
||||||
|
} |
||||||
|
} |
||||||
Loading…
Reference in new issue