Update install_macos_dependencies.sh

Add six as dependency
Update compile_macosx.sh
2025-11-28 02:49:22 +08:00 · 2023-12-08 13:52:20 +01:00 · 2023-12-08 13:47:50 +01:00 · 2023-12-08 13:47:04 +01:00 · 2023-12-08 13:27:16 +01:00 · 2023-10-06 13:20:21 +02:00
3 changed files with 13 additions and 8 deletions
--- a/8
+++ b/8
@@ -32,7 +32,7 @@ RUN ./run_linux.sh
 #Export built files
 FROM scratch AS export-stage
 COPY --from=stage /jcef/binary_distrib.tar.gz .
-COPY --from=stage /jcef/target target
-COPY --from=stage /jcef/third_party third_party
-COPY --from=stage /jcef/buildtools buildtools
-COPY --from=stage /jcef/jcef_build jcef_build
+#COPY --from=stage /jcef/target target
+#COPY --from=stage /jcef/third_party third_party
+#COPY --from=stage /jcef/buildtools buildtools
+#COPY --from=stage /jcef/jcef_build jcef_build
--- a/compile_linux.sh
+++ b/compile_linux.sh
@@ -70,9 +70,13 @@ if [ -f "out/buildtools/clang-format" ]; then
 fi

 #Move jcef_build
-rm -rf jcef/jcef_build
-mv out/jcef_build jcef/jcef_build
+if [ -f "out/jcef_build" ]; then
+    rm -rf jcef/jcef_build
+    mv out/jcef_build jcef/jcef_build
+fi

 #Move target to binary_distrib
-rm -rf jcef/binary_distrib
-mv out/target jcef/binary_distrib
+if [ -f "out/target" ]; then
+    rm -rf jcef/binary_distrib
+    mv out/target jcef/binary_distrib
+fi
--- a/scripts/install_macos_dependencies.sh
+++ b/scripts/install_macos_dependencies.sh
@@ -1,3 +1,4 @@
 #!/bin/bash

 brew install ninja
+brew reinstall six
Author	SHA1	Message	Date
Friwi	1a11a80d67	Update install_macos_dependencies.sh	2023-12-08 13:52:20 +01:00
Friwi	4cea794a99	Add six as dependency	2023-12-08 13:47:50 +01:00
Friwi	5b834e3e56	Update compile_macosx.sh	2023-12-08 13:47:04 +01:00
Friwi	93c173340a	Update compile_macosx.sh	2023-12-08 13:27:16 +01:00
Friwi	0bf27250e3	Check folder existence before moving	2023-10-06 13:20:21 +02:00
Friwi	b6c0abdd15	Only export binary distribution due to disk space of github runners	2023-10-06 12:39:52 +02:00