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

keep build state when running command again #23840

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
+8 −4
Open

keep build state when running command again #23840

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
2 changes: 2 additions & 0 deletions scripts/build/configure/termux_step_configure.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
termux_step_configure() {
[ "$TERMUX_PKG_METAPACKAGE" = "true" ] && return
[ -f "$TERMUX_PKG_CONFIGURE_MARKER" ] && ! $TERMUX_FORCE_BUILD && echo packet already configured run with -f to reconfigure && return

# This check should be above autotools check as haskell package too makes use of configure scripts which
# should be executed by its own build system.
Expand Down Expand Up @@ -31,4 +32,5 @@ termux_step_configure() {
fi
termux_step_configure_meson
fi
touch $TERMUX_PKG_CONFIGURE_MARKER
}
3 changes: 1 addition & 2 deletions scripts/build/get_source/termux_git_clone_src.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ termux_git_clone_src() {
popd

echo "$TERMUX_PKG_VERSION" > $TMP_CHECKOUT_VERSION
fi

rm -rf $TERMUX_PKG_SRCDIR
cp -Rf $TMP_CHECKOUT $TERMUX_PKG_SRCDIR
fi
}
1 change: 1 addition & 0 deletions scripts/build/get_source/termux_step_get_source.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ termux_step_get_source() {
if [ "${TERMUX_PKG_SRCURL:0:4}" == "git+" ]; then
termux_git_clone_src
else
[ -d "$TERMUX_PKG_SRCDIR" ] && echo source folder already exists use -f to delete && return
if [ -z "${TERMUX_PKG_SRCURL}" ] || [ "${TERMUX_PKG_SKIP_SRC_EXTRACT-false}" = "true" ] || [ "$TERMUX_PKG_METAPACKAGE" = "true" ]; then
mkdir -p "$TERMUX_PKG_SRCDIR"
return
Expand Down
2 changes: 1 addition & 1 deletion scripts/build/termux_step_make.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ termux_step_make() {
fi

if test -f build.ninja; then
ninja -j $TERMUX_PKG_MAKE_PROCESSES
ninja -j $TERMUX_PKG_MAKE_PROCESSES $TERMUX_PKG_EXTRA_MAKE_ARGS
elif ls ./*.cabal &>/dev/null; then
cabal build
elif ls ./*akefile &>/dev/null || [ ! -z "$TERMUX_PKG_EXTRA_MAKE_ARGS" ]; then
Expand Down
2 changes: 1 addition & 1 deletion scripts/build/termux_step_patch_package.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ termux_step_patch_package() {
-e "s%\@TERMUX_HOME\@%${TERMUX_ANDROID_HOME}%g" \
-e "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" \
-e "s%\@TERMUX_PREFIX_CLASSICAL\@%${TERMUX_PREFIX_CLASSICAL}%g" \
"$patch" | patch --silent -p1
"$patch" | patch -f --silent -p1 || [ -f "$TERMUX_PKG_CONFIGURE_MARKER" ]
done
shopt -u nullglob
}
1 change: 1 addition & 0 deletions scripts/build/termux_step_setup_build_folders.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
termux_step_setup_build_folders() {
[ -f "$TERMUX_PKG_CONFIGURE_MARKER" ] && ! $TERMUX_FORCE_BUILD && echo previous build detected use -f start over && return
# Following directories may contain files with read-only
# permissions which makes them undeletable. We need to fix
# that.
Expand Down
1 change: 1 addition & 0 deletions scripts/build/termux_step_setup_variables.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ termux_step_setup_variables() {
TERMUX_PKG_BUILD_DEPENDS=""
TERMUX_PKG_BUILD_IN_SRC=false
TERMUX_PKG_CONFFILES=""
TERMUX_PKG_CONFIGURE_MARKER=$TERMUX_TOPDIR/$TERMUX_PKG_NAME/.configured
TERMUX_PKG_CONFLICTS="" # https://www.debian.org/doc/debian-policy/ch-relationships.html#s-conflicts
TERMUX_PKG_DEPENDS=""
TERMUX_PKG_DESCRIPTION="FIXME:Add description"
Expand Down