diff --git a/.gitignore b/.gitignore index 71050871..340d098a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,8 @@ .DS_Store .merlin +!/.merlin npm-debug.log *.install -_build examples/*/lib test/lib node_modules diff --git a/.merlin b/.merlin new file mode 100644 index 00000000..fe55a8d0 --- /dev/null +++ b/.merlin @@ -0,0 +1,13 @@ +B src +B src/vendor +B src/vendor/odoc_parser +B src/vendor/omd +B src/vendor/res_outcome_printer + +S src +S src/vendor +S src/vendor/odoc_parser +S src/vendor/omd +S src/vendor/res_outcome_printer + +FLG -w +26+27+32+33+39 diff --git a/Makefile b/Makefile index cc262526..0a2adc86 100644 --- a/Makefile +++ b/Makefile @@ -27,9 +27,12 @@ lib/rescript-editor-support.exe: $(SOURCE_FILES) build-native: lib/rescript-editor-support.exe depend +dce: build-native + node_modules/.bin/reanalyze -dce-cmt src -suppress src/vendor + clean: git clean -dfx src .DEFAULT_GOAL := build-native -.PHONY: depend clean build-native +.PHONY: depend clean build-native dce diff --git a/Readme.md b/Readme.md index e01307ab..dd6fed6f 100644 --- a/Readme.md +++ b/Readme.md @@ -8,23 +8,22 @@ The binary reads the `.cmt` and `.cmti` files and analyses them. ``` opam switch 4.06.1 -opam opam install . --deps-only ``` ## Build ``` -dune build +make ``` -The built artifact is in `_build/install/default/bin/rescript-editor-support.exe` +The built artifact is in `lib/rescript-editor-support.exe` ## Usage Run: ```sh -_build/install/default/bin/rescript-editor-support.exe --help +lib/rescript-editor-support.exe --help ``` ## History diff --git a/dune b/dune deleted file mode 100644 index 9ed2ee1b..00000000 --- a/dune +++ /dev/null @@ -1,4 +0,0 @@ -(dirs :standard \ examples test) -(env - (dev - (flags (:standard -warn-error -A)))) \ No newline at end of file diff --git a/dune-project b/dune-project deleted file mode 100644 index e679dee9..00000000 --- a/dune-project +++ /dev/null @@ -1,2 +0,0 @@ -(lang dune 1.7) -(name rescript-editor-support) \ No newline at end of file diff --git a/package.json b/package.json index fdb6f0e8..0c8f359c 100644 --- a/package.json +++ b/package.json @@ -2,8 +2,7 @@ "name": "rescript-editor-support", "version": "1.0.0", "scripts": { - "test": "cd test && ./test.sh", - "dce": "dune build @check @all && node_modules/.bin/reanalyze -dce-cmt _build -suppress src/vendor" + "test": "cd test && ./test.sh" }, "keywords": [ "rescript", diff --git a/rescript-editor-support.opam b/rescript-editor-support.opam deleted file mode 100644 index 89908515..00000000 --- a/rescript-editor-support.opam +++ /dev/null @@ -1,19 +0,0 @@ -opam-version: "2.0" -name: "rescript-editor-support" -version: "~dev" -synopsis: "Command line to support editor integration for ReScript" -maintainer: "ReScript" -authors: "ReScript Team" -license: "MIT" -homepage: "https://github.com/rescript-lang/rescript-editor-support" -bug-reports: - "https://github.com/rescript-lang/rescript-editor-support/issues" -depends: [ - "dune" {>= "2.7"} - "ocaml" {= "4.06.1"} -] -build: [ - ["dune" "build" "-p" name "@install"] -] -dev-repo: "git+https://github.com/rescript-lang/rescript-editor-support.git" - diff --git a/src/dune b/src/dune deleted file mode 100644 index 611b3bfa..00000000 --- a/src/dune +++ /dev/null @@ -1,7 +0,0 @@ -(include_subdirs unqualified) -(executable - (name RescriptEditorSupport) - (public_name rescript-editor-support.exe) - (libraries str compiler-libs.common unix) - (flags "-w" "+26+27+32+33+39") -)