[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-844-ga510d51a7

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  a510d51a78f14fbb8416037a587ce1bfc6016d24 (commit)
      from  77c904fd13c08077cafd0845107506db408b5bb1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a510d51a78f14fbb8416037a587ce1bfc6016d24
Author: Marc Schink <de...@za...>
Date:   Wed Jun 26 15:50:45 2024 +0200

    bootstrap: Do not set up Git submodules by default
    
    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 <de...@za...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/8381
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>
    Reviewed-by: R. Diez <rdi...@rd...>

diff --git a/bootstrap b/bootstrap
index 9dfdc41ac..0ee26d4ed 100755
--- a/bootstrap
+++ b/bootstrap
@@ -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
 
@@ -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

-----------------------------------------------------------------------

Summary of changes:
 bootstrap | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository