Copy new patches in dkml-compiler-native

diskuv · Apr 16, 2024 · 31f23fe · 31f23fe
1 parent 6fab2ca
commit 31f23fe
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/install-src.cmd b/install-src.cmd
@@ -48,6 +48,8 @@ COPY /Y /B src\p\flexdll-cross-0_42-a01-arm64.patch %TARGETDIR%\src\p
 IF %ERRORLEVEL% NEQ 0 (ECHO Error during COPY &EXIT /B 1)
 COPY /Y /B src\p\ocaml-common-4_12-a01-alignfiletime.patch %TARGETDIR%\src\p
 IF %ERRORLEVEL% NEQ 0 (ECHO Error during COPY &EXIT /B 1)
+COPY /Y /B src\p\ocaml-common-4_14_0-a01-fmatest.patch %TARGETDIR%\src\p
+IF %ERRORLEVEL% NEQ 0 (ECHO Error during COPY &EXIT /B 1)
 COPY /Y /B src\p\ocaml-common-4_14-a01-alignfiletime.patch %TARGETDIR%\src\p
 IF %ERRORLEVEL% NEQ 0 (ECHO Error during COPY &EXIT /B 1)
 COPY /Y /B src\p\ocaml-common-4_14-a02-nattop.patch %TARGETDIR%\src\p
@@ -56,9 +58,7 @@ COPY /Y /B src\p\ocaml-common-4_14-a03-keepasm.patch %TARGETDIR%\src\p
 IF %ERRORLEVEL% NEQ 0 (ECHO Error during COPY &EXIT /B 1)
 COPY /Y /B src\p\ocaml-common-4_14-a04-xdg.patch %TARGETDIR%\src\p
 IF %ERRORLEVEL% NEQ 0 (ECHO Error during COPY &EXIT /B 1)
-COPY /Y /B src\p\ocaml-common-4_14_0-a01-fmatest.patch %TARGETDIR%\src\p
-IF %ERRORLEVEL% NEQ 0 (ECHO Error during COPY &EXIT /B 1)
-COPY /Y /B src\p\ocaml-common-4_14_0-a02-msvccflags.patch %TARGETDIR%\src\p
+COPY /Y /B src\p\ocaml-common-4_14-a05-msvccflags.patch %TARGETDIR%\src\p
 IF %ERRORLEVEL% NEQ 0 (ECHO Error during COPY &EXIT /B 1)
 COPY /Y /B src\p\ocaml-cross-4_12-a01.patch %TARGETDIR%\src\p
 IF %ERRORLEVEL% NEQ 0 (ECHO Error during COPY &EXIT /B 1)
@@ -70,7 +70,9 @@ COPY /Y /B src\p\ocaml-cross-4_13-a01.patch %TARGETDIR%\src\p
 IF %ERRORLEVEL% NEQ 0 (ECHO Error during COPY &EXIT /B 1)
 COPY /Y /B src\p\ocaml-cross-4_14-a01.patch %TARGETDIR%\src\p
 IF %ERRORLEVEL% NEQ 0 (ECHO Error during COPY &EXIT /B 1)
-COPY /Y /B src\p\ocaml-cross-4_14-a02-arm32.patch %TARGETDIR%\src\p
+COPY /Y /B src\p\ocaml-cross-4_14_0-a02-arm32.patch %TARGETDIR%\src\p
+IF %ERRORLEVEL% NEQ 0 (ECHO Error during COPY &EXIT /B 1)
+COPY /Y /B src\p\ocaml-cross-4_14_2-a02-arm32.patch %TARGETDIR%\src\p
 IF %ERRORLEVEL% NEQ 0 (ECHO Error during COPY &EXIT /B 1)
 COPY /Y /B src\p\ocaml-cross-5_00_a02-arm32.patch %TARGETDIR%\src\p
 IF %ERRORLEVEL% NEQ 0 (ECHO Error during COPY &EXIT /B 1)

diff --git a/install-src.sh b/install-src.sh
@@ -35,18 +35,19 @@ install -v \
     src/p/flexdll-cross-0_39-a01-arm64.patch \
     src/p/flexdll-cross-0_42-a01-arm64.patch \
     src/p/ocaml-common-4_12-a01-alignfiletime.patch \
+    src/p/ocaml-common-4_14_0-a01-fmatest.patch \
     src/p/ocaml-common-4_14-a01-alignfiletime.patch \
     src/p/ocaml-common-4_14-a02-nattop.patch \
     src/p/ocaml-common-4_14-a03-keepasm.patch \
     src/p/ocaml-common-4_14-a04-xdg.patch \
-    src/p/ocaml-common-4_14_0-a01-fmatest.patch \
-    src/p/ocaml-common-4_14_0-a02-msvccflags.patch \
+    src/p/ocaml-common-4_14-a05-msvccflags.patch \
     src/p/ocaml-cross-4_12-a01.patch \
     src/p/ocaml-cross-4_12-a02-arm32.patch \
     src/p/ocaml-cross-4_12unused-zzz-win32arm.patch \
     src/p/ocaml-cross-4_13-a01.patch \
+    src/p/ocaml-cross-4_14_0-a02-arm32.patch \
+    src/p/ocaml-cross-4_14_2-a02-arm32.patch \
     src/p/ocaml-cross-4_14-a01.patch \
-    src/p/ocaml-cross-4_14-a02-arm32.patch \
     src/p/ocaml-cross-5_00_a02-arm32.patch \
     "$targetdir/src/p"