From 2a714372abc171770ee969573830ae14352db090 Mon Sep 17 00:00:00 2001
From: FriwiDev <friwidev@gmail.com>
Date: Wed, 29 Dec 2021 19:54:20 +0100
Subject: [PATCH] Unify build directory structure for local builds

---
 .gitignore       | 1 +
 DockerfileLinux  | 2 +-
 compile_linux.sh | 9 +++++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index ca28149..8feb632 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+jcef
 out
 release_gen/*.txt
 release_gen/*.md
diff --git a/DockerfileLinux b/DockerfileLinux
index 61d9091..cb380f9 100644
--- a/DockerfileLinux
+++ b/DockerfileLinux
@@ -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 .
+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
diff --git a/compile_linux.sh b/compile_linux.sh
index ac74c86..0e56513 100755
--- a/compile_linux.sh
+++ b/compile_linux.sh
@@ -19,6 +19,9 @@ mkdir out
 mkdir out/linux32
 touch out/linux32/prebuilt.txt
 
+#Remove binary distribution if there was one built before (saves transfer of it to docker context)
+rm -rf jcef/binary_distrib
+
 #Cache build image to not download it again each time (speedup for local builds)
 docker pull friwidev/jcefdocker:linux-latest
 
@@ -56,6 +59,8 @@ done
 if [ "$downloaded" -eq "1" ]; then
     rm -rf jcef/third_party
     mv out/third_party jcef
+else
+    rm -rf out/third_party
 fi
 
 # Check if the clang download was performed. If so, move it to jcef dir
@@ -67,3 +72,7 @@ fi
 #Move jcef_build
 rm -rf jcef/jcef_build
 mv out/jcef_build jcef/jcef_build
+
+#Move target to binary_distrib
+rm -rf jcef/binary_distrib
+mv out/target jcef/binary_distrib