Skip to content

Commit

Permalink
Unify build directory structure for local builds
Browse files Browse the repository at this point in the history
  • Loading branch information
FriwiDev committed Dec 29, 2021
1 parent 47c19a8 commit 2a71437
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
jcef
out
release_gen/*.txt
release_gen/*.md
Expand Down
2 changes: 1 addition & 1 deletion DockerfileLinux
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 9 additions & 0 deletions compile_linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand All @@ -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

0 comments on commit 2a71437

Please sign in to comment.