这是indexloc提供的服务，不要输入任何密码
Skip to content

scripts: make download or build of dependencies less verbose #24745

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

scripts: make download or build of dependencies less verbose #24745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions scripts/build/termux_download_deb_pac.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ termux_download_deb_pac() {
fi

if [ "$TERMUX_ON_DEVICE_BUILD" = "true" ]; then
echo ""
case "$TERMUX_APP_PACKAGE_MANAGER" in
"apt") apt install -y "${PACKAGE}$(test ${TERMUX_WITHOUT_DEPVERSION_BINDING} != true && echo "=${VERSION}")";;
"pacman") pacman -S "${PACKAGE}$(test ${TERMUX_WITHOUT_DEPVERSION_BINDING} != true && echo "=${VERSION_PACMAN}")" --needed --noconfirm;;
Expand Down Expand Up @@ -54,9 +55,9 @@ termux_download_deb_pac() {
if [ -n "$PKG_HASH" ] && [ "$PKG_HASH" != "null" ]; then
if [ ! "$TERMUX_QUIET_BUILD" = true ]; then
if [ "$TERMUX_REPO_PKG_FORMAT" = "debian" ]; then
echo "Found $PACKAGE in ${TERMUX_REPO_URL[$idx-1]}/dists/${TERMUX_REPO_DISTRIBUTION[$idx-1]}"
echo "found $PACKAGE in ${TERMUX_REPO_URL[$idx-1]}/dists/${TERMUX_REPO_DISTRIBUTION[$idx-1]}"
elif [ "$TERMUX_REPO_PKG_FORMAT" = "pacman" ]; then
echo "Found $PACKAGE in ${TERMUX_REPO_URL[$idx-1]}"
echo "found $PACKAGE in ${TERMUX_REPO_URL[$idx-1]}"
fi
fi
break 2
Expand All @@ -82,9 +83,9 @@ termux_download_deb_pac() {
if [ -n "$PKG_HASH" ] && [ "$PKG_HASH" != "null" ]; then
if [ ! "$TERMUX_QUIET_BUILD" = true ]; then
if [ "$TERMUX_REPO_PKG_FORMAT" = "debian" ]; then
echo "Found $PACKAGE in ${TERMUX_REPO_URL[$idx-1]}/dists/${TERMUX_REPO_DISTRIBUTION[$idx-1]}"
echo "found $PACKAGE in ${TERMUX_REPO_URL[$idx-1]}/dists/${TERMUX_REPO_DISTRIBUTION[$idx-1]}"
elif [ "$TERMUX_REPO_PKG_FORMAT" = "pacman" ]; then
echo "Found $PACKAGE in ${TERMUX_REPO_URL[$idx-1]}"
echo "found $PACKAGE in ${TERMUX_REPO_URL[$idx-1]}"
fi
fi
break
Expand All @@ -102,9 +103,9 @@ termux_download_deb_pac() {
if [ -n "$PKG_HASH" ] && [ "$PKG_HASH" != "null" ]; then
if [ ! "$TERMUX_QUIET_BUILD" = true ]; then
if [ "$TERMUX_REPO_PKG_FORMAT" = "debian" ]; then
echo "Found $PACKAGE in ${TERMUX_REPO_URL[$idx-1]}/dists/${TERMUX_REPO_DISTRIBUTION[$idx-1]}"
echo "found $PACKAGE in ${TERMUX_REPO_URL[$idx-1]}/dists/${TERMUX_REPO_DISTRIBUTION[$idx-1]}"
elif [ "$TERMUX_REPO_PKG_FORMAT" = "pacman" ]; then
echo "Found $PACKAGE in ${TERMUX_REPO_URL[$idx-1]}"
echo "found $PACKAGE in ${TERMUX_REPO_URL[$idx-1]}"
fi
fi
break
Expand Down
17 changes: 8 additions & 9 deletions scripts/build/termux_step_get_dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,27 +20,27 @@ termux_step_get_dependencies() {
local pkg_versioned="$PKG" build_dependency="false" force_build_dependency="$TERMUX_FORCE_BUILD_DEPENDENCIES"
[[ "${TERMUX_WITHOUT_DEPVERSION_BINDING}" == "false" ]] && pkg_versioned+="@$DEP_VERSION"
if [[ "$cyclic_dependence" == "false" ]]; then
[[ "$TERMUX_QUIET_BUILD" != "true" ]] && echo "Downloading dependency $pkg_versioned if necessary..."
[[ "$TERMUX_QUIET_BUILD" != "true" ]] && echo -n "Downloading dependency $pkg_versioned if necessary... "
if [[ "$TERMUX_FORCE_BUILD_DEPENDENCIES" == "true" && "$TERMUX_ON_DEVICE_BUILD" == "true" && "$DEP_ON_DEVICE_NOT_SUPPORTED" == "true" ]]; then
echo "Building dependency $PKG on device is not supported. It will be downloaded..."
echo -n "building dependency $PKG on device is not supported. It will be downloaded... "
force_build_dependency="false"
fi
else
force_build_dependency="false"
fi
if [[ "$force_build_dependency" = "true" ]]; then
termux_force_check_package_dependency && continue || :
[[ "$TERMUX_QUIET_BUILD" != "true" ]] && echo "Force building dependency $PKG instead of downloading due to -I flag..."
[[ "$TERMUX_QUIET_BUILD" != "true" ]] && echo -n "force building dependency $PKG instead of downloading due to -I flag... "
build_dependency="true"
else
if termux_package__is_package_version_built "$PKG" "$DEP_VERSION"; then
[[ "$TERMUX_QUIET_BUILD" != "true" ]] && echo "Skipping already built dependency $pkg_versioned"
[[ "$TERMUX_QUIET_BUILD" != "true" ]] && echo "have already built dependency $pkg_versioned"
continue
fi
if ! TERMUX_WITHOUT_DEPVERSION_BINDING="$([[ "${cyclic_dependence}" == "true" ]] && echo "true" || echo "${TERMUX_WITHOUT_DEPVERSION_BINDING}")" termux_download_deb_pac $PKG $DEP_ARCH $DEP_VERSION $DEP_VERSION_PAC; then
[[ "$cyclic_dependence" == "true" || ( "$TERMUX_FORCE_BUILD_DEPENDENCIES" == "true" && "$TERMUX_ON_DEVICE_BUILD" == "true" ) ]] \
&& termux_error_exit "Download of $PKG$([[ "${TERMUX_WITHOUT_DEPVERSION_BINDING}" == "false" && "${cyclic_dependence}" == "false" ]] && echo "@$DEP_VERSION") from $TERMUX_REPO_URL failed"
echo "Download of $pkg_versioned from $TERMUX_REPO_URL failed, building instead"
echo "Download from $TERMUX_REPO_URL failed, building instead"
build_dependency="true"
fi
fi
Expand All @@ -49,7 +49,6 @@ termux_step_get_dependencies() {
termux_add_package_to_built_packages_list "$PKG"
fi
if [[ "$TERMUX_ON_DEVICE_BUILD" == "false" ]]; then
[[ "$TERMUX_QUIET_BUILD" != "true" ]] && echo "extracting $PKG to $TERMUX_COMMON_CACHEDIR-$DEP_ARCH..."
(
cd "$TERMUX_COMMON_CACHEDIR-$DEP_ARCH"
if [[ "$TERMUX_REPO_PKG_FORMAT" == "debian" ]]; then
Expand All @@ -70,13 +69,13 @@ termux_step_get_dependencies() {
else # Build dependencies
# Built dependencies are put in the default TERMUX_OUTPUT_DIR instead of the specified one
if [[ "$TERMUX_FORCE_BUILD_DEPENDENCIES" == "true" ]]; then
[[ "$TERMUX_QUIET_BUILD" != "true" ]] && echo "Force building dependency $PKG..."
[[ "$TERMUX_QUIET_BUILD" != "true" ]] && echo -n "force building dependency $PKG... "
read -r DEP_ARCH DEP_VERSION DEP_VERSION_PAC DEP_ON_DEVICE_NOT_SUPPORTED < <(termux_extract_dep_info $PKG "${PKG_DIR}")
[[ "$TERMUX_ON_DEVICE_BUILD" == "true" && "$DEP_ON_DEVICE_NOT_SUPPORTED" == "true" ]] \
&& termux_error_exit "Building $PKG on device is not supported. Consider passing -I flag to download it instead"
termux_force_check_package_dependency && continue
else
[[ "$TERMUX_QUIET_BUILD" != "true" ]] && echo "Building dependency $PKG if necessary..."
[[ "$TERMUX_QUIET_BUILD" != "true" ]] && echo -n "building dependency $PKG if necessary... "
fi
termux_run_build-package
fi
Expand All @@ -85,7 +84,7 @@ termux_step_get_dependencies() {

termux_force_check_package_dependency() {
if termux_check_package_in_built_packages_list "$PKG" && termux_package__is_package_version_built "$PKG" "$DEP_VERSION"; then
[[ "$TERMUX_QUIET_BUILD" != "true" ]] && echo "Skipping already built dependency $PKG$([[ "${TERMUX_WITHOUT_DEPVERSION_BINDING}" == "false" ]] && echo "@$DEP_VERSION")"
[[ "$TERMUX_QUIET_BUILD" != "true" ]] && echo "skipping already built dependency $PKG$([[ "${TERMUX_WITHOUT_DEPVERSION_BINDING}" == "false" ]] && echo "@$DEP_VERSION")"
return 0
fi
return 1
Expand Down
10 changes: 5 additions & 5 deletions scripts/build/termux_step_start_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ termux_step_start_build() {
fi

if [ -n "${TERMUX_PKG_EXCLUDED_ARCHES:=""}" ] && [ "$TERMUX_PKG_EXCLUDED_ARCHES" != "${TERMUX_PKG_EXCLUDED_ARCHES/$TERMUX_ARCH/}" ]; then
echo "Skipping building $TERMUX_PKG_NAME for arch $TERMUX_ARCH"
echo "skipping build $TERMUX_PKG_NAME for $TERMUX_ARCH"
exit 0
fi

Expand Down Expand Up @@ -42,7 +42,7 @@ termux_step_start_build() {
if [ "$TERMUX_PKG_HAS_DEBUG" = "true" ]; then
DEBUG="-dbg"
else
echo "Skipping building debug build for $TERMUX_PKG_NAME"
echo "skipping debug build of $TERMUX_PKG_NAME"
exit 0
fi
else
Expand All @@ -52,12 +52,12 @@ termux_step_start_build() {
if [ "$TERMUX_DEBUG_BUILD" = "false" ] && [ "$TERMUX_FORCE_BUILD" = "false" ]; then
if [ -e "$TERMUX_BUILT_PACKAGES_DIRECTORY/$TERMUX_PKG_NAME" ] &&
[ "$(cat "$TERMUX_BUILT_PACKAGES_DIRECTORY/$TERMUX_PKG_NAME")" = "$TERMUX_PKG_FULLVERSION" ]; then
echo "$TERMUX_PKG_NAME@$TERMUX_PKG_FULLVERSION built - skipping (rm $TERMUX_BUILT_PACKAGES_DIRECTORY/$TERMUX_PKG_NAME to force rebuild)"
echo "$TERMUX_PKG_NAME@$TERMUX_PKG_VERSION already built - skipping (rm $TERMUX_BUILT_PACKAGES_DIRECTORY/$TERMUX_PKG_NAME to force rebuild)"
exit 0
elif [ "$TERMUX_ON_DEVICE_BUILD" = "true" ] &&
([[ "$TERMUX_APP_PACKAGE_MANAGER" = "apt" && "$(dpkg-query -W -f '${db:Status-Status} ${Version}\n' "$TERMUX_PKG_NAME" 2>/dev/null)" = "installed $TERMUX_PKG_FULLVERSION" ]] ||
[[ "$TERMUX_APP_PACKAGE_MANAGER" = "pacman" && "$(pacman -Q $TERMUX_PKG_NAME 2>/dev/null)" = "$TERMUX_PKG_NAME $TERMUX_PKG_FULLVERSION_FOR_PACMAN" ]]); then
echo "$TERMUX_PKG_NAME@$TERMUX_PKG_FULLVERSION installed - skipping"
echo "$TERMUX_PKG_NAME@$TERMUX_PKG_VERSION already installed - skipping"
exit 0
fi
fi
Expand All @@ -69,7 +69,7 @@ termux_step_start_build() {
TERMUX_PKG_BUILD_ONLY_MULTILIB=true
fi

echo "termux - building $TERMUX_PKG_NAME for arch $TERMUX_ARCH..."
echo "Building $TERMUX_PKG_NAME for $TERMUX_ARCH..."
test -t 1 && printf "\033]0;%s...\007" "$TERMUX_PKG_NAME"

# Avoid exporting PKG_CONFIG_LIBDIR until after termux_step_host_build.
Expand Down