[Libreoffice-commits] core.git: 2 commits - bin/update_pch.sh external/libmwaw

[Luboš Luňák (via logerrit)]

 bin/update_pch.sh                             |    4 +
 external/libmwaw/Library_mwaw.mk              |    2 
 external/libmwaw/inc/pch/precompiled_mwaw.cxx |   12 +++++
 external/libmwaw/inc/pch/precompiled_mwaw.hxx |   57 ++++++++++++++++++++++++++
 4 files changed, 74 insertions(+), 1 deletion(-)

New commits:
commit 0865f8f8e9e1e0528716242546a61b99c2e3957b
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Sat May 18 16:31:25 2019 +0200
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Sun May 19 09:47:51 2019 +0200

    PCH for libmwaw
    
    Change-Id: Ifa64e7b995e7b9cc576fdc19fb4c8822309a57a1
    Reviewed-on: https://gerrit.libreoffice.org/72524
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/external/libmwaw/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk
index f9615bf59f81..e74d30dfb7b3 100644
--- a/external/libmwaw/Library_mwaw.mk
+++ b/external/libmwaw/Library_mwaw.mk
@@ -17,6 +17,8 @@ $(eval $(call gb_Library_use_externals,mwaw,\
 
 $(eval $(call gb_Library_set_warnings_not_errors,mwaw))
 
+$(eval $(call gb_Library_set_precompiled_header,mwaw,$(SRCDIR)/external/libmwaw/inc/pch/precompiled_mwaw))
+
 $(eval $(call gb_Library_set_include,mwaw,\
     -I$(call gb_UnpackedTarball_get_dir,libmwaw)/inc \
     $$(INCLUDE) \
diff --git a/external/libmwaw/inc/pch/precompiled_mwaw.cxx b/external/libmwaw/inc/pch/precompiled_mwaw.cxx
new file mode 100644
index 000000000000..b72c8e728d8f
--- /dev/null
+++ b/external/libmwaw/inc/pch/precompiled_mwaw.cxx
@@ -0,0 +1,12 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "precompiled_mwaw.hxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/external/libmwaw/inc/pch/precompiled_mwaw.hxx b/external/libmwaw/inc/pch/precompiled_mwaw.hxx
new file mode 100644
index 000000000000..02f73c16688b
--- /dev/null
+++ b/external/libmwaw/inc/pch/precompiled_mwaw.hxx
@@ -0,0 +1,57 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+/*
+ This file has been autogenerated by update_pch.sh. It is possible to edit it
+ manually (such as when an include file has been moved/renamed/removed). All such
+ manual changes will be rewritten by the next run of update_pch.sh (which presumably
+ also fixes all possible problems, so it's usually better to use it).
+
+ Generated on 2019-05-18 14:37:42 using:
+ ./bin/update_pch external/libmwaw mwaw --cutoff=1 --exclude:system --include:module --include:local
+
+ If after updating build fails, use the following command to locate conflicting headers:
+ ./bin/update_pch_bisect .\external/libmwaw\inc\pch\precompiled_mwaw.hxx "make external/libmwaw.build" --find-conflicts
+*/
+
+#if PCH_LEVEL >= 1
+#include <algorithm>
+#include <cmath>
+#include <cstdarg>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <ctime>
+#include <ctype.h>
+#include <iomanip>
+#include <iostream>
+#include <limits>
+#include <locale.h>
+#include <map>
+#include <memory>
+#include <set>
+#include <sstream>
+#include <stack>
+#include <string.h>
+#include <string>
+#include <time.h>
+#include <utility>
+#include <vector>
+#endif // PCH_LEVEL >= 1
+#if PCH_LEVEL >= 2
+#endif // PCH_LEVEL >= 2
+#if PCH_LEVEL >= 3
+#include <libmwaw/libmwaw.hxx>
+#include <librevenge-stream/librevenge-stream.h>
+#include <librevenge/librevenge.h>
+#endif // PCH_LEVEL >= 3
+#if PCH_LEVEL >= 4
+#endif // PCH_LEVEL >= 4
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 4812fe5af6caf4b49c09e986ef741693a24ca174
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Sat May 18 10:34:30 2019 +0200
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Sun May 19 09:47:42 2019 +0200

    do not run update_pch.sh on all if it can't find PCH in the given dir
    
    Change-Id: I9f86a6268c98a010585bd666e1ede66869c5d7ea
    Reviewed-on: https://gerrit.libreoffice.org/72523
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/bin/update_pch.sh b/bin/update_pch.sh
index 6ea8eb664cf0..2b2df6dc3b46 100755
--- a/bin/update_pch.sh
+++ b/bin/update_pch.sh
@@ -37,7 +37,9 @@ for x in $headers; do
     if [ -d "$x" ]; then
         # We got a directory, find pch files to update.
         headers=`find $root/$x/ -type f -iname "precompiled_*.hxx"`
-        $0 "$headers"
+        if test -n "$headers"; then
+            $0 "$headers"
+        fi
     else
         header=$x
         echo updating `echo $header | sed -e s%$root/%%`