mirror of
https://github.com/bensuperpc/dockcross.git
synced 2024-12-23 09:04:27 +01:00
Merge pull request #619 from bensuperpc/update_scripts
This commit is contained in:
commit
1ec42ecb43
@ -1,5 +1,6 @@
|
|||||||
FROM dockcross/base:latest
|
FROM dockcross/base:latest
|
||||||
MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
|
|
||||||
|
LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
|
||||||
|
|
||||||
# This is for ARMv5 "legacy" (armel) devices which do NOT support hard float
|
# This is for ARMv5 "legacy" (armel) devices which do NOT support hard float
|
||||||
# VFP instructions (armhf).
|
# VFP instructions (armhf).
|
||||||
|
@ -1,15 +1,17 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
if (( $# >= 1 )); then
|
if (( $# >= 1 )); then
|
||||||
image=$1
|
image_complet=$1
|
||||||
build_file=build-${image%:*}
|
image=${image_complet%:*}
|
||||||
|
tag=${image_complet#*:}
|
||||||
|
build_file=build-$image
|
||||||
shift 1
|
shift 1
|
||||||
|
|
||||||
cmake_arg=$@
|
cmake_arg=$*
|
||||||
echo "cmake arg: $cmake_arg"
|
echo "cmake arg: $cmake_arg"
|
||||||
|
|
||||||
# echo "Pulling dockcross/$image"
|
# echo "Pulling dockcross/$image"
|
||||||
#docker pull dockcross/"$image"
|
# docker pull "dockcross/$image:$tag"
|
||||||
|
|
||||||
echo "Make script dockcross-$image"
|
echo "Make script dockcross-$image"
|
||||||
docker run --rm dockcross/"$image" > ./dockcross-"$image"
|
docker run --rm dockcross/"$image" > ./dockcross-"$image"
|
||||||
@ -19,6 +21,6 @@ if (( $# >= 1 )); then
|
|||||||
./dockcross-"$image" cmake -B "$build_file" -S . -G Ninja $cmake_arg
|
./dockcross-"$image" cmake -B "$build_file" -S . -G Ninja $cmake_arg
|
||||||
./dockcross-"$image" ninja -C "$build_file"
|
./dockcross-"$image" ninja -C "$build_file"
|
||||||
else
|
else
|
||||||
echo "Usage: ${0##*/} <docker imag (ex: linux-x64/linux-x64-clang/linux-arm64/windows-shared-x64/windows-static-x64...)> <cmake arg.>"
|
echo "Usage: ${0##*/} <docker image (ex: linux-x64/linux-x64-clang/linux-arm64/windows-shared-x64/windows-static-x64...)> <cmake arg.>"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
@ -1,14 +1,16 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
if (( $# >= 2 )); then
|
if (( $# >= 2 )); then
|
||||||
image=$1
|
image_complet=$1
|
||||||
|
image=${image_complet%:*}
|
||||||
|
tag=${image_complet#*:}
|
||||||
shift 1
|
shift 1
|
||||||
|
|
||||||
command=$@
|
command=$*
|
||||||
echo "command: $command"
|
echo "command: $command"
|
||||||
|
|
||||||
# echo "Pulling dockcross/$image"
|
# echo "Pulling dockcross/$image"
|
||||||
#docker pull dockcross/"$image"
|
# docker pull "dockcross/$image:$tag"
|
||||||
|
|
||||||
echo "Make script dockcross-$image"
|
echo "Make script dockcross-$image"
|
||||||
docker run --rm dockcross/"$image" > ./dockcross-"$image"
|
docker run --rm dockcross/"$image" > ./dockcross-"$image"
|
||||||
|
@ -1,15 +1,17 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
if (( $# >= 1 )); then
|
if (( $# >= 1 )); then
|
||||||
image=$1
|
image_complet=$1
|
||||||
build_file=build-${image%:*}
|
image=${image_complet%:*}
|
||||||
|
tag=${image_complet#*:}
|
||||||
|
build_file=build-$image
|
||||||
shift 1
|
shift 1
|
||||||
|
|
||||||
make_arg=$@
|
make_arg=$*
|
||||||
echo "make arg: $make_arg"
|
echo "make arg: $make_arg"
|
||||||
|
|
||||||
# echo "Pulling dockcross/$image"
|
# echo "Pulling dockcross/$image"
|
||||||
#docker pull dockcross/"$image"
|
# docker pull "dockcross/$image:$tag"
|
||||||
|
|
||||||
echo "Make script dockcross-$image"
|
echo "Make script dockcross-$image"
|
||||||
docker run --rm dockcross/"$image" > ./dockcross-"$image"
|
docker run --rm dockcross/"$image" > ./dockcross-"$image"
|
||||||
@ -18,6 +20,6 @@ if (( $# >= 1 )); then
|
|||||||
echo "Build $build_file"
|
echo "Build $build_file"
|
||||||
./dockcross-"$image" bash -c 'make CXX=${CXX} CC=${CC} AR=${AR} AS=${AS} LD=${LD} CPP=${CPP} FC=${FC} '"$make_arg"
|
./dockcross-"$image" bash -c 'make CXX=${CXX} CC=${CC} AR=${AR} AS=${AS} LD=${LD} CPP=${CPP} FC=${FC} '"$make_arg"
|
||||||
else
|
else
|
||||||
echo "Usage: ${0##*/} <docker imag (ex: linux-x64/linux-x64-clang/linux-arm64/windows-shared-x64/windows-static-x64...)> <make arg.>"
|
echo "Usage: ${0##*/} <docker image (ex: linux-x64/linux-x64-clang/linux-arm64/windows-shared-x64/windows-static-x64...)> <make arg.>"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user