Permalink
Browse files

General refresh.

- Update instructions.
- Update the bundled "topfind" file.
- Update flexlink to the latest version.
  • Loading branch information...
1 parent 884d341 commit def0993a80e1c8c3dd430575c5db451e730855e3 @protz committed Jul 20, 2012
Showing with 10 additions and 6 deletions.
  1. +4 −4 README.md
  2. BIN flexlink/flexlink.exe
  3. +6 −2 topfind
View
@@ -27,7 +27,7 @@ for another.
1. Install FlexDLL from Alain's website, and
* `export PATH=/cygdrive/c/path/to/flexdll:$PATH`
-2. Refresh the files in the `flexdll/` directory of the installer, so that the
+2. Refresh the files in the `flexlink/` directory of the installer, so that the
resulting installer ships the right version of flexdll (optional,
recommended).
2. Grab a copy of ActiveTCL and install it, leave the default path (`c:\tcl`).
@@ -38,12 +38,12 @@ for another.
3. Go into the `emacs/` directory.
* Make sure there's an `emacs.exe` in your path (install Emacs if you have to).
* Configure the Makefile so that the output directory is
- `/c/ocamlmgw/emacsfiles`.
+ `/cygdrive/c/ocamlmgw/emacsfiles`.
* Run `make` in that directory.
3. Checkout a copy of OCamlWin from the OCaml forge, edit Makefile.local and
`make && make install`.
3. Add `c:\ocamlmgw\bin` to your path, `configure` and `make` findlib.
-3. Copy findlib's `src/findlib/topfind.p` to `topfind` in the OCaml Installer
+3. Copy findlib's `src/findlib/topfind_rd1.p` to `topfind` in the OCaml Installer
directory.
4. Install NSIS, grab `nsisunz.dll` somewhere on the interwebs and put it NSIS's
`Plugins` directory.
@@ -71,4 +71,4 @@ Bugs, issues
------------
All patches should be submitted using GitHub pull requests. All issues should be
-filed using the GitHug issue tracker.
+filed using the GitHub issue tracker.
View
Binary file not shown.
View
@@ -1,13 +1,15 @@
-(* $Id: topfind.p 152 2012-04-16 16:08:47Z gerd $ -*- tuareg -*- *)
+(* $Id: topfind_rd1.p 178 2012-07-09 09:20:31Z gerd $ -*- tuareg -*- *)
(* For Ocaml-3.03 and up, so you can do: #use "topfind" and get a
* working findlib toploop.
*)
#directory "@SITELIB@/findlib";;
-#directory "+compiler-libs";;
(* OCaml-4.00 requires to have #directory before we load anything *)
+#directory "+compiler-libs";;
+ (* For OCaml-4.00. This directory will be later removed from path *)
+
(* First test whether findlib_top is already loaded. If not, load it now.
* The test works by executing the toplevel phrase "Topfind.reset" and
* checking whether this causes an error.
@@ -27,6 +29,8 @@ if not(exec_test "Topfind.reset;;") then (
Topdirs.dir_load Format.err_formatter "@SITELIB@/findlib/findlib_top.cma";
);;
+#remove_directory "+compiler-libs";;
+
(* Old: *)
(* #load "@SITELIB@/findlib/findlib.cma";; *)
(* #load "@SITELIB@/findlib/findlib_top.cma";; *)

0 comments on commit def0993

Please sign in to comment.