[Relocatable] trunk combined branch

.depend

@@ -62,16 +62,6 @@ utils/config.cmo : \
 utils/config.cmx : \
     utils/config.cmi
 utils/config.cmi :
-utils/config_boot.cmo : \
-    utils/config_boot.cmi
-utils/config_boot.cmx : \
-    utils/config_boot.cmi
-utils/config_boot.cmi :
-utils/config_main.cmo : \
-    utils/config_main.cmi
-utils/config_main.cmx : \
-    utils/config_main.cmi
-utils/config_main.cmi :
 utils/consistbl.cmo : \
     utils/misc.cmi \
     utils/consistbl.cmi
@@ -221,6 +211,16 @@ utils/warnings.cmx : \
     utils/warnings.cmi
 utils/warnings.cmi : \
     utils/format_doc.cmi
+utils/config/config_boot.cmo : \
+    utils/config/config_boot.cmi
+utils/config/config_boot.cmx : \
+    utils/config/config_boot.cmi
+utils/config/config_boot.cmi :
+utils/config/config_main.cmo : \
+    utils/config/config_main.cmi
+utils/config/config_main.cmx : \
+    utils/config/config_main.cmi
+utils/config/config_main.cmi :
 parsing/ast_helper.cmo : \
     parsing/syntaxerr.cmi \
     parsing/parsetree.cmi \
@@ -2395,6 +2395,7 @@ bytecomp/bytelink.cmo : \
     utils/consistbl.cmi \
     utils/config.cmi \
     utils/compression.cmi \
+    driver/compenv.cmi \
     file_formats/cmo_format.cmi \
     utils/clflags.cmi \
     utils/ccomp.cmi \
@@ -2414,6 +2415,7 @@ bytecomp/bytelink.cmx : \
     utils/consistbl.cmx \
     utils/config.cmx \
     utils/compression.cmx \
+    driver/compenv.cmx \
     file_formats/cmo_format.cmi \
     utils/clflags.cmx \
     utils/ccomp.cmx \
@@ -2575,14 +2577,6 @@ bytecomp/instruct.cmi : \
     lambda/lambda.cmi \
     typing/ident.cmi \
     typing/env.cmi
-bytecomp/meta.cmo : \
-    bytecomp/instruct.cmi \
-    bytecomp/meta.cmi
-bytecomp/meta.cmx : \
-    bytecomp/instruct.cmx \
-    bytecomp/meta.cmi
-bytecomp/meta.cmi : \
-    bytecomp/instruct.cmi
 bytecomp/opcodes.cmo : \
     bytecomp/opcodes.cmi
 bytecomp/opcodes.cmx : \
@@ -2608,7 +2602,6 @@ bytecomp/symtable.cmo : \
     lambda/runtimedef.cmi \
     typing/predef.cmi \
     utils/misc.cmi \
-    bytecomp/meta.cmi \
     parsing/location.cmi \
     lambda/lambda.cmi \
     typing/ident.cmi \
@@ -2622,7 +2615,6 @@ bytecomp/symtable.cmx : \
     lambda/runtimedef.cmx \
     typing/predef.cmx \
     utils/misc.cmx \
-    bytecomp/meta.cmx \
     parsing/location.cmx \
     lambda/lambda.cmx \
     typing/ident.cmx \
@@ -2818,6 +2810,7 @@ asmcomp/asmlink.cmo : \
     utils/consistbl.cmi \
     utils/config.cmi \
     middle_end/compilenv.cmi \
+    driver/compenv.cmi \
     file_formats/cmx_format.cmi \
     asmcomp/cmm_helpers.cmi \
     asmcomp/cmm.cmi \
@@ -2839,6 +2832,7 @@ asmcomp/asmlink.cmx : \
     utils/consistbl.cmx \
     utils/config.cmx \
     middle_end/compilenv.cmx \
+    driver/compenv.cmx \
     file_formats/cmx_format.cmi \
     asmcomp/cmm_helpers.cmx \
     asmcomp/cmm.cmx \
@@ -7627,9 +7621,9 @@ toplevel/byte/topeval.cmo : \
     typing/outcometree.cmi \
     typing/out_type.cmi \
     utils/misc.cmi \
-    bytecomp/meta.cmi \
     parsing/location.cmi \
     utils/load_path.cmi \
+    bytecomp/instruct.cmi \
     typing/ident.cmi \
     typing/env.cmi \
     bytecomp/emitcode.cmi \
@@ -7657,9 +7651,9 @@ toplevel/byte/topeval.cmx : \
     typing/outcometree.cmi \
     typing/out_type.cmx \
     utils/misc.cmx \
-    bytecomp/meta.cmx \
     parsing/location.cmx \
     utils/load_path.cmx \
+    bytecomp/instruct.cmx \
     typing/ident.cmx \
     typing/env.cmx \
     bytecomp/emitcode.cmx \
@@ -7714,7 +7708,6 @@ toplevel/byte/trace.cmo : \
     typing/predef.cmi \
     typing/path.cmi \
     utils/misc.cmi \
-    bytecomp/meta.cmi \
     parsing/longident.cmi \
     typing/ctype.cmi \
     parsing/asttypes.cmi \
@@ -7727,7 +7720,6 @@ toplevel/byte/trace.cmx : \
     typing/predef.cmx \
     typing/path.cmx \
     utils/misc.cmx \
-    bytecomp/meta.cmx \
     parsing/longident.cmx \
     typing/ctype.cmx \
     parsing/asttypes.cmx \
@@ -9533,6 +9525,7 @@ ocamldoc/odoc_misc.cmo : \
     typing/path.cmi \
     ocamldoc/odoc_types.cmi \
     ocamldoc/odoc_messages.cmi \
+    ocamldoc/odoc_global.cmi \
     parsing/longident.cmi \
     typing/btype.cmi \
     ocamldoc/odoc_misc.cmi
@@ -9543,6 +9536,7 @@ ocamldoc/odoc_misc.cmx : \
     typing/path.cmx \
     ocamldoc/odoc_types.cmx \
     ocamldoc/odoc_messages.cmx \
+    ocamldoc/odoc_global.cmx \
     parsing/longident.cmx \
     typing/btype.cmx \
     ocamldoc/odoc_misc.cmi

.gitattributes

@@ -44,6 +44,21 @@
 # the lines involved in the conflict, which is arguably worse
 #/Changes                 merge=union
 
+testsuite/Makefile       export-subst
+
+# Files and directories excluded from git-generated tarballs.
+.github                  export-ignore
+manual                   export-ignore
+release-info             export-ignore
+testsuite/tests          export-ignore
+tools/ci                 export-ignore
+.gitattributes           export-ignore
+.gitignore               export-ignore
+.gitmodules              export-ignore
+.mailmap                 export-ignore
+ocaml-variants.install   export-ignore
+ocaml-variants.opam      export-ignore
+
 # No header for text and META files (would be too obtrusive).
 *.md                     typo.missing-header
 README*                  typo.missing-header
@@ -92,6 +107,8 @@ build-aux                typo.prune
 /manual                  typo.prune
 /manual/**               typo.prune
 
+tools/ci/appveyor/parallel linguist-vendored typo.prune
+
 # configure is generated so do not check it
 configure                typo.prune
 
@@ -109,6 +126,7 @@ otherlibs/unix/symlink_win32.c     typo.long-line
 # Some Unicode characters here and there
 utils/misc.ml            typo.non-ascii
 runtime/sak.c            typo.non-ascii
+tools/opam/process.sh    typo.non-ascii
 
 testsuite/tests/**                                      typo.missing-header typo.long-line=may
 testsuite/tests/lib-bigarray-2/bigarrf.f                typo.tab linguist-language=Fortran
@@ -215,7 +233,6 @@ runtime/caml/sizeclasses.h typo.missing-header
 /tools/gdb_ocamlrun.py typo.long-line
 
 /tools/opam/gen_ocaml-system_config.ml.in typo.missing-header
-/tools/opam/gen_ocaml_config.ml.in typo.very-long-line typo.missing-header
 
 # Tests which include references spanning multiple lines fail with \r\n
 # endings, so use \n endings only, even on Windows.

.github/workflows/build-msvc.yml

@@ -33,10 +33,12 @@ jobs:
         with:
           script: |
             // # Always test cl and clang-cl
-            let compilers = ['cl', 'clang-cl'];
+            let compilers = ['clang-cl'];
             // # Also test i686 MSVC
             let include = [
-              {cc: 'cl', arch: 'i686', libdir: 'relative'}];
+              {os: 'windows-latest', cc: 'cl', arch: 'i686', opam: 'false', prefix: '$PROGRAMFILES/Бактріан🐫', libdir: 'relative'},
+              {os: 'windows-2025', cc: 'cl', arch: 'x86_64', opam: 'true', prefix: 'C:\\\\Бактріан🐫'},
+              {os: 'windows-2025', cc: 'cl', arch: 'i686', opam: 'true', prefix: 'C:\\\\Бактріан🐫'}];
             let libdir = ['absolute'];
             // # If this is a pull request, see if the PR has the
             // # 'CI: Full matrix' label. This is done using an API request,
@@ -53,14 +55,14 @@ jobs:
                 // # Test Cygwin as well
                 compilers.push('gcc');
                 // # Test bytecode-only Cygwin
-                include.push({cc: 'gcc', arch: 'x86_64', libdir: 'absolute', config_arg: '--disable-native-toplevel --disable-native-compiler'});
+                include.push({os: 'windows-latest', prefix: '$PROGRAMFILES/Бактріан🐫', opam: ['false'], cc: 'gcc', arch: 'x86_64', libdir: 'absolute', config_arg: '--disable-native-toplevel --disable-native-compiler --with-target-sh=sh'});
                 // # Test i686 MSVC absolute
-                include.push({cc: 'cl', arch: 'i686', libdir: 'absolute'});
+                include.push({os: 'windows-latest', prefix: '$PROGRAMFILES/Бактріан🐫', opam: ['false'], cc: 'cl', arch: 'i686', libdir: 'absolute'});
                 // # Expand the main matrix to include relative testing
                 libdir.push('relative');
               }
             }
-            return {config_arg: [''], arch: ['x86_64'], cc: compilers, libdir: libdir, include: include};
+            return {os: ['windows-latest'], prefix: ['$PROGRAMFILES/Бактріан🐫'], opam: ['false'], config_arg: [''], arch: ['x86_64'], cc: compilers, libdir: libdir, include: include};
       - name: Determine if the testsuite should be skipped
         id: skip
         uses: actions/github-script@v7
@@ -78,7 +80,7 @@ jobs:
   build:
     permissions: {}
 
-    runs-on: windows-latest
+    runs-on: ${{ matrix.os }}
 
     needs: config
 
@@ -88,7 +90,7 @@ jobs:
 
     strategy:
       matrix: ${{ fromJSON(needs.config.outputs.matrix) }}
-      fail-fast: true
+      fail-fast: false
 
     steps:
 
@@ -107,7 +109,7 @@ jobs:
       - name: Install Cygwin
         uses: cygwin/cygwin-install-action@v3
         with:
-          packages: make,${{ matrix.cc != 'gcc' && 'mingw64-x86_64-' || 'gcc-g++,gcc-fortran,' }}gcc-core
+          packages: make,${{ matrix.cc != 'gcc' && 'mingw64-x86_64-' || 'gcc-g++,gcc-fortran,' }}gcc-core,rsync,unzip
           install-dir: 'D:\cygwin'
 
       - name: Save Cygwin cache
@@ -123,6 +125,13 @@ jobs:
           arch: ${{ matrix.arch == 'x86_64' && 'x64' || 'x86' }}
         if: matrix.cc != 'gcc'
 
+      - name: Install opam
+        if: matrix.opam == 'true'
+        shell: pwsh
+        run: |
+          winget install opam --accept-source-agreements
+          Add-Content -Path $env:GITHUB_PATH -Value "$env:LOCALAPPDATA\Microsoft\WinGet\Links"
+
       - name: Compute a key to cache configure results
         id: autoconf-cache-key
         env:
@@ -141,7 +150,8 @@ jobs:
         env:
           CONFIG_ARGS: >-
             --cache-file=config.cache
-            --prefix "${{ matrix.cc != 'gcc' && '$PROGRAMFILES\\Бактріан🐫' || '$(cygpath "$PROGRAMFILES/Бактріан🐫")'}}"
+            --prefix ${{ matrix.cc != 'gcc' && format('"{0}/_opam"', matrix.prefix) || format('"$(cygpath "{0}")"', matrix.prefix) }}
+            --docdir ${{ format((matrix.cc != 'gcc' && '"{0}/_opam/doc/ocaml"' || '"$(cygpath "{0}/doc/ocaml")"'), matrix.prefix) }}
             ${{ matrix.cc != 'gcc' && format('--host={0}-pc-windows', matrix.arch) || '' }}
             ${{ matrix.cc != 'gcc' && format('CC={0}', matrix.cc) || '' }}
             --enable-ocamltest
@@ -200,8 +210,25 @@ jobs:
           make tests
 
       - name: Install the compiler
+        if: matrix.opam != 'true'
         run: make install
 
+      - name: Create opam switch
+        if: matrix.opam == 'true'
+        env:
+          OPAMSWITCH: ${{ matrix.prefix }}
+        run: |
+          make OPAM_PACKAGE_NAME=ocaml-variants INSTALL_MODE=opam install
+          opam init --cli=2.4 --bare --yes --disable-sandboxing --auto-setup --cygwin-local-install
+          # These commands intentionally run using opam's "default" CLI
+          opam switch create '${{ env.OPAMSWITCH }}' --empty
+          opam pin add --no-action --kind=path ocaml-variants .
+          opam pin add --no-action flexdll flexdll
+          opam pin add --no-action winpthreads winpthreads
+          opam install --yes flexdll winpthreads
+          opam install --yes --assume-built ocaml-variants
+          opam exec -- ocamlc -v
+
       - name: Test in prefix
         run: |
           eval $(tools/msvs-promote-path)

.github/workflows/build.yml

@@ -78,6 +78,7 @@ jobs:
 #        debug runtime and minor heap verification.
 # debug-s4096: select testsuite run with the debug runtime and a small
 #              minor heap.
+# opam: constructs an opam local switch from the compiler.
   normal:
     name: ${{ matrix.name }}
     needs: [build, config]
@@ -88,11 +89,13 @@ jobs:
           - id: normal
             name: normal
             dependencies: texlive-latex-extra texlive-fonts-recommended texlive-luatex hevea sass gdb lldb
+          - id: opam
+            name: opam installation
           - id: debug
             name: extra (debug)
           - id: debug-s4096
             name: extra (debug-s4096)
-      fail-fast: true
+      fail-fast: false
     steps:
       - name: Download Artifact
         uses: actions/download-artifact@v4
@@ -134,15 +137,19 @@ jobs:
       - name: Install
         if: matrix.id == 'normal'
         run: |
-         MAKE_ARG=-j OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh install
+          MAKE_ARG=-j OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh install
+      - name: Create opam switch
+        if: matrix.id == 'opam'
+        run: |
+          MAKE_ARG=-j OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh opam
       - name: Test in prefix
-        if: matrix.id == 'normal'
+        if: matrix.id == 'normal' || matrix.id == 'opam'
         run: |
-         MAKE_ARG=-j OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh test-in-prefix
+          MAKE_ARG=-j OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh test-in-prefix
       - name: Test in prefix (alternate configuration)
         if: matrix.id == 'normal' && needs.config.outputs.full-matrix == 'true'
         run: |
-         MAKE_ARG=-j OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh re-test-in-prefix
+          MAKE_ARG=-j OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh re-test-in-prefix
       - name: Build the manual
         if: matrix.id == 'normal' && needs.build.outputs.manual_changed == 'true'
         run: |
@@ -186,6 +193,7 @@ jobs:
                config_arg: '--with-target-sh=exe --enable-runtime-search-target=fallback',
                'test-in-prefix': true},
               {name: 'macos-x86_64', os: 'macos-15-intel',
+               config_arg: '--with-target-sh=exe',
                'test-in-prefix': true},
               {name: 'macos-arm64', os: 'macos-latest',
                config_arg: '--with-relative-libdir --enable-runtime-search',
@@ -236,7 +244,7 @@ jobs:
     strategy:
       matrix:
         include: ${{ fromJSON(needs.config.outputs.jobs) }}
-      fail-fast: true
+      fail-fast: false
     steps:
       - name: Checkout
         uses: actions/checkout@v5
@@ -304,7 +312,7 @@ jobs:
       - name: configure tree
         run: |
           chown -R ocaml:ocaml .
-          MAKE_ARG=-j CONFIG_ARG='--disable-native-toplevel' su ocaml -c "bash -xe tools/ci/actions/runner.sh configure"
+          MAKE_ARG=-j CONFIG_ARG='--disable-native-toplevel --with-target-sh=exe' su ocaml -c "bash -xe tools/ci/actions/runner.sh configure"
       - name: Build
         run: |
           MAKE_ARG=-j su ocaml -c "bash -xe tools/ci/actions/runner.sh build"