Windows build fixes (MSYS2, Cygwin, etc.)

.gitattributes

@@ -1,11 +1,11 @@
 # Default behaviour, for if core.autocrlf isn't set
 * text=auto
- text eol=lf
 /ocaml-stub  text eol=lf
 /release text eol=lf
 /itest text eol=lf
 /configure text eol=lf
 /mini/ocamlfind-mini text eol=lf
+/tools/cmd_in_different_dirs text eol=lf
 /tools/file_exists text eol=lf
 /tools/safe_camlp4 text eol=lf
 /tools/make-package-macosx text eol=lf

.github/workflows/ci.yml

@@ -4,25 +4,30 @@ on: [push, pull_request]
 
 jobs:
   build:
-    name: ${{ matrix.os }} - OCaml ${{ matrix.ocaml-version }}
+    name: ${{ matrix.os.windows_environment == '' && matrix.os.name || format('windows-latest/{0}', matrix.os.windows_environment) }} - OCaml ${{ matrix.ocaml-version }}
 
     strategy:
       fail-fast: false
       # Test Linux, macOS and Windows with the oldest, LTS, and newest supported
       # OCaml versions.
       matrix:
         os:
-          - macos-latest
-          - ubuntu-latest
-          - windows-latest
+          - name: macos-latest
+          - name: ubuntu-latest
+          - name: windows-latest
+            windows_environment: cygwin
+          - name: windows-latest
+            windows_environment: msys2
         ocaml-version:
           - "4.14"
           - "5.4"
+          - "5.5"
         include:
-          - os: ubuntu-latest
+          - os:
+              name: ubuntu-latest
             ocaml-version: "3.08"
 
-    runs-on: ${{ matrix.os }}
+    runs-on: ${{ matrix.os.name }}
 
     steps:
       - name: Checkout code
@@ -32,13 +37,17 @@ jobs:
         uses: ocaml/setup-ocaml@v3
         with:
           ocaml-compiler: ${{ matrix.ocaml-version }}
+          windows-environment: ${{ matrix.os.windows_environment == '' && 'cygwin' || matrix.os.windows_environment }}
           opam-repositories: |
             default: git+https://github.com/ocaml/opam-repository.git
             archive: git+https://github.com/ocaml/opam-repository-archive.git
 
       - name: Build with make
         run: |
           opam exec -- ${{ runner.os == 'Windows' && 'sh ' || '' }}./configure
+          echo ------------
+          grep "[\\\\/]" Makefile.config
+          echo ------------
           opam exec -- make all opt
 
       - name: Build and install with opam
@@ -49,8 +58,12 @@ jobs:
           OPT: ${{ matrix.ocaml-version == '3.08' && '-version' || '-config' }}
         run: |
           opam exec -- ocamlfind list
+          echo ------------
           opam exec -- ocamlfind printconf
+          echo ------------
           opam exec -- ocamlfind opt ${{ env.OPT }}
+          echo ------------
+          opam exec -- ocamlfind printconf conf | tr -d '\r' | tr '\\' '/' | xargs cat
 
       - name: Test the toplevel plugin
         run: opam exec -- ocaml .github/workflows/toplist.ml

.github/workflows/toplist.ml

@@ -1,2 +1,8 @@
 #use "topfind";;
 #list;;
+#require "findlib";;
+let () =
+  let ld_conf = Findlib.ocaml_ldconf () in
+  let print_line = Printf.printf "  %s\n" in
+  Printf.printf "Reading %s\n" ld_conf;
+  List.iter print_line (Findlib.read_ldconf ld_conf);;

.gitignore

@@ -8,10 +8,12 @@
 *.cmxs
 *.a
 *.so
+*.exe
 META
 
 Makefile.config
 Makefile.packages
+findlib.conf.in
 findlib.conf
 ocargs.log
 src/findlib/depend

Makefile

@@ -50,40 +50,14 @@ README: doc/README
 .PHONY: all-config
 all-config: findlib.conf
 
-.PHONY: findlib-template
-findlib-template: findlib.conf.in
-	USE_CYGPATH="$(USE_CYGPATH)"; \
-	export USE_CYGPATH; \
-	cat findlib.conf.in | \
-	    $(SH) tools/patch '@SITELIB@' '$(FINDLIB_OCAML_SITELIB)' | \
-			$(SH) tools/patch '@FINDLIB_PATH@' '$(FINDLIB_PATH)' -p >findlib.conf
-	if ./tools/cmd_from_same_dir ocamlc; then \
-		echo 'ocamlc="ocamlc.opt"' >>findlib.conf; \
-	fi
-	if ./tools/cmd_from_same_dir ocamlopt; then \
-		echo 'ocamlopt="ocamlopt.opt"' >>findlib.conf; \
-	fi
-	if ./tools/cmd_from_same_dir ocamldep; then \
-		echo 'ocamldep="ocamldep.opt"' >>findlib.conf; \
-	fi
-	if ./tools/cmd_from_same_dir ocamldoc; then \
-		echo 'ocamldoc="ocamldoc.opt"' >>findlib.conf; \
-	fi
-
-.PHONY: findlib-relative
-findlib-relative: FINDLIB_OCAML_SITELIB=$(RELATIVE_OCAML_SITELIB)
-findlib-relative: findlib-template
-
-.PHONY: findlib-absolute
-findlib-absolute: FINDLIB_OCAML_SITELIB=$(OCAML_SITELIB)
-findlib-absolute: findlib-template
-
 findlib.conf: findlib.conf.in
-	if [ "$(RELATIVE_PATHS)" = "true" ]; then \
-	  $(MAKE) findlib-relative; \
-        else \
-	  $(MAKE) findlib-absolute; \
-	fi
+	{ \
+	  cat $<; \
+	  ./tools/cmd_in_different_dirs ocamlc || echo 'ocamlc="ocamlc.opt"'; \
+	  ./tools/cmd_in_different_dirs ocamlopt || echo 'ocamlopt="ocamlopt.opt"'; \
+	  ./tools/cmd_in_different_dirs ocamldep || echo 'ocamldep="ocamldep.opt"'; \
+	  ./tools/cmd_in_different_dirs ocamldoc || echo 'ocamldoc="ocamldoc.opt"'; \
+	} > $@
 
 .PHONY: install-doc
 install-doc:

Makefile.config.pattern

@@ -7,8 +7,7 @@
 # Where the OCAML core is installed:
 #----------------------------------------------------------------------
 OCAML_CORE_STDLIB=/usr/local/lib/ocaml
-OCAML_CORE_BIN=/usr/local/bin
-OCAML_CORE_MAN=/usr/local/man
+OCAML_CORE_STDLIB_NATIVE=$(OCAML_CORE_STDLIB)
 
 #----------------------------------------------------------------------
 # Type of multi-threading support: either vm or posix
@@ -22,11 +21,7 @@ OCAML_THREADS=vm
 # Where the site-lib directory will be
 #----------------------------------------------------------------------
 OCAML_SITELIB=/usr/local/lib/ocaml/site-lib
-
-#----------------------------------------------------------------------
-# What the path setting will be
-#----------------------------------------------------------------------
-FINDLIB_PATH=/usr/local/lib/ocaml/site-lib:/usr/local/lib/ocaml
+OCAML_SITELIB_NATIVE=$(OCAML_SITELIB)
 
 #----------------------------------------------------------------------
 # Where binaries and manual pages will be installed
@@ -38,6 +33,7 @@ OCAMLFIND_MAN=/usr/local/man
 # The absolute location of the configuration file
 #----------------------------------------------------------------------
 OCAMLFIND_CONF=/usr/local/etc/ocamlfind.conf
+OCAMLFIND_CONF_NATIVE=$(OCAMLFIND_CONF)
 
 #----------------------------------------------------------------------
 # Autolinking is usually on
@@ -70,7 +66,6 @@ INSTALL_TOPFIND=1
 # installation
 #----------------------------------------------------------------------
 RELATIVE_PATHS=0
-RELATIVE_OCAML_SITELIB=$$PREFIX/lib
 
 #----------------------------------------------------------------------
 # Whether make install should update Makefile.packages just before