vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'add-ant-package' into 'master'

Browse source 
Add ant package

See merge request redox-os/redox!1360
This commit is contained in:
Jeremy Soller 2023-08-12 00:56:14 +00:00
parent 48562716a3 32ae16e3c3
commit 9bcb69e9da
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
bootstrap.sh
View file

@ -207,6 +207,7 @@ osx_homebrew()
install_brew_pkg "automake" install_brew_pkg "automake"
install_brew_pkg "scons" install_brew_pkg "scons"
install_brew_pkg "lua" install_brew_pkg "lua"
install_brew_pkg "ant"
install_brew_pkg "redox-os/gcc_cross_compilers/x86_64-elf-gcc" "x86_64-elf-gcc" install_brew_pkg "redox-os/gcc_cross_compilers/x86_64-elf-gcc" "x86_64-elf-gcc"
} }
@ -323,7 +324,8 @@ archLinux()
clang \ clang \
perl \ perl \
doxygen \ doxygen \
lua" lua \
ant"
if [ "$1" == "qemu" ]; then if [ "$1" == "qemu" ]; then
packages="$packages qemu" packages="$packages qemu"
elif [ "$1" == "virtualbox" ]; then elif [ "$1" == "virtualbox" ]; then
@ -395,7 +397,8 @@ ubuntu()
perl \ perl \
doxygen \ doxygen \
g++ \ g++ \
lua5.4" lua5.4 \
ant"
# Not availible for at least ARM hosts # Not availible for at least ARM hosts
case "$host_arch" in case "$host_arch" in
x86*|i?86) pkgs="$pkgs libc6-dev-i386 syslinux-utils";; x86*|i?86) pkgs="$pkgs libc6-dev-i386 syslinux-utils";;
@ -497,7 +500,8 @@ fedora()
luajit \ luajit \
make \ make \
clang \ clang \
doxygen ; do rpm -q $pkg > /dev/null || echo $pkg; done) doxygen \
ant ; do rpm -q $pkg > /dev/null || echo $pkg; done)
# If the list of packages is not empty, install missing # If the list of packages is not empty, install missing
COUNT=$(echo $PKGS | wc -w) COUNT=$(echo $PKGS | wc -w)
if [ $COUNT -ne 0 ]; then if [ $COUNT -ne 0 ]; then
@ -576,7 +580,8 @@ suse()
llvm \ llvm \
clang \ clang \
doxygen \ doxygen \
lua54 lua54 \
ant
} }
############################################################################## ##############################################################################

3
podman/redox-base-containerfile
View file

@ -47,7 +47,8 @@ RUN apt-get update \
llvm \ llvm \
clang \ clang \
perl \ perl \
doxygen doxygen \
ant
# _UID_ must be replaced with the user's uid on host # _UID_ must be replaced with the user's uid on host
# podman root is mapped to your user id on host during build, # podman root is mapped to your user id on host during build,