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

Attempt to fix error by populating out dir

Browse Source
This commit is contained in:
FriwiDev 2021-12-16 19:20:10 +01:00
parent 3a93d91c20
commit 36e4764442
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DockerfileLinux
View File

@ -14,7 +14,7 @@ WORKDIR /builder
#Copy existing sources, if any #Copy existing sources, if any
COPY jcef /jcef COPY jcef /jcef
#Copy prebuild classes, if any #Copy prebuild classes, if any
COPY out/linux* /prebuild COPY out/linux32 /prebuild
#Copy additional natives #Copy additional natives
COPY natives /natives COPY natives /natives

7
compile_linux.sh
View File

@ -16,21 +16,22 @@ cd "$( dirname "$0" )"
#Remove old build output #Remove old build output
rm -rf out rm -rf out
mkdir out mkdir out
mkdir out/linux32
pwd touch out/linux32/prebuilt.txt
ls -a
#Execute buildx with linux dockerfile and output to current directory #Execute buildx with linux dockerfile and output to current directory
if [ $# -eq 2 ] if [ $# -eq 2 ]
then then
if [ $1 == "arm/v6" ] if [ $1 == "arm/v6" ]
then then
rm -rf out/linux32
docker buildx build --platform=linux/386 --build-arg TARGETARCH=386 --build-arg BUILD_TYPE=$2 --build-arg REPO=https://bitbucket.org/chromiumembedded/java-cef.git --build-arg REF=master --file DockerfileLinuxARMPrebuild --output out . docker buildx build --platform=linux/386 --build-arg TARGETARCH=386 --build-arg BUILD_TYPE=$2 --build-arg REPO=https://bitbucket.org/chromiumembedded/java-cef.git --build-arg REF=master --file DockerfileLinuxARMPrebuild --output out .
fi fi
docker buildx build --platform=linux/$1 --build-arg TARGETARCH=$1 --build-arg BUILD_TYPE=$2 --build-arg REPO=https://bitbucket.org/chromiumembedded/java-cef.git --build-arg REF=master --file DockerfileLinux --output out . docker buildx build --platform=linux/$1 --build-arg TARGETARCH=$1 --build-arg BUILD_TYPE=$2 --build-arg REPO=https://bitbucket.org/chromiumembedded/java-cef.git --build-arg REF=master --file DockerfileLinux --output out .
else else
if [ $1 == "arm/v6" ] if [ $1 == "arm/v6" ]
then then
rm -rf out/linux32
docker buildx build --platform=linux/386 --build-arg TARGETARCH=386 --build-arg BUILD_TYPE=$2 --build-arg REPO=$3 --build-arg REF=$4 --file DockerfileLinuxARMPrebuild --output out . docker buildx build --platform=linux/386 --build-arg TARGETARCH=386 --build-arg BUILD_TYPE=$2 --build-arg REPO=$3 --build-arg REF=$4 --file DockerfileLinuxARMPrebuild --output out .
fi fi
docker buildx build --platform=linux/$1 --build-arg TARGETARCH=$1 --build-arg BUILD_TYPE=$2 --build-arg REPO=$3 --build-arg REF=$4 --file DockerfileLinux --output out . docker buildx build --platform=linux/$1 --build-arg TARGETARCH=$1 --build-arg BUILD_TYPE=$2 --build-arg REPO=$3 --build-arg REF=$4 --file DockerfileLinux --output out .