oox/inc/pch/precompiled_oox.hxx | 1
sal/Library_sal.mk | 2 -
sal/inc/pch/precompiled_sal.cxx | 12 --------
sal/inc/pch/precompiled_sal.hxx | 29 --------------------
solenv/bin/update_pch.sh | 57 ++++++++++++++++++++++++++++++----------
svx/inc/pch/precompiled_svx.hxx | 7 ++++
6 files changed, 52 insertions(+), 56 deletions(-)
New commits:
commit decf6bf7207ae36bc5882f2e945a7d3f8587cf03
Author: LuboÅ¡ LuÅák <l.lu...@suse.cz>
Date: Tue Dec 18 14:56:56 2012 +0100
update PCH headers using the current pch script
Removing PCH for sal, as that one is too complicated to be updated
automatically right now (#include <premac.h> needs to be handled,
Change-Id: I3ffe9526942f58d0f66430af109b13f7ec1d6c90
diff --git a/oox/inc/pch/precompiled_oox.hxx b/oox/inc/pch/precompiled_oox.hxx
index 59a0721..43b8a58 100644
--- a/oox/inc/pch/precompiled_oox.hxx
+++ b/oox/inc/pch/precompiled_oox.hxx
@@ -276,6 +276,7 @@
#include <com/sun/star/text/WritingMode.hpp>
#include <com/sun/star/text/XNumberingRulesSupplier.hpp>
#include <com/sun/star/text/XSimpleText.hpp>
+#include <com/sun/star/text/XTextAppend.hpp>
#include <com/sun/star/text/XTextContent.hpp>
#include <com/sun/star/text/XTextCursor.hpp>
#include <com/sun/star/text/XTextDocument.hpp>
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index acec543..878453b 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -34,8 +34,6 @@ $(eval $(call gb_Library_use_packages,sal,\
sal_inc \
))
-$(eval $(call
gb_Library_set_precompiled_header,sal,$(SRCDIR)/sal/inc/pch/precompiled_sal))
-
$(eval $(call gb_Library_set_include,sal,\
$$(INCLUDE) \
-I$(SRCDIR)/sal/inc \
diff --git a/sal/inc/pch/precompiled_sal.cxx b/sal/inc/pch/precompiled_sal.cxx
deleted file mode 100644
index 5386a69..0000000
--- a/sal/inc/pch/precompiled_sal.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
-/* -*- 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_sal.hxx"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/pch/precompiled_sal.hxx b/sal/inc/pch/precompiled_sal.hxx
deleted file mode 100644
index 939af83..0000000
--- a/sal/inc/pch/precompiled_sal.hxx
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- 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 <vector>
-#include <map>
-#include <list>
-#include <iterator>
-#include <memory>
-#include <deque>
-#include <stdio.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <iostream>
-#include <cassert>
-#include <cstdarg>
-#include <sstream>
-#include <boost/shared_ptr.hpp>
-#include <boost/unordered_map.hpp>
-#include <boost/unordered_set.hpp>
-#include <boost/ptr_container/ptr_vector.hpp>
-#include <boost/bind.hpp>
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index 13b85611..1f5c039 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -250,16 +250,21 @@
#include <numeric>
#include "osl/diagnose.h"
#include <osl/diagnose.h>
+#include "osl/file.hxx"
#include <osl/file.hxx>
#include <osl/interlck.h>
#include <osl/mutex.hxx>
#include <osl/nlsupport.h>
+#include "osl/process.h"
#include <osl/security.hxx>
+#include <pwd.h>
+#include "rtl/bootstrap.hxx"
#include <rtl/bootstrap.hxx>
#include <rtl/instance.hxx>
#include <rtl/locale.h>
#include <rtl/math.hxx>
#include <rtl/ref.hxx>
+#include "rtl/strbuf.hxx"
#include <rtl/strbuf.hxx>
#include <rtl/tencinfo.h>
#include <rtl/textenc.h>
@@ -349,6 +354,7 @@
#include <toolkit/helper/externallock.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <toolkit/unohlp.hxx>
+#include "tools/appendunixshellword.hxx"
#include <tools/color.hxx>
#include <tools/debug.hxx>
#include <tools/errinf.hxx>
@@ -364,6 +370,7 @@
#include <tools/string.hxx>
#include <tools/urlobj.hxx>
#include <unicode/uchar.h>
+#include <unistd.h>
#include "uno/lbnames.h"
#include <uno/mapping.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
commit eb976220e0d1fb156fe1e3e839a85c9ed78fea73
Author: LuboÅ¡ LuÅák <l.lu...@suse.cz>
Date: Tue Dec 18 14:30:37 2012 +0100
update update_pch.sh
Change-Id: I8353ab9808e5a496ec1b484ef7c80949534ab640
diff --git a/solenv/bin/update_pch.sh b/solenv/bin/update_pch.sh
index 864d0df..3756083 100755
--- a/solenv/bin/update_pch.sh
+++ b/solenv/bin/update_pch.sh
@@ -10,7 +10,7 @@
root=`dirname $0`
root=`cd $root/../.. && pwd`
-if test -z $1; then
+if test -z "$1"; then
headers=`ls $root/*/inc/pch/precompiled_*.hxx`
else
headers="$1"
@@ -21,24 +21,32 @@ header=$x
echo updating `echo $header | sed -e s%$root/%%`
module=`echo $header | sed -e s%$root/%% -e s%/.*%%`
name=`echo $header | sed -e s/.*precompiled_// -e s/\.hxx//`
-makefile="$root/$module/Library_$name.mk"
+makefile="Library_$name.mk"
tmpfile=`mktemp`
-cat "$makefile" | sed 's#\\$##' | \
+cat "$root/$module/$makefile" | sed 's#\\$##' | \
(
inobjects=
+ ifstack=0
while read line ; do
if (test "$line" = "))") || (echo $line | grep -q ", "); then
inobjects=
elif echo $line | grep -q -e add_exception_objects -e
add_noexception_objects -e add_cxxobject -e add_cxxobjects ; then
inobjects=1
- elif test -n "$inobjects"; then
+ if test $ifstack -ne 0 ; then
+ echo Sources in a conditional, ignoring for now. >&2
+ fi
+ elif echo $line | grep -q ^if ; then
+ ifstack=$((ifstack + 1))
+ elif echo $line | grep -q ^endif ; then
+ ifstack=$((ifstack - 1))
+ elif test -n "$inobjects" -a $ifstack -eq 0; then
file=$line
if ! test -f "$root/$file".cxx ; then
- echo No file $file in makefile `echo $makefile | sed -e
s%$root/%%` >&2
+ echo No file $file in $module/$makefile >&2
else
- cat "$root/$file".cxx | grep -e '^\s*#include' | sed 's/\(#include
[<"][^<"]*[>"]\).*/\1/' | sed 's#\.\./##g#' >>$tmpfile
+ cat "$root/$file".cxx | grep -e '^\s*#include' | sed 's/\(#include
[<"][^>"]*[>"]\).*/\1/' | sed 's#\.\./##g#' >>$tmpfile
fi
fi
done
@@ -56,24 +64,47 @@ cat >$header <<EOF
EOF
-localdir="`dirname $makefile`"
+# Library_svx needs this (sendreportw32.cxx)
+if test "$makefile" = Library_svx.mk ; then
+ cat >>$header <<EOF
+#ifdef WNT
+#define UNICODE
+#define _UNICODE
+#endif
+
+EOF
+fi
function local_file()
(
file="$1"
- find "$localdir" -type f | grep /"$file"'$' -q
+ echo "$file" | grep -q ^"$module"/ && exit 0
+# find "$root/$module" -type f | grep -v "$root/$module/inc/" | grep
/"$file"'$' && exit 0
+ find "$root/$module" -type f | grep /"$file"'$' -q && exit 0
+ if echo "$file" | grep -F . -q; then
+ find "$root/$module" -type f | grep -q /`echo "$file" | sed
's/\.hxx$/.sdi/'` && exit 0
+ fi
+ # not local
+ exit 1
)
-function skip_ignore()
+function filter_ignore()
(
- grep -v -F -e '#include "gperffasttoken.hxx"'
+# - filter out all files that are not normal headers
+# - gperffasttoken.hxx is not a problem header
+# - sores.hxx provides BMP_PLUGIN, which is redefined
+# - some sources play ugly #define tricks with editeng/eeitemid.hxx
+ grep -e '\.h[">]$' -e '\.hpp[">]$' -e '\.hdl[">]$' -e '\.hxx[">]$' -e
'^[^\.]*>$' | \
+ grep -v -F -e '#include "gperffasttoken.hxx"' | \
+ grep -v -F -e '#include <svtools/sores.hxx>' | \
+ grep -v -F -e '#include <editeng/eeitemid.hxx>'
)
# " in #include "foo" breaks echo down below, so " -> @
-cat $tmpfile | sort -u | skip_ignore | sed 's/"/@/g' | \
+cat $tmpfile | sort -u | filter_ignore | sed 's/"/@/g' | \
(
while read line; do
- file=`echo $line | sed 's/.*[<"@]\(.*\)[>"@].*/\1/'`
+ file=`echo $line | sed 's/.*[<"@]\([^>"@]*\)[>"@].*/\1/'`
if ! local_file "$file"; then
echo $line | sed 's/@/"/g' >>$header
fi
@@ -85,8 +116,8 @@ cat >>$header <<EOF
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
EOF
-
rm $tmpfile
done
+
#echo Done.
exit 0
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
