xinyin025/jcefbuild
1
0
Fork 0
mirror of https://github.com/jcefmaven/jcefbuild.git synced 2025-09-17 04:46:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Unify build directory structure for local builds

Browse Source
This commit is contained in:
FriwiDev 2021-12-29 19:54:20 +01:00
parent 47c19a886d
commit 2a714372ab
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
jcef
out out
release_gen/*.txt release_gen/*.txt
release_gen/*.md release_gen/*.md

2
DockerfileLinux
View File

@ -32,7 +32,7 @@ RUN ./run_linux.sh
#Export built files #Export built files
FROM scratch AS export-stage FROM scratch AS export-stage
COPY --from=stage /jcef/binary_distrib.tar.gz . 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/third_party third_party
COPY --from=stage /jcef/buildtools buildtools COPY --from=stage /jcef/buildtools buildtools
COPY --from=stage /jcef/jcef_build jcef_build COPY --from=stage /jcef/jcef_build jcef_build

9
compile_linux.sh
View File

@ -19,6 +19,9 @@ mkdir out
mkdir out/linux32 mkdir out/linux32
touch out/linux32/prebuilt.txt 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) #Cache build image to not download it again each time (speedup for local builds)
docker pull friwidev/jcefdocker:linux-latest docker pull friwidev/jcefdocker:linux-latest
@ -56,6 +59,8 @@ done
if [ "$downloaded" -eq "1" ]; then if [ "$downloaded" -eq "1" ]; then
rm -rf jcef/third_party rm -rf jcef/third_party
mv out/third_party jcef mv out/third_party jcef
else
rm -rf out/third_party
fi fi
# Check if the clang download was performed. If so, move it to jcef dir # Check if the clang download was performed. If so, move it to jcef dir
@ -67,3 +72,7 @@ fi
#Move jcef_build #Move jcef_build
rm -rf jcef/jcef_build rm -rf jcef/jcef_build
mv out/jcef_build 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