bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bootstrap: allow more than one submodule


From: Bruno Haible
Subject: bootstrap: allow more than one submodule
Date: Sun, 14 Mar 2010 14:14:25 +0100
User-agent: KMail/1.9.9

Hi Eric,

As I understand it, 'bootstrap' currently updates all submodules when it
wants to update only the gnulib submodule. What about packages that will have
other submodules? Here is a proposed fix:


2010-03-14  Bruno Haible  <address@hidden>

        * build-aux/bootstrap: Apply "git submodule" commands only to the
        gnulib submodule.

--- build-aux/bootstrap.orig    Sun Mar 14 14:10:16 2010
+++ build-aux/bootstrap Sun Mar 14 14:01:58 2010
@@ -416,8 +416,8 @@
 -)
   if git_modules_config submodule.gnulib.url >/dev/null; then
     echo "$0: getting gnulib files..."
-    git submodule init || exit $?
-    git submodule update || exit $?
+    git submodule init "$gnulib_path" || exit $?
+    git submodule update "$gnulib_path" || exit $?
 
   elif [ ! -d "$gnulib_path" ]; then
     echo "$0: getting gnulib files..."
@@ -445,13 +445,14 @@
       # This fallback allows at least git 1.5.5.
       if test -f "$gnulib_path"/gnulib-tool; then
         # Since file already exists, assume submodule init already complete.
-        git submodule update || exit $?
+        git submodule update "$gnulib_path" || exit $?
       else
         # Older git can't clone into an empty directory.
         rmdir "$gnulib_path" 2>/dev/null
         git clone --reference "$GNULIB_SRCDIR" \
           "$(git_modules_config submodule.gnulib.url)" "$gnulib_path" \
-          && git submodule init && git submodule update \
+          && git submodule init "$gnulib_path" \
+          && git submodule update "$gnulib_path" \
           || exit $?
       fi
     fi




reply via email to

[Prev in Thread] Current Thread [Next in Thread]