bin/update_pch | 7 ++++++- bin/update_pch.sh | 8 ++++++-- connectivity/Library_mysql_jdbc.mk | 2 +- connectivity/inc/pch/precompiled_mysql_jdbc.cxx | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-)
New commits: commit e7423d0574bae586c37c19764ecc061bd4191eb1 Author: Luboš Luňák <[email protected]> AuthorDate: Sun Nov 10 20:26:59 2019 +0100 Commit: Luboš Luňák <[email protected]> CommitDate: Mon Nov 11 10:21:42 2019 +0100 rename a PCH file to properly match its Makefile Change-Id: I61f317f4cc31d329452a08b6cee5f59975fea007 Reviewed-on: https://gerrit.libreoffice.org/82398 Tested-by: Jenkins Reviewed-by: Luboš Luňák <[email protected]> diff --git a/connectivity/Library_mysql_jdbc.mk b/connectivity/Library_mysql_jdbc.mk index 0a4c60e60196..43c1c81b320f 100644 --- a/connectivity/Library_mysql_jdbc.mk +++ b/connectivity/Library_mysql_jdbc.mk @@ -22,7 +22,7 @@ $(eval $(call gb_Library_set_include,mysql_jdbc,\ -I$(SRCDIR)/connectivity/source/inc \ )) -$(eval $(call gb_Library_set_precompiled_header,mysql_jdbc,connectivity/inc/pch/precompiled_mysql)) +$(eval $(call gb_Library_set_precompiled_header,mysql_jdbc,connectivity/inc/pch/precompiled_mysql_jdbc)) $(eval $(call gb_Library_use_libraries,mysql_jdbc,\ cppu \ diff --git a/connectivity/inc/pch/precompiled_mysql.cxx b/connectivity/inc/pch/precompiled_mysql_jdbc.cxx similarity index 91% rename from connectivity/inc/pch/precompiled_mysql.cxx rename to connectivity/inc/pch/precompiled_mysql_jdbc.cxx index 6336615cd710..1f7782e6754c 100644 --- a/connectivity/inc/pch/precompiled_mysql.cxx +++ b/connectivity/inc/pch/precompiled_mysql_jdbc.cxx @@ -7,6 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "precompiled_mysql.hxx" +#include "precompiled_mysql_jdbc.hxx" /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/pch/precompiled_mysql.hxx b/connectivity/inc/pch/precompiled_mysql_jdbc.hxx similarity index 100% rename from connectivity/inc/pch/precompiled_mysql.hxx rename to connectivity/inc/pch/precompiled_mysql_jdbc.hxx commit b1443d7b5d96c1bf56da31873b7bc0e585be2236 Author: Luboš Luňák <[email protected]> AuthorDate: Sun Nov 10 18:48:06 2019 +0100 Commit: Luboš Luňák <[email protected]> CommitDate: Mon Nov 11 10:21:31 2019 +0100 make bin/update_pch work with srcdir != builddir I guess I'm tired of symlinking builddir/workdir to srcdir. Change-Id: I6192bb981d6727479cd2ce4b3ac75bb0a71c3fe9 Reviewed-on: https://gerrit.libreoffice.org/82397 Tested-by: Jenkins Reviewed-by: Luboš Luňák <[email protected]> diff --git a/bin/update_pch b/bin/update_pch index 10f5e2e9df65..6112fc654555 100755 --- a/bin/update_pch +++ b/bin/update_pch @@ -33,6 +33,7 @@ EXCLUDE_MODULE = False EXCLUDE_LOCAL = False EXCLUDE_SYSTEM = True SILENT = False +WORKDIR = 'workdir' # System includes: oox, sal, sd, svl, vcl @@ -607,7 +608,7 @@ def parse_makefile(groups, lines, lineno, lastif, ifstack): if osname not in groups: groups[osname] = [] if ingeneratedobjects: - file = 'workdir/' + file + file = WORKDIR + '/' + file groups[osname].append(file) return groups @@ -909,6 +910,10 @@ def main(): global EXCLUDE_LOCAL global EXCLUDE_SYSTEM global SILENT + global WORKDIR + + if os.getenv('WORKDIR'): + WORKDIR = os.getenv('WORKDIR') root = '.' module = sys.argv[1] diff --git a/bin/update_pch.sh b/bin/update_pch.sh index 5299242b9d7c..78b4a47e6044 100755 --- a/bin/update_pch.sh +++ b/bin/update_pch.sh @@ -11,8 +11,12 @@ # Usage: update_pch.sh [<module>] # Invoke: make cmd cmd="./bin/update_pch.sh [..]" -root=`dirname $0` -root=`cd $root/.. >/dev/null && pwd` +if test -n "$SRC_DIR"; then + root="$SRC_DIR" +else + root=`dirname $0` + root=`cd $root/.. >/dev/null && pwd` +fi root=`readlink -f $root` cd $root _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
