Update repo path, lib version, readme (#8)

README.md

@@ -15,9 +15,13 @@ Required Cygwin64 packages are:
   - m4
   - patch
   - unzip
+  - perl
+  - perl-IPC-System-Simple
+  - libpcre2-devel
   - mingw64-x86_64-gcc-core
   - mingw64-x86_64-zlib
   - mingw64-x86_64-pcre
+  - mingw64-x86_64-pcre2
 
 (or for 32 bits):
   - mingw[64]-i686-gcc-core
@@ -27,7 +31,9 @@ Required Cygwin64 packages are:
 Troubleshoot:
 
 - You need to run `Build.exe` from the command line (`cmd`) to watch for errors
+  - If you have Haxe installed, you can also run `haxe --interp --main Build` from the `haxe` folder
 - In some cases there is an error about `prims.c` not compiling when building the ocaml compiler. It requires having git for Cygwin installed (prevents windows newline issues). Also make sure that your system PATH has Cygwin at the highest priority to prevent clashes.
+- Download and unzip `mingw64-uv` `mingw64-mbedtls` to your Cygwin install folder, from the link provided in `haxe/config.json/mingwPackages`
 
 ### About
 

haxe/Build.hx

@@ -152,9 +152,11 @@ class Build {
 		Sys.putEnv("OCAMLFIND_CONF", opamRoot+"/"+ocaml+"/lib/findlib.conf");
 
 		if( !sys.FileSystem.exists(opamRoot) )
-			cygCommand("opam",["init","--yes","default","https://github.com/fdopen/opam-repository-mingw.git","--comp",ocaml,"--switch",ocaml]);
+			cygCommand("opam",["init","--yes","default","https://github.com/ocaml-opam/opam-repository-mingw.git#sunset","--comp",ocaml,"--switch",ocaml]);
 
 		cygCommand("opam",["switch",ocaml]);
+		cygCommand("opam",["repo", "set-url", "fallback", "https://github.com/ocaml/opam-repository.git"]);
+		cygCommand("opam",["repo", "set-repos", "default", "fallback"]);
 		cygCommand("opam",["install","--yes"].concat(CFG.opamLibs));
 
 		Sys.println("DONE");

haxe/config.json

@@ -4,7 +4,7 @@
 	"cygwinTools" : ["bash", "cygpath", "$MINGW-ar", "$MINGW-as", "$MINGW-gcc", "$MINGW-ld", "$MINGW-ranlib", "ls", "make", "mkdir", "wget", "mv", "rm", "sed", "sh", "stty", "tput", "tr", "true", "cp", "m4"],
 	"mingwLibs" : ["zlib1", "libpcre2-8-0"],
 	"opamUrl" : "https://github.com/fdopen/opam-repository-mingw/releases/download/0.0.0.2/",
-	"opamLibs" : ["sedlex","camlp5","extlib","xml-light","rope","ptmap","sha","luv","dune","terminal_size","ipaddr"],
+	"opamLibs" : ["ocamlfind.1.9.1","sedlex","camlp5","extlib","xml-light","rope","ptmap","sha","luv.0.5.12","dune","terminal_size","ipaddr","ocaml-lsp-server"],
 	"mingwPackages" : [
 		"https://github.com/Simn/mingw64-uv/releases/download/1.32.0/mingw64-x86_64-uv-1.32.0-1.tar.xz",
 		"https://github.com/Simn/mingw64-mbedtls/releases/download/2.16.3/mingw64-x86_64-mbedtls-2.16.3-1.tar.xz"