[Libreoffice-commits] core.git: bin/symstore.sh download.lst external/openssl external/python3

2022-09-10 Thread Caolán McNamara (via logerrit) 
 bin/symstore.sh |4 
 download.lst|4 
 external/openssl/0001-Inthe-VC-common-target-unquote-CC.patch.1 |   54 
 external/openssl/ExternalPackage_openssl.mk |8 -
 external/openssl/UnpackedTarball_openssl.mk |3 
 external/openssl/configurable-z-option.patch.0  |6 
 external/openssl/openssl-no-ipc-cmd.patch.0 |   65 
++
 external/openssl/openssl-no-multilib.patch.0|   24 +--
 external/openssl/system-cannot-find-path-for-move.patch.0   |   22 +++
 external/python3/python-3.7.6-msvc-ssl.patch.1  |6 
 10 files changed, 171 insertions(+), 25 deletions(-)

New commits:
commit a539db002bc9ee6692d14cde2aaa166bd213eb51
Author: Caolán McNamara 
AuthorDate: Thu Sep 8 11:08:36 2022 +0100
Commit: Caolán McNamara 
CommitDate: Sat Sep 10 15:34:54 2022 +0200

upgrade to openssl-3.0.5

patch out using IPC::Cmd instead of requiring adding it
to build-time dependencies

for mysterious:

The system cannot find the path specified.
NMAKE : fatal error U1077: 
'""C:\PROGRA~2\MIB055~1\2019\COMMUN~1\VC\Tools\MSVC\1429~1.301\bin\Hostx64\x86\cl.exe'
 : return code '0x1'
Stop.
NMAKE : fatal error U1077: '"C:\Program Files (x86)\Microsoft Visual 
Studio\2019\Community\VC\Tools\MSVC\14.29.30133\bin\Hostx64\x86\nmake.exe"' : 
return code '0x2'
Stop.

include fix from https://github.com/openssl/openssl/issues/18823

and for

move /Y crypto/aes/aes-586.asm.i crypto/aes/aes-586.asm
The system cannot find the path specified.
NMAKE : fatal error U1077: 'move' : return code '0x1'

add own patch to use mv and rm for move and del

Change-Id: I071750e20efd0931ea1c5c3b49e7a5173c7283f8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139641
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/bin/symstore.sh b/bin/symstore.sh
index 2734f1b22a58..332c9d817f56 100755
--- a/bin/symstore.sh
+++ b/bin/symstore.sh
@@ -16,8 +16,8 @@ EXCLUDE_LIST="python.exe"
 #
 # Same format as for EXCLUDE_LIST above
 MOREPDBS_OKLIST="libcurl.dll
-libcrypto-1_1.dll
-libssl-1_1.dll
+libcrypto-3.dll
+libssl-3.dll
 freebl3.dll
 libeay32.dll
 nspr4.dll
diff --git a/download.lst b/download.lst
index 6a86898646d8..c6f95a10d6a2 100644
--- a/download.lst
+++ b/download.lst
@@ -196,8 +196,8 @@ export OFFICEOTRON_SHA256SUM := 
f2443f27561af52324eee03a1892d9f569adc8db9e7bca55
 export OFFICEOTRON_JAR := 
8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
 export OPENLDAP_SHA256SUM := 
99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34
 export OPENLDAP_TARBALL := openldap-2.4.59.tgz
-export OPENSSL_SHA256SUM := 
d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca
-export OPENSSL_TARBALL := openssl-1.1.1q.tar.gz
+export OPENSSL_SHA256SUM := 
aa7d8d9bef71ad6525c55ba11e5f4397889ce49c2c9349dcea6d3e4f0b024a7a
+export OPENSSL_TARBALL := openssl-3.0.5.tar.gz
 export ORCUS_SHA256SUM := 
2a86c405a5929f749b27637509596421d46805753364ab258b035fd01fbde143
 export ORCUS_TARBALL := liborcus-0.17.2.tar.bz2
 export PAGEMAKER_SHA256SUM := 
66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d
diff --git a/external/openssl/0001-Inthe-VC-common-target-unquote-CC.patch.1 
b/external/openssl/0001-Inthe-VC-common-target-unquote-CC.patch.1
new file mode 100644
index ..45ce5a9038e5
--- /dev/null
+++ b/external/openssl/0001-Inthe-VC-common-target-unquote-CC.patch.1
@@ -0,0 +1,54 @@
+From c04b8819161de007cee831dd9e58dde52268da18 Mon Sep 17 00:00:00 2001
+From: Richard Levitte 
+Date: Mon, 25 Jul 2022 08:07:33 +0200
+Subject: [PATCH] Configurations/10-main.conf: In the VC-common target, unquote
+ $(CC)
+
+Some of the VC-common attributes have values that use `$(CC)`, wrapped with
+quotes.  However, `Configurations/windows-makefile.tmpl` already quotes the
+`CC` value, like this:
+
+CC="{- $config{CC} -}"
+
+The interaction between that makefile variable and the attributes using
+`$(CC)` wrapped with quotes is a command line with the quotes doubled.  For
+example, the value of `$(CPP)` becomes `""cl""`.
+
+Strangely enough, this appears to be tolerated, at least on some versions of
+Windows.  However, this has been reported not to be the case.
+
+This is fixed by removing the quotes in `Configurations/10-main.conf`,
+making `Configurations/windows-makefile.tmpl` responsible for proper
+quoting.
+
+Fixes #18823
+
+Reviewed-by: Hugo Landau 
+Reviewed-by: Matt Caswell 
+(Merged from https://github.com/openssl/openssl/pull/18861)
+---
+ Configurations/10-main.conf | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
+index c824f4ed4a0..73ace78bc41 100644
+--- a/Configurations/10-main.conf

[Libreoffice-commits] core.git: bin/symstore.sh

2021-08-18 Thread Thorsten Behrens (via logerrit) 
 bin/symstore.sh |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 133352645a8c10fc0d13795480a3c2f93c36a61f
Author: Thorsten Behrens 
AuthorDate: Wed Aug 18 22:48:46 2021 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Aug 18 22:51:15 2021 +0200

Teach symstore more duplicated DLLs

Amending commit b4dfba947768834ffecc09056992019878711c8b with
adding the copied DLLs here, too (symstore complains otherwise)

Change-Id: If5cc155cf2fe11b0f97cd152993609fd2c835316
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120686
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/bin/symstore.sh b/bin/symstore.sh
index c4e9870c9aa5..2734f1b22a58 100755
--- a/bin/symstore.sh
+++ b/bin/symstore.sh
@@ -16,6 +16,8 @@ EXCLUDE_LIST="python.exe"
 #
 # Same format as for EXCLUDE_LIST above
 MOREPDBS_OKLIST="libcurl.dll
+libcrypto-1_1.dll
+libssl-1_1.dll
 freebl3.dll
 libeay32.dll
 nspr4.dll

[Libreoffice-commits] core.git: bin/symstore.sh

2020-03-06 Thread Juergen Funk (via logerrit) 
 bin/symstore.sh |   24 +---
 1 file changed, 21 insertions(+), 3 deletions(-)

New commits:
commit d0b9d7c2915f45ad34cc8a764cb9674cfbf3203b
Author: Juergen Funk 
AuthorDate: Fri Mar 6 11:43:21 2020 +0100
Commit: Thorsten Behrens 
CommitDate: Fri Mar 6 16:26:54 2020 +0100

symstore.sh: add vorbose mode

Change-Id: I01f9827140810080c037108021ca70f2b906b05e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90083
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/bin/symstore.sh b/bin/symstore.sh
index b1470ae9b947..532efb16630f 100755
--- a/bin/symstore.sh
+++ b/bin/symstore.sh
@@ -31,6 +31,10 @@ sqlite3.dll
 ssl3.dll
 ssleay32.dll"
 
+verbose_none()
+{
+do_none=
+}
 
 add_pdb()
 {
@@ -45,10 +49,15 @@ add_pdb()
 ret=$(find "${INSTDIR}/" -type f -name "*.${extension}" | grep -vF 
"$BLACK_LIST")
 while IFS= read -r file
 do
+${VERBOSE} -n "Found: $file"
 # store dll/exe itself (needed for minidumps)
 if [ $WITHEXEC == 1 ] ; then
 cygpath -w "$file" >> "$list"
+${VERBOSE} " insert"
+else
+${VERBOSE} " "
 fi
+
 # store pdb file
 filename=$(basename "$file" ".${extension}")
 pdball+=($(grep -i "/${filename}${pdbext}" <<< ${ALL_PDBS}))
@@ -56,8 +65,12 @@ add_pdb()
 cygpath -w "${pdball[0]}" >> "$list"
 fi
 case ${#pdball[@]} in
-0) ((++stats_notfound)) ;;
-1) ((++stats_found)) ;;
+0) ((++stats_notfound))
+   ${VERBOSE} "   PDB not found"
+;;
+1) ((++stats_found))
+   ${VERBOSE} "   ${pdball[0]} insert"
+;;
 *) ((++stats_morefound))
 if [ -z "$(echo $file | grep -F "$MOREPDBS_OKLIST")" ]; then
 echo "Error: found duplicate PDBs:"
@@ -65,6 +78,8 @@ add_pdb()
echo " $morepdbs"
 done
 exit 1
+else
+   ${VERBOSE} "   ${pdball[0]} insert (is in more okay 
list)"
 fi
 ;;
 esac
@@ -98,13 +113,15 @@ SYM_PATH=${WORKDIR}/symstore
 COMMENT=""
 COMCMD=""
 WITHEXEC=1
+VERBOSE=verbose_none
 
-USAGE="Usage: $0 [-h|-k |-p ]
+USAGE="Usage: $0 [-h|-k |-p |-c 
|-n|-v]
-h:  this cruft
-c  specifies a comment for the transaction
-n   do not store exe/dll on the symbole server
-k :keep this number of old symbol versions around
 (default: ${MAX_KEEP}. Set to 0 for unlimited)
+   -v   verbose mode, output detail report of files
-p :   specify full path to symbol store tree
 If no path is specified, defaults to ${SYM_PATH}.
 "
@@ -117,6 +134,7 @@ do
 -p|--path) SYM_PATH="$2"; shift 2;;
 -c|--comment) COMCMD="/c"; COMMENT="$2"; shift 2;;
 -n|--noexec) WITHEXEC=0; shift ;;
+-v|--verbose) VERBOSE=echo; shift ;;
 -h|--help) echo "${USAGE}"; exit 0;;
 -*) echo "${USAGE}" >&2; exit 1;;
 *) break;;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/symstore.sh external/nss

2020-02-14 Thread Juergen Funk (via logerrit) 
 bin/symstore.sh |   16 +++-
 external/nss/ExternalProject_nss.mk |4 
 2 files changed, 19 insertions(+), 1 deletion(-)

New commits:
commit 54acab919e7c7c5d60fc697bda54278861ac250e
Author: Juergen Funk 
AuthorDate: Fri Feb 14 10:05:56 2020 +0100
Commit: Thorsten Behrens 
CommitDate: Fri Feb 14 15:25:24 2020 +0100

Optionally generate PDBs also for nss

Enables pdb generation for symbol builds, for:
- freebl3.dll
- libeay32.dll
- nspr4.dll
- nss3.dll
- nssckbi.dll
- nssdbm3.dll
- nssutil3.dll
- plc4.dll
- plds4.dll
- smime3.dll
- softokn3.dll
- sqlite3.dll
- ssl3.dll
- ssleay32.dll

Change-Id: I231fdc8e8ade7b7a8b85fc76536291e0546f2eac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88673
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/bin/symstore.sh b/bin/symstore.sh
index 9809c5554c8a..b1470ae9b947 100755
--- a/bin/symstore.sh
+++ b/bin/symstore.sh
@@ -15,7 +15,21 @@ BLACK_LIST="python.exe"
 # an error, if duplicates are found.
 #
 # Same format as for BLACK_LIST above
-MOREPDBS_OKLIST="libcurl.dll"
+MOREPDBS_OKLIST="libcurl.dll
+freebl3.dll
+libeay32.dll
+nspr4.dll
+nss3.dll
+nssckbi.dll
+nssdbm3.dll
+nssutil3.dll
+plc4.dll
+plds4.dll
+smime3.dll
+softokn3.dll
+sqlite3.dll
+ssl3.dll
+ssleay32.dll"
 
 
 add_pdb()
diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index 4d175e184da5..57b0c961c611 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -19,6 +19,10 @@ ifeq ($(OS),WNT)
 $(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalExecutable_get_dependencies,python)
$(call gb_ExternalProject_run,build,\
$(if $(MSVC_USE_DEBUG_RUNTIME),USE_DEBUG_RTL=1,BUILD_OPT=1) \
+   $(if $(gb_Module_CURRENTMODULE_SYMBOLS_ENABLED), \
+   MOZ_DEBUG_SYMBOLS=1 \
+   MOZ_DEBUG_FLAGS=" " \
+   OPT_CODE_SIZE=0) \
MOZ_MSVCVERSION=9 OS_TARGET=WIN95 \
$(if $(filter X86_64,$(CPUNAME)),USE_64=1) \
LIB="$(ILIB)" \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/symstore.sh

2019-12-17 Thread Andrea Gelmini (via logerrit) 
 bin/symstore.sh |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2217ed149a6f4a4a3d11d2064112c4791106e994
Author: Andrea Gelmini 
AuthorDate: Tue Dec 17 17:20:05 2019 +0100
Commit: Julien Nabet 
CommitDate: Tue Dec 17 18:17:10 2019 +0100

Fix typos

Change-Id: I2671a0faf78d8ece27aaa88082a60f19197e929f
Reviewed-on: https://gerrit.libreoffice.org/85314
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/bin/symstore.sh b/bin/symstore.sh
index 564739a0279f..9809c5554c8a 100755
--- a/bin/symstore.sh
+++ b/bin/symstore.sh
@@ -11,10 +11,10 @@
 BLACK_LIST="python.exe"
 
 # List files here where it's ok for this script to find more than one
-# occurence in the build tree. Files _not_ included here will generate
+# occurrence in the build tree. Files _not_ included here will generate
 # an error, if duplicates are found.
 #
-# Same format as for BLACK_LIST above above
+# Same format as for BLACK_LIST above
 MOREPDBS_OKLIST="libcurl.dll"
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/symstore.sh

2019-12-17 Thread Juergen Funk (via logerrit) 
 bin/symstore.sh |   68 
 1 file changed, 59 insertions(+), 9 deletions(-)

New commits:
commit 6ca3adf22b62b88b313c8fc9311183efdabe445a
Author: Juergen Funk 
AuthorDate: Tue Nov 26 08:06:39 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Tue Dec 17 10:26:25 2019 +0100

symstore.sh: collect PDBs for *all* artifacts

- a number of external library PDBs where missing
- also the soffice.bin and unopkg.bin (renaming that to *.bin.pdb)

Change-Id: Idafcce87bfefadfa669807a861efab76b4122c62
Reviewed-on: https://gerrit.libreoffice.org/83726
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/bin/symstore.sh b/bin/symstore.sh
index 2f7ad2f77610..564739a0279f 100755
--- a/bin/symstore.sh
+++ b/bin/symstore.sh
@@ -1,22 +1,67 @@
 #!/usr/bin/env bash
 
+# Files listed here would not be store in the symbolestore-server.
+# The format is a string with files e.g.
+#  BLACKLIST="python.exe
+#  file.dll
+#  next_file.exe"
+#
+# It removes "python.exe", "file.dll", and "next_file.exe" from what's
+# added to the symstore. Separator is the newline
+BLACK_LIST="python.exe"
+
+# List files here where it's ok for this script to find more than one
+# occurence in the build tree. Files _not_ included here will generate
+# an error, if duplicates are found.
+#
+# Same format as for BLACK_LIST above above
+MOREPDBS_OKLIST="libcurl.dll"
+
+
 add_pdb()
 {
 extension=$1
-type=$2
+pdbext=$2
 list=$3
-for file in $(find "${INSTDIR}/" -name "*.${extension}"); do
+stats_notfound=0
+stats_found=0
+stats_morefound=0
+declare -a pdball
+echo "Collect $extension"
+ret=$(find "${INSTDIR}/" -type f -name "*.${extension}" | grep -vF 
"$BLACK_LIST")
+while IFS= read -r file
+do
 # store dll/exe itself (needed for minidumps)
-if [ -f "$file" -a $WITHEXEC == 1 ] ; then
+if [ $WITHEXEC == 1 ] ; then
 cygpath -w "$file" >> "$list"
 fi
 # store pdb file
 filename=$(basename "$file" ".${extension}")
-pdb="${WORKDIR}/LinkTarget/${type}/${filename}.pdb"
-if [ -f "$pdb" ]; then
-cygpath -w "$pdb" >> "$list"
+pdball+=($(grep -i "/${filename}${pdbext}" <<< ${ALL_PDBS}))
+if [ -n "${pdball[0]}" ]; then
+cygpath -w "${pdball[0]}" >> "$list"
 fi
-done
+case ${#pdball[@]} in
+0) ((++stats_notfound)) ;;
+1) ((++stats_found)) ;;
+*) ((++stats_morefound))
+if [ -z "$(echo $file | grep -F "$MOREPDBS_OKLIST")" ]; then
+echo "Error: found duplicate PDBs:"
+for morepdbs in ${pdball[@]} ; do
+   echo " $morepdbs"
+done
+exit 1
+fi
+;;
+esac
+unset pdball
+done

[Libreoffice-commits] core.git: bin/symstore.sh

2019-11-19 Thread Juergen Funk (via logerrit) 
 bin/symstore.sh |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 7f8c9ddbbd26594bb9249cc6295d0170e4bb58e7
Author: Juergen Funk 
AuthorDate: Mon Nov 18 10:33:13 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Tue Nov 19 11:17:57 2019 +0100

symstore.sh: use logical operators for test statements

No need to spawn two subshells, test can do and/or logical ops itself.

Change-Id: I2abba303383f9f0053515088d4fa32753a777a1d
Reviewed-on: https://gerrit.libreoffice.org/83066
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/bin/symstore.sh b/bin/symstore.sh
index f37ea0f4e7a0..2f7ad2f77610 100755
--- a/bin/symstore.sh
+++ b/bin/symstore.sh
@@ -20,11 +20,11 @@ add_pdb()
 }
 
 # check preconditions
-if [ -z "${INSTDIR}" ] || [ -z "${WORKDIR}" ]; then
+if [ -z "${INSTDIR}" -o -z "${WORKDIR}" ]; then
 echo "INSTDIR or WORKDIR not set - script expects calling inside buildenv"
 exit 1
 fi
-if [ ! -d "${INSTDIR}" ] || [ ! -d "${WORKDIR}" ]; then
+if [ ! -d "${INSTDIR}" -o ! -d "${WORKDIR}" ]; then
 echo "INSTDIR or WORKDIR not present - script expects calling after full 
build"
 exit 1
 fi
@@ -84,7 +84,7 @@ rm -f "${TMPFILE}"
 # Cleanup symstore, older revisions will be removed.  Unless the
 # .dll/.exe changes, the .pdb should be shared, so with incremental
 # tinderbox several revisions should not be that space-demanding.
-if [ "${MAX_KEEP}" -gt 0 ] && [ -d "${SYM_PATH}/000Admin" ]; then
+if [ "${MAX_KEEP}" -gt 0 -a -d "${SYM_PATH}/000Admin" ]; then
 to_remove=$(ls -1 "${SYM_PATH}/000Admin" | grep -v '\.txt' | grep -v 
'\.deleted' | sort | head -n "-${MAX_KEEP}")
 for revision in $to_remove; do
 symstore.exe del /i "${revision}" /s "$(cygpath -w "${SYM_PATH}")"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/symstore.sh

2019-11-19 Thread Juergen Funk (via logerrit) 
 bin/symstore.sh |   21 ++---
 1 file changed, 14 insertions(+), 7 deletions(-)

New commits:
commit 83e3ba6fba486a5bf68427f0cf9aa9de7d97a391
Author: Juergen Funk 
AuthorDate: Thu Nov 14 12:25:35 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Tue Nov 19 11:17:36 2019 +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

Change-Id: I8c5db06909720707987970347e298be6d55ebc71
Reviewed-on: https://gerrit.libreoffice.org/82751
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

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 |-p ]
-   -h: this cruft
-   -k :   keep this number of old symbol versions around
-   (default: ${MAX_KEEP}. Set to 0 for unlimited)
-   -p :  specify full path to symbol store tree
+   -h:  this cruft
+   -c  specifies a comment for the transaction
+   -n   do not store exe/dll on the symbole server
+   -k :keep this number of old symbol versions around
+(default: ${MAX_KEEP}. Set to 0 for unlimited)
+   -p :   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
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/symstore.sh

2017-01-27 Thread Samuel Mehrbrodt 
 bin/symstore.sh |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 8a0416be440180d0a6cedd449307f6a9bde22eaa
Author: Samuel Mehrbrodt 
Date:   Fri Jan 27 16:57:49 2017 +0100

Symstore: Also add .exe and .dlls to symstore

These are needed when analyzing the minidump.

Change-Id: Ife296c298e3b2f1ca8a47dcbaaf1947e6aefdc81
Reviewed-on: https://gerrit.libreoffice.org/33631
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/bin/symstore.sh b/bin/symstore.sh
index 56260c0..b368eb3 100755
--- a/bin/symstore.sh
+++ b/bin/symstore.sh
@@ -6,13 +6,17 @@ add_pdb()
 type=$2
 list=$3
 for file in $(find "${INSTDIR}/" -name "*.${extension}"); do
+# store dll/exe itself (needed for minidumps)
+if [ -f "$file" ]; then
+cygpath -w "$file" >> "$list"
+fi
+# store pdb file
 filename=$(basename "$file" ".${extension}")
 pdb="${WORKDIR}/LinkTarget/${type}/${filename}.pdb"
 if [ -f "$pdb" ]; then
 cygpath -w "$pdb" >> "$list"
 fi
 done
-
 }
 
 # check preconditions
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/symstore.sh

2017-01-15 Thread Thorsten Behrens 
 bin/symstore.sh |   36 ++--
 1 file changed, 18 insertions(+), 18 deletions(-)

New commits:
commit a1784cc9a73c5f43d084f31ac37b78b3642d46d3
Author: Thorsten Behrens 
Date:   Sun Jan 15 20:51:22 2017 +0100

shellcheck: cleanup symstore.sh

Change-Id: I8eb53c06892934c21d55b69d12e3c8ff09696295

diff --git a/bin/symstore.sh b/bin/symstore.sh
index ca5bd30..56260c0 100755
--- a/bin/symstore.sh
+++ b/bin/symstore.sh
@@ -5,22 +5,22 @@ add_pdb()
 extension=$1
 type=$2
 list=$3
-for file in `find ${INSTDIR}/ -name *.${extension}`; do
-filename=`basename $file .${extension}`
-pdb=`echo ${WORKDIR}/LinkTarget/${type}/${filename}.pdb`
+for file in $(find "${INSTDIR}/" -name "*.${extension}"); do
+filename=$(basename "$file" ".${extension}")
+pdb="${WORKDIR}/LinkTarget/${type}/${filename}.pdb"
 if [ -f "$pdb" ]; then
-echo `cygpath -w $pdb` >>$list
+cygpath -w "$pdb" >> "$list"
 fi
 done
 
 }
 
 # check preconditions
-if [ -z ${INSTDIR} -o -z ${WORKDIR} ]; then
+if [ -z "${INSTDIR}" ] || [ -z "${WORKDIR}" ]; then
 echo "INSTDIR or WORKDIR not set - script expects calling inside buildenv"
 exit 1
 fi
-if [ ! -d ${INSTDIR} -o ! -d ${WORKDIR} ]; then
+if [ ! -d "${INSTDIR}" ] || [ ! -d "${WORKDIR}" ]; then
 echo "INSTDIR or WORKDIR not present - script expects calling after full 
build"
 exit 1
 fi
@@ -47,35 +47,35 @@ do
case "$1" in
 -k|--keep) MAX_KEEP="$2"; shift 2;;
 -p|--path) SYM_PATH="$2"; shift 2;;
--h|--help) printf "$USAGE"; exit 0; shift;;
--*) echo "$USAGE" >&2; exit 1;;
+-h|--help) echo "${USAGE}"; exit 0; shift;;
+-*) echo "${USAGE}" >&2; exit 1;;
 *) break;;
esac
 done
 
 if [ $# -gt 0 ]; then
-echo $usage >&2
+echo "${USAGE}" >&2
 exit 1
 fi
 
 # populate symbol store from here
-TMPFILE=`mktemp` || exit 1
-trap "{ rm -f $TMPFILE; }" EXIT
+TMPFILE=$(mktemp) || exit 1
+trap '{ rm -f ${TMPFILE}; }' EXIT
 
 # add dlls and executables
-add_pdb dll Library $TMPFILE
-add_pdb exe Executable $TMPFILE
+add_pdb dll Library "${TMPFILE}"
+add_pdb exe Executable "${TMPFILE}"
 
 # stick all of it into symbol store
-symstore.exe add /compress /f @${TMPFILE} /s $SYM_PATH /t "${PRODUCTNAME}" /v 
"${LIBO_VERSION_MAJOR}.${LIBO_VERSION_MINOR}.${LIBO_VERSION_MICRO}.${LIBO_VERSION_PATCH}${LIBO_VERSION_SUFFIX}${LIBO_VERSION_SUFFIX_SUFFIX}"
-rm -f $TMPFILE
+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}"
+rm -f "${TMPFILE}"
 
 # Cleanup symstore, older revisions will be removed.  Unless the
 # .dll/.exe changes, the .pdb should be shared, so with incremental
 # tinderbox several revisions should not be that space-demanding.
-if [ $MAX_KEEP -gt 0 -a -d ${SYM_PATH}/000Admin ]; then
-to_remove=`ls -1 ${SYM_PATH}/000Admin | grep -v '\.txt' | grep -v 
'\.deleted' | sort | head -n -${MAX_KEEP}`
+if [ "${MAX_KEEP}" -gt 0 ] && [ -d "${SYM_PATH}/000Admin" ]; then
+to_remove=$(ls -1 "${SYM_PATH}/000Admin" | grep -v '\.txt' | grep -v 
'\.deleted' | sort | head -n "-${MAX_KEEP}")
 for revision in $to_remove; do
-symstore.exe del /i ${revision} /s `cygpath -w $SYM_PATH`
+symstore.exe del /i "${revision}" /s "$(cygpath -w "${SYM_PATH}")"
 done
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/symstore.sh Makefile.in

2017-01-15 Thread Thorsten Behrens 
 Makefile.in |1 
 bin/symstore.sh |   81 
 2 files changed, 82 insertions(+)

New commits:
commit 17e9a5bf94eb08f88f8c78c9982dd0ce48a5e2d9
Author: Thorsten Behrens 
Date:   Sun Jan 15 11:50:27 2017 +0100

gbuild: populate local symstore on Windows

Script based on Lubos' tb master script from
http://nabble.documentfoundation.org/Daily-Win32-debug-builds-td4067279.html

Change-Id: I7f3247367a63078881f3cf51cf3e2cad59ad67b5
Reviewed-on: https://gerrit.libreoffice.org/33088
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/Makefile.in b/Makefile.in
index f052ced..454755e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -387,6 +387,7 @@ symbols:
mkdir -p $(WORKDIR)/symbols/
 ifeq ($(OS),WNT)
$(SRCDIR)/bin/symbolstore.py 
$(WORKDIR)/UnpackedTarball/breakpad/src/tools/windows/binaries/dump_syms.exe 
$(WORKDIR)/symbols/ $(INSTDIR)/program/*
+   $(SRCDIR)/bin/symstore.sh
 else
$(SRCDIR)/bin/symbolstore.py 
$(WORKDIR)/UnpackedTarball/breakpad/src/tools/linux/dump_syms/dump_syms 
$(WORKDIR)/symbols/ $(INSTDIR)/program/*
 endif
diff --git a/bin/symstore.sh b/bin/symstore.sh
new file mode 100755
index 000..ca5bd30
--- /dev/null
+++ b/bin/symstore.sh
@@ -0,0 +1,81 @@
+#!/usr/bin/env bash
+
+add_pdb()
+{
+extension=$1
+type=$2
+list=$3
+for file in `find ${INSTDIR}/ -name *.${extension}`; do
+filename=`basename $file .${extension}`
+pdb=`echo ${WORKDIR}/LinkTarget/${type}/${filename}.pdb`
+if [ -f "$pdb" ]; then
+echo `cygpath -w $pdb` >>$list
+fi
+done
+
+}
+
+# check preconditions
+if [ -z ${INSTDIR} -o -z ${WORKDIR} ]; then
+echo "INSTDIR or WORKDIR not set - script expects calling inside buildenv"
+exit 1
+fi
+if [ ! -d ${INSTDIR} -o ! -d ${WORKDIR} ]; then
+echo "INSTDIR or WORKDIR not present - script expects calling after full 
build"
+exit 1
+fi
+which symstore.exe > /dev/null 2>&1 || {
+echo "symstore.exe is expected in the PATH"
+exit 1
+}
+
+# defaults
+MAX_KEEP=5
+SYM_PATH=${WORKDIR}/symstore
+
+USAGE="Usage: $0 [-h|-k |-p ]
+   -h: this cruft
+   -k :   keep this number of old symbol versions around
+   (default: ${MAX_KEEP}. Set to 0 for unlimited)
+   -p :  specify full path to symbol store tree
+If no path is specified, defaults to ${SYM_PATH}.
+"
+
+# process args
+while :
+do
+   case "$1" in
+-k|--keep) MAX_KEEP="$2"; shift 2;;
+-p|--path) SYM_PATH="$2"; shift 2;;
+-h|--help) printf "$USAGE"; exit 0; shift;;
+-*) echo "$USAGE" >&2; exit 1;;
+*) break;;
+   esac
+done
+
+if [ $# -gt 0 ]; then
+echo $usage >&2
+exit 1
+fi
+
+# populate symbol store from here
+TMPFILE=`mktemp` || exit 1
+trap "{ rm -f $TMPFILE; }" EXIT
+
+# add dlls and executables
+add_pdb dll Library $TMPFILE
+add_pdb exe Executable $TMPFILE
+
+# stick all of it into symbol store
+symstore.exe add /compress /f @${TMPFILE} /s $SYM_PATH /t "${PRODUCTNAME}" /v 
"${LIBO_VERSION_MAJOR}.${LIBO_VERSION_MINOR}.${LIBO_VERSION_MICRO}.${LIBO_VERSION_PATCH}${LIBO_VERSION_SUFFIX}${LIBO_VERSION_SUFFIX_SUFFIX}"
+rm -f $TMPFILE
+
+# Cleanup symstore, older revisions will be removed.  Unless the
+# .dll/.exe changes, the .pdb should be shared, so with incremental
+# tinderbox several revisions should not be that space-demanding.
+if [ $MAX_KEEP -gt 0 -a -d ${SYM_PATH}/000Admin ]; then
+to_remove=`ls -1 ${SYM_PATH}/000Admin | grep -v '\.txt' | grep -v 
'\.deleted' | sort | head -n -${MAX_KEEP}`
+for revision in $to_remove; do
+symstore.exe del /i ${revision} /s `cygpath -w $SYM_PATH`
+done
+fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits