[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - bin/symstore.sh

[Juergen Funk (via logerrit)]

 bin/symstore.sh |   21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

New commits:
commit 9f81310c32cc1c050fe79b8a8aeaff0b598f6a10
Author:     Juergen Funk <juergen.funk_ml at cib.de>
AuthorDate: Thu Nov 14 12:25:35 2019 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Thu Jan 23 15:48:08 2020 +0100

    Add comment and pdb-only switch to symstore.sh
    
    Two new switches added:
        -c plus a comment for the transaction
        -n do not store the exe/dll on the symbol server
    
    Reviewed-on: https://gerrit.libreoffice.org/82751
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit 83e3ba6fba486a5bf68427f0cf9aa9de7d97a391)
    
    §§{JNKCMD:NoBuild}§§
    
    Change-Id: I8c5db06909720707987970347e298be6d55ebc71
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87265
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/bin/symstore.sh b/bin/symstore.sh
index b368eb3e6715..f37ea0f4e7a0 100755
--- a/bin/symstore.sh
+++ b/bin/symstore.sh
@@ -7,7 +7,7 @@ add_pdb()
     list=$3
     for file in $(find "${INSTDIR}/" -name "*.${extension}"); do
         # store dll/exe itself (needed for minidumps)
-        if [ -f "$file" ]; then
+        if [ -f "$file" -a $WITHEXEC == 1 ] ; then
             cygpath -w "$file" >> "$list"
         fi
         # store pdb file
@@ -36,12 +36,17 @@ which symstore.exe > /dev/null 2>&1 || {
 # defaults
 MAX_KEEP=5
 SYM_PATH=${WORKDIR}/symstore
+COMMENT=""
+COMCMD=""
+WITHEXEC=1
 
 USAGE="Usage: $0 [-h|-k <keep_num_versions>|-p <symbol_store_path>]
-       -h:         this cruft
-       -k <int>:   keep this number of old symbol versions around
-                   (default: ${MAX_KEEP}. Set to 0 for unlimited)
-       -p <path>:  specify full path to symbol store tree
+       -h:          this cruft
+       -c <comment> specifies a comment for the transaction
+       -n           do not store exe/dll on the symbole server
+       -k <int>:    keep this number of old symbol versions around
+                    (default: ${MAX_KEEP}. Set to 0 for unlimited)
+       -p <path>:   specify full path to symbol store tree
 If no path is specified, defaults to ${SYM_PATH}.
 "
 
@@ -51,7 +56,9 @@ do
    case "$1" in
     -k|--keep) MAX_KEEP="$2"; shift 2;;
     -p|--path) SYM_PATH="$2"; shift 2;;
-    -h|--help) echo "${USAGE}"; exit 0; shift;;
+    -c|--comment) COMCMD="/c"; COMMENT="$2"; shift 2;;
+    -n|--noexec) WITHEXEC=0; shift ;;
+    -h|--help) echo "${USAGE}"; exit 0;;
     -*) echo "${USAGE}" >&2; exit 1;;
     *) break;;
    esac
@@ -71,7 +78,7 @@ add_pdb dll Library "${TMPFILE}"
 add_pdb exe Executable "${TMPFILE}"
 
 # stick all of it into symbol store
-symstore.exe add /compress /f "@$(cygpath -w "${TMPFILE}")" /s "$(cygpath -w "${SYM_PATH}")" /t "${PRODUCTNAME}" /v "${LIBO_VERSION_MAJOR}.${LIBO_VERSION_MINOR}.${LIBO_VERSION_MICRO}.${LIBO_VERSION_PATCH}${LIBO_VERSION_SUFFIX}${LIBO_VERSION_SUFFIX_SUFFIX}"
+symstore.exe add /compress /f "@$(cygpath -w "${TMPFILE}")" /s "$(cygpath -w "${SYM_PATH}")" /t "${PRODUCTNAME}" /v "${LIBO_VERSION_MAJOR}.${LIBO_VERSION_MINOR}.${LIBO_VERSION_MICRO}.${LIBO_VERSION_PATCH}${LIBO_VERSION_SUFFIX}${LIBO_VERSION_SUFFIX_SUFFIX}" "${COMCMD}" "${COMMENT}"
 rm -f "${TMPFILE}"
 
 # Cleanup symstore, older revisions will be removed.  Unless the