[Libreoffice-commits] core.git: solenv/bin

[Norbert Thiebaud]

 solenv/bin/bin_library_info.sh |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 685570fbde82b482a46c5d07e0b7deed1daf5ed1
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Oct 20 10:35:10 2013 -0500

    pre-built bin... adjust the utility script to the movement to external/
    
    so-called external modules are being moved from the top level to a
    sub-directory in external/
    
    The script bin_library_info is collecting among other thing the
    sha of the tree object that represent the top level of the module
    itself... so we need to account for the fact that such module
    is not necessarily at $SRCDIR/<module> but can be at
    $SRCDIR/external/module
    
    Change-Id: I6c6912a51819669bde512fa8acad7ac82eb50334

diff --git a/solenv/bin/bin_library_info.sh b/solenv/bin/bin_library_info.sh
index 29d8a4b..10200ed 100755
--- a/solenv/bin/bin_library_info.sh
+++ b/solenv/bin/bin_library_info.sh
@@ -43,7 +43,11 @@ get_library_gbuild_sha()
     local module="$1"
 
     pushd ${SRCDIR?} > /dev/null
-    git ls-tree HEAD | grep "\t${module?}$" | cut -f 1 | cut -d " " -f 3
+    if [ -d "${SRCDIR}/external/${module?}" ] ; then
+        git ls-tree -d HEAD "external/${module?}" | cut -f 1 | cut -d " " -f 3
+    else
+        git ls-tree -d HEAD | "{module?}" | cut -f 1 | cut -d " " -f 3
+    fi
     popd ${SRCDIR?} > /dev/null
 }