Skip to content

Commit

Permalink
bootstrap: Do not set up Git submodules by default
Browse files Browse the repository at this point in the history
Building OpenOCD with jimtcl and libjaylink Git submodules is deprecated
and will be removed in the upcoming releases. The remaining 'git2cl'
submodule is only required during the OpenOCD release process.

Only set up Git submodules when the 'with-submodules' argument is used,
for example during the OpenOCD release process or for the transition
period until all submodules are replaced by external dependencies.

We keep the existing 'nosubmodule' argument in order to not break
automatic testing with Jenkins.

Change-Id: Ia4fd765e3a2d6b2c40b084a1ffdf919d5f4f35bb
Signed-off-by: Marc Schink <[email protected]>
Reviewed-on: https://review.openocd.org/c/openocd/+/8381
Tested-by: jenkins
Reviewed-by: Antonio Borneo <[email protected]>
Reviewed-by: R. Diez <[email protected]>
  • Loading branch information
zapb-0 authored and borneoa committed Jan 25, 2025
1 parent 77c904f commit a510d51
Showing 1 changed file with 11 additions and 9 deletions.
20 changes: 11 additions & 9 deletions bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,21 @@ else
exit 1
fi

SKIP_SUBMODULE=0
WITH_SUBMODULES=0

case "$#" in
0) ;;
1) if [ "$1" = "nosubmodule" ]; then
SKIP_SUBMODULE=1
else
1) if [ "$1" = "with-submodules" ]; then
WITH_SUBMODULES=1
elif [ "$1" = "nosubmodule" ]; then
WITH_SUBMODULES=0
elif [ -n "$1" ]; then
echo "$0: Illegal argument $1" >&2
echo "USAGE: $0 [nosubmodule]" >&2
echo "USAGE: $0 [with-submodules]" >&2
exit 1
fi;;
*) echo "$0: Wrong number of command-line arguments." >&2
echo "USAGE: $0 [nosubmodule]" >&2
echo "USAGE: $0 [with-submodules]" >&2
exit 1;;
esac

Expand All @@ -42,12 +44,12 @@ autoheader --warnings=all
automake --warnings=all --gnu --add-missing --copy
)

if [ "$SKIP_SUBMODULE" -ne 0 ]; then
echo "Skipping submodule setup"
else
if [ "$WITH_SUBMODULES" -ne 0 ]; then
echo "Setting up submodules"
git submodule sync
git submodule update --init
else
echo "Skipping submodule setup"
fi

if [ -x src/jtag/drivers/libjaylink/autogen.sh ]; then
Expand Down

0 comments on commit a510d51

Please sign in to comment.