[Libreoffice-commits] core.git: bin/gen-iwyu-dummy-lib config_host.mk.in configure.ac Makefile.in solenv/gbuild

2022-05-04 Thread Gabor Kelemen (via logerrit) 
 Makefile.in|   17 +---
 bin/gen-iwyu-dummy-lib |   79 -
 config_host.mk.in  |1 
 configure.ac   |   14 ---
 solenv/gbuild/StaticLibrary.mk |   12 --
 5 files changed, 3 insertions(+), 120 deletions(-)

New commits:
commit 079659eb7d15f15a37f1f508beb5cffe24fe6f25
Author: Gabor Kelemen 
AuthorDate: Thu Apr 28 11:14:24 2022 +0200
Commit: Thorsten Behrens 
CommitDate: Wed May 4 16:48:25 2022 +0200

Drop --with-iwyu option

Nowadays the bin/find-unneeded-includes script is a better
solution for this problem

This essentially reverts the commits:
c716b3888e7e8150d1c1053ee6550afb56438b1f
096c7e889f3b9bd42a81fb0216e2a68fb27159fc
40e7eecb7efeeb9af59206d7a9c82ac55adf5279

Change-Id: I404a4b34176efaacf961605559af9de6d6cba10a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133540
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
Reviewed-by: Thorsten Behrens 

diff --git a/Makefile.in b/Makefile.in
index afccbb9ef460..ed231eaade1e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -79,17 +79,6 @@ export GMAKE_OPTIONS?=-r$(if $(verbose),,s)$(value 
$(MAKEFLAGS))
 
 PARALLELISM_OPTION := $(if $(filter-out 0,$(PARALLELISM)),-j $(PARALLELISM),)
 
-IWYU_OPTION := $(if $(IWYU_PATH),-k CC=$(IWYU_PATH) CXX=$(IWYU_PATH),)
-
-# don't want to have a dependency to iwyudummy.generate because it's
-# useful to manually edit the generated StaticLibrary_iwyudummy.mk
-iwyudummy: bootstrap fetch
-   $(if $(wildcard $(BUILDDIR)/iwyudummy),,$(error first call "make 
iwyudummy.generate"))
-   cd $(BUILDDIR)/iwyudummy && $(MAKE) $(IWYU_OPTION) $(GMAKE_OPTIONS)
-
-iwyudummy.generate:
-   $(SRCDIR)/bin/gen-iwyu-dummy-lib
-
 #
 # Partial Build
 #
@@ -98,7 +87,7 @@ define gb_Top_GbuildModuleRules
 .PHONY: $(1).allbuild $(1).buildall $(1).allcheck $(1).checkall
 
 $(1): bootstrap fetch
-   cd $(SRCDIR)/$(2) && $$(MAKE) $(IWYU_OPTION) $(PARALLELISM_OPTION) 
$(GMAKE_OPTIONS)
+   cd $(SRCDIR)/$(2) && $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS)
 
 $(1).build $(1).check $(foreach 
target,$(gb_Top_MODULE_CHECK_TARGETS),$(1).$(target)): bootstrap fetch
cd $(SRCDIR)/$(2) && $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) 
$$(patsubst $(1).%,%,$$@)
@@ -107,10 +96,10 @@ $(1).clean $(1).showdeliverables:
cd $(SRCDIR)/$(2) && $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) 
$$(patsubst $(1).%,%,$$@)
 
 $(1).allbuild $(1).buildall: bootstrap fetch
-   $$(MAKE) $(PARALLELISM_OPTION) $(IWYU_OPTION) $(GMAKE_OPTIONS) -f 
$(SRCDIR)/Makefile.gbuild $(WORKDIR)/Module/$(1)
+   $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f 
$(SRCDIR)/Makefile.gbuild $(WORKDIR)/Module/$(1)
 
 $(1).allcheck $(1).checkall: bootstrap fetch
-   $$(MAKE) $(PARALLELISM_OPTION) $(IWYU_OPTION) $(GMAKE_OPTIONS) -f 
$(SRCDIR)/Makefile.gbuild $(WORKDIR)/Module/$(1) $(WORKDIR)/Module/check/$(1) 
$(WORKDIR)/Module/slowcheck/$(1)
+   $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f 
$(SRCDIR)/Makefile.gbuild $(WORKDIR)/Module/$(1) $(WORKDIR)/Module/check/$(1) 
$(WORKDIR)/Module/slowcheck/$(1)
 
 $(1).all:
@echo "'make $(1).all' was renamed to 'make $(1).allcheck' (or use 
'make $(1).allbuild' to build without unit tests)"
diff --git a/bin/gen-iwyu-dummy-lib b/bin/gen-iwyu-dummy-lib
deleted file mode 100755
index 80b791eff4f4..
--- a/bin/gen-iwyu-dummy-lib
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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/.
-#
-
-# Create a makefile that builds every non-generated header as a source file.
-# This should help to ensure the headers are self-contained and don't
-# impose unnecessary requirements (unnecessary includes) on client code.
-#
-# This script is fully compliant with the UNIX philosophy
-# (and if you can't read it you are clearly not worthy)
-
-set -e
-
-iwyu_INCLUDES=$(grep -h -r ":$" "$BUILDDIR"/workdir/Dep/*Object* \
-| grep -v 'workdir\|config_host' | grep -v "^/usr" \
-| sed -e "s,^${SRCDIR}/,," | sed -e "s/:$//"  | sort -u)
-
-iwyu_INCLUDEDIRS=$(echo "$iwyu_INCLUDES" | sed -e "s,/[^/]*$,," | grep -v 
"^include" | sort -u)
-
-iwyu_EXTERNALS=$(ls "$SRCDIR"/*/*Library*mk "$SRCDIR"/*/*Executable*mk \
-| xargs awk -f "$SRCDIR"/bin/gen-iwyu-dummy-lib.awk \
-| grep -v 
'$(\|)\|\\$\|breakpad\|bzip2\|expat_x64\|mDNSResponder\|zlib_x64')
-
-iwyu_DIR="$BUILDDIR"/iwyudummy/
-mkdir -p "$iwyu_DIR"
-
-{
-echo 'module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST'
-echo "include ${SRCDIR}/solenv/gbuild/partial_build.mk"
-} > "$iwyu_DIR"Makefile
-
-{
-echo '$(eval $(call gb_Module_Module,iwyudummy))'
-echo '$(eval $(call

[Libreoffice-commits] core.git: bin/gen-iwyu-dummy-lib config_host.mk.in configure.ac download.lst external/apr external/Module_external.mk external/serf Makefile.fetch readlicense_oo/license Reposito

2021-12-15 Thread Michael Stahl (via logerrit) 
 Makefile.fetch |3 
 RepositoryExternal.mk  |   73 
 bin/gen-iwyu-dummy-lib |2 
 config_host.mk.in  |6 
 configure.ac   |   21 
 download.lst   |6 
 external/Module_external.mk|2 
 external/apr/ExternalProject_apr.mk|   43 
 external/apr/ExternalProject_apr_util.mk   |   45 
 external/apr/Makefile  |7 
 external/apr/Module_apr.mk |   19 
 external/apr/README|5 
 external/apr/UnpackedTarball_apr.mk|   21 
 external/apr/UnpackedTarball_apr_util.mk   |   22 
 external/apr/exit.patch|   26 
 external/apr/uuid.patch|  241 -
 external/apr/windows.build.patch.1 |   53 
 external/serf/Makefile |7 
 external/serf/Module_serf.mk   |   17 
 external/serf/README   |4 
 external/serf/StaticLibrary_serf.mk|   60 
 external/serf/UnpackedTarball_serf.mk  |   17 
 readlicense_oo/license/NOTICE  |5 
 readlicense_oo/license/license.xml |   12 
 solenv/clang-format/excludelist|   70 
 ucb/IwyuFilter_ucb.yaml|4 
 ucb/Library_ucpdav1.mk |   47 
 ucb/Module_ucb.mk  |6 
 ucb/source/ucp/webdav/AprEnv.cxx   |   64 
 ucb/source/ucp/webdav/AprEnv.hxx   |   55 
 ucb/source/ucp/webdav/ContentProperties.cxx|  593 ---
 ucb/source/ucp/webdav/ContentProperties.hxx|  181 -
 ucb/source/ucp/webdav/DAVAuthListener.hxx  |   43 
 ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx  |   61 
 ucb/source/ucp/webdav/DAVException.hxx |  165 -
 ucb/source/ucp/webdav/DAVProperties.cxx|  222 -
 ucb/source/ucp/webdav/DAVProperties.hxx|   57 
 ucb/source/ucp/webdav/DAVRequestEnvironment.hxx|   54 
 ucb/source/ucp/webdav/DAVResource.hxx  |   59 
 ucb/source/ucp/webdav/DAVResourceAccess.cxx| 1116 ---
 ucb/source/ucp/webdav/DAVResourceAccess.hxx|  207 -
 ucb/source/ucp/webdav/DAVSession.hxx   |  202 -
 ucb/source/ucp/webdav/DAVSessionFactory.cxx|   86 
 ucb/source/ucp/webdav/DAVSessionFactory.hxx|   68 
 ucb/source/ucp/webdav/DAVTypes.hxx |   77 
 ucb/source/ucp/webdav/DateTimeHelper.cxx   |  258 -
 ucb/source/ucp/webdav/DateTimeHelper.hxx   |   55 
 ucb/source/ucp/webdav/PropertyMap.hxx  |   55 
 ucb/source/ucp/webdav/SerfCallbacks.cxx|  111 
 ucb/source/ucp/webdav/SerfCallbacks.hxx|   66 
 ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx  |   82 
 ucb/source/ucp/webdav/SerfCopyReqProcImpl.hxx  |   54 
 ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx|   67 
 ucb/source/ucp/webdav/SerfDeleteReqProcImpl.hxx|   49 
 ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx   |  173 -
 ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx   |   81 
 ucb/source/ucp/webdav/SerfHeadReqProcImpl.cxx  |  128 
 ucb/source/ucp/webdav/SerfHeadReqProcImpl.hxx  |   64 
 ucb/source/ucp/webdav/SerfInputStream.cxx  |  159 -
 ucb/source/ucp/webdav/SerfInputStream.hxx  |   90 
 ucb/source/ucp/webdav/SerfLockReqProcImpl.cxx  |  203 -
 ucb/source/ucp/webdav/SerfLockReqProcImpl.hxx  |   64 
 ucb/source/ucp/webdav/SerfLockStore.cxx|  218 -
 ucb/source/ucp/webdav/SerfLockStore.hxx|   88 
 ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx |   67 
 ucb/source/ucp/webdav/SerfMkColReqProcImpl.hxx |   48 
 ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx  |   82 
 ucb/source/ucp/webdav/SerfMoveReqProcImpl.hxx  |   54 
 ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx  |  126 
 ucb/source/ucp/webdav/SerfPostReqProcImpl.hxx  |   73 
 ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx  |  195 -
 ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx  |   74 
 ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx |  189 -
 ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.hxx |   55 
 ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx   |   90 
 ucb/source/ucp/webdav/SerfPutReqProcImpl.hxx   |   57 
 ucb/source/ucp/webdav/SerfRequestProcessor.cxx |  596 ---
 ucb/source/ucp/webdav/SerfRequestProcessor.hxx |  188 -
 ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx |  151 
 ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx |   76 
 ucb/source/ucp/webdav/SerfSession.cxx  | 1487 -
 ucb/source/ucp/webdav/SerfSession.hxx  |  259 -

[Libreoffice-commits] core.git: bin/gen-iwyu-dummy-lib

2017-06-22 Thread Jochen Nitschke 
 bin/gen-iwyu-dummy-lib |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d4be7601e22dba8f2bfa535fc871348c5851c062
Author: Jochen Nitschke 
Date:   Thu Jun 22 11:09:09 2017 +0200

iwyu: add language standard defines to flags

for some reason they are not set and cause parse warnings

Change-Id: I1bbc14da8cd7f4cbde8e59934b6ace932245e2a1
Reviewed-on: https://gerrit.libreoffice.org/39093
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/bin/gen-iwyu-dummy-lib b/bin/gen-iwyu-dummy-lib
index 0b56a1c867b0..c7d64817db49 100755
--- a/bin/gen-iwyu-dummy-lib
+++ b/bin/gen-iwyu-dummy-lib
@@ -47,7 +47,7 @@ mkdir -p "$iwyu_DIR"
 
 echo '$(eval $(call gb_StaticLibrary_StaticLibrary,iwyudummy))'
 # clang will "compile" headers to .gch by default
-echo '$(eval $(call gb_StaticLibrary_add_cxxflags,iwyudummy,-x c++ 
-Wno-unused-macros -Wno-unused-const-variable))'
+echo '$(eval $(call gb_StaticLibrary_add_cxxflags,iwyudummy,-x c++ 
-D__cplusplus=201402L -D__STDC_VERSION__=201112L -Wno-unused-macros 
-Wno-unused-const-variable))'
 echo '$(eval $(call 
gb_StaticLibrary_use_custom_headers,iwyudummy,officecfg/registry))'
 echo '$(eval $(call gb_StaticLibrary_use_sdk_api,iwyudummy))'
 echo '$(eval $(call gb_StaticLibrary_use_externals,iwyudummy,\'
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/gen-iwyu-dummy-lib

2017-06-22 Thread Jochen Nitschke 
 bin/gen-iwyu-dummy-lib |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4cea80db3f2a812672004915614530f8c86c41d5
Author: Jochen Nitschke 
Date:   Thu Jun 22 10:16:31 2017 +0200

update externals in bin/gen-iwyu-dummy-lib script

tde and mozilla externals are gone.
breakpad, bzip2 and mDNSResponder are omitted.

filter out 'orcus-parser\' line, 'orcus-parser' is still in
iwyu_EXTERNALS

Change-Id: Ida7155b8b00b651146c4307286e9eafbdadb5917
Reviewed-on: https://gerrit.libreoffice.org/39092
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/bin/gen-iwyu-dummy-lib b/bin/gen-iwyu-dummy-lib
index faa61e762c33..0b56a1c867b0 100755
--- a/bin/gen-iwyu-dummy-lib
+++ b/bin/gen-iwyu-dummy-lib
@@ -24,7 +24,7 @@ iwyu_INCLUDEDIRS=$(echo "$iwyu_INCLUDES" | sed -e 
"s,/[^/]*$,," | grep -v "^incl
 
 iwyu_EXTERNALS=$(ls "$SRCDIR"/*/*Library*mk "$SRCDIR"/*/*Executable*mk \
 | xargs awk -f "$SRCDIR"/bin/gen-iwyu-dummy-lib.awk \
-| grep -v '$(\|)\|tde\|expat_x64\|zlib_x64\|mozilla\|apr\|serf')
+| grep -v 
'$(\|)\|\\$\|apr\|breakpad\|bzip2\|expat_x64\|mDNSResponder\|serf\|zlib_x64')
 
 iwyu_DIR="$BUILDDIR"/iwyudummy/
 mkdir -p "$iwyu_DIR"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/gen-iwyu-dummy-lib

2017-06-22 Thread Jochen Nitschke 
 bin/gen-iwyu-dummy-lib |   92 ++---
 1 file changed, 49 insertions(+), 43 deletions(-)

New commits:
commit 438c0ed5ea4116e93eb2167a53a740ba5097565f
Author: Jochen Nitschke 
Date:   Thu Jun 22 10:14:39 2017 +0200

reformat bin/gen-iwyu-dummy-lib script

no logic change intended.

follow some shellcheck advises:
use block for redirects to same file for better style (SC2129)
double quote vars (SC2086)
ignore false positive warnings SC1003 and SC2016

Change-Id: Ic3a01484d4d13c8d23662ee24c46b166ee006cd4
Reviewed-on: https://gerrit.libreoffice.org/39090
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/bin/gen-iwyu-dummy-lib b/bin/gen-iwyu-dummy-lib
index aa757b684f0b..faa61e762c33 100755
--- a/bin/gen-iwyu-dummy-lib
+++ b/bin/gen-iwyu-dummy-lib
@@ -16,58 +16,64 @@
 
 set -e
 
-iwyu_INCLUDES=$(grep -h -r ":$" ${BUILDDIR}/workdir/Dep/*Object* \
+iwyu_INCLUDES=$(grep -h -r ":$" "$BUILDDIR"/workdir/Dep/*Object* \
 | grep -v 'workdir\|config_host' | grep -v "^/usr" \
 | sed -e "s,^${SRCDIR}/,," | sed -e "s/:$//"  | sort -u)
 
-iwyu_INCLUDEDIRS=$(echo "${iwyu_INCLUDES}" | sed -e "s,/[^/]*$,," | grep -v 
"^include" | sort -u)
+iwyu_INCLUDEDIRS=$(echo "$iwyu_INCLUDES" | sed -e "s,/[^/]*$,," | grep -v 
"^include" | sort -u)
 
-iwyu_EXTERNALS=$(ls ${SRCDIR}/*/*Library*mk ${SRCDIR}/*/*Executable*mk \
-| xargs awk -f ${SRCDIR}/bin/gen-iwyu-dummy-lib.awk \
+iwyu_EXTERNALS=$(ls "$SRCDIR"/*/*Library*mk "$SRCDIR"/*/*Executable*mk \
+| xargs awk -f "$SRCDIR"/bin/gen-iwyu-dummy-lib.awk \
 | grep -v '$(\|)\|tde\|expat_x64\|zlib_x64\|mozilla\|apr\|serf')
 
-mkdir -p ${BUILDDIR}/iwyudummy
-iwyu_MOD=${BUILDDIR}/iwyudummy/Module_iwyudummy.mk
-iwyu_LIB=${BUILDDIR}/iwyudummy/StaticLibrary_iwyudummy.mk
+iwyu_DIR="$BUILDDIR"/iwyudummy/
+mkdir -p "$iwyu_DIR"
 
-echo 'module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST' > 
${BUILDDIR}/iwyudummy/Makefile
-echo "include ${SRCDIR}/solenv/gbuild/partial_build.mk" >> 
${BUILDDIR}/iwyudummy/Makefile
-echo '$(eval $(call gb_Module_Module,iwyudummy))' > ${iwyu_MOD}
-echo '$(eval $(call gb_Module_add_targets,iwyudummy,StaticLibrary_iwyudummy))' 
>> ${iwyu_MOD}
+{
+echo 'module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST'
+echo "include ${SRCDIR}/solenv/gbuild/partial_build.mk"
+} > "$iwyu_DIR"Makefile
 
-# prevent some common configuration errors
-echo 'ifneq ($(COMPILER_PLUGINS),)' > ${iwyu_LIB}
-echo '$(call gb_Output_error,--enable-compiler-plugins does not work well 
with this: bailing out)' >> ${iwyu_LIB}
-echo 'endif' >> ${iwyu_LIB}
+{
+echo '$(eval $(call gb_Module_Module,iwyudummy))'
+echo '$(eval $(call 
gb_Module_add_targets,iwyudummy,StaticLibrary_iwyudummy))'
+} > "$iwyu_DIR"Module_iwyudummy.mk
 
-echo '$(eval $(call gb_StaticLibrary_StaticLibrary,iwyudummy))' >> ${iwyu_LIB}
-# clang will "compile" headers to .gch by default
-echo '$(eval $(call gb_StaticLibrary_add_cxxflags,iwyudummy,-x c++ 
-Wno-unused-macros -Wno-unused-const-variable))' >> ${iwyu_LIB}
-echo '$(eval $(call 
gb_StaticLibrary_use_custom_headers,iwyudummy,officecfg/registry))' >> 
${iwyu_LIB}
-echo '$(eval $(call gb_StaticLibrary_use_sdk_api,iwyudummy))' >> ${iwyu_LIB}
-echo '$(eval $(call gb_StaticLibrary_use_externals,iwyudummy,\' >> ${iwyu_LIB}
-for ext in ${iwyu_EXTERNALS}; do
-echo "${ext} \\";
-done >> ${iwyu_LIB}
-echo '))' >> ${iwyu_LIB}
+{
+# prevent some common configuration errors
+echo 'ifneq ($(COMPILER_PLUGINS),)'
+echo '$(call gb_Output_error,--enable-compiler-plugins does not work 
well with this: bailing out)'
+echo 'endif'
 
-echo '$(eval $(call gb_StaticLibrary_set_include,iwyudummy,\' >> ${iwyu_LIB}
-echo '$$(INCLUDE) \' >> ${iwyu_LIB}
-for dir in ${iwyu_INCLUDEDIRS}; do
-if echo ${dir} | grep ".*/inc/" &>/dev/null; then
-iwyu_INCLUDEDIRS_EXTRA+=" ${dir%/inc/*}/inc"
-fi
-done
-for dir in $(echo ${iwyu_INCLUDEDIRS_EXTRA} | sed -e "s/ /\n/g" | uniq) 
${iwyu_INCLUDEDIRS}; do
-echo "-I${SRCDIR}/${dir} \\";
-done >> ${iwyu_LIB}
-# it fails to find stddef.h?
-echo "-I/usr/lib/clang/$(llvm-config --version)/include \\" >> ${iwyu_LIB}
-echo "))" >> ${iwyu_LIB} >> ${iwyu_LIB}
+echo '$(eval $(call gb_StaticLibrary_StaticLibrary,iwyudummy))'
+# clang will "compile" headers to .gch by default
+echo '$(eval $(call gb_StaticLibrary_add_cxxflags,iwyudummy,-x c++ 
-Wno-unused-macros -Wno-unused-const-variable))'
+echo '$(eval $(call 
gb_StaticLibrary_use_custom_headers,iwyudummy,officecfg/registry))'
+echo '$(eval $(call gb_StaticLibrary_use_sdk_api,iwyudummy))'
+echo '$(eval $(call gb_StaticLibrary_use_externals,iwyudummy,\'
+for ext in ${iwyu_EXTERNALS}; do
+echo "${ext} \\";
+done
+echo '))'
 
-echo '$(eval $(call gb_StaticLibrary__add_iwyu_headers,iwyudummy,\' >> 
${iwyu_LIB}

[Libreoffice-commits] core.git: bin/gen-iwyu-dummy-lib

2016-04-27 Thread Jorenz Paragas 
 bin/gen-iwyu-dummy-lib |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit de4b758ff31f9e92dffb8fe3cf295a7d3c12f611
Author: Jorenz Paragas 
Date:   Tue Apr 26 17:38:46 2016 -0700

Improve the gen-iwyu-dummy-lib script a bit.

- Fix the check for --enable-compiler-plugins not being included in
  the resulting StaticLibrary_iwyudummy.mk file.
- Disable warnings about unused const variables to reduce noise.

Change-Id: If54dfd55f46631bbc526326bed5c272358fb9cf3
Reviewed-on: https://gerrit.libreoffice.org/24419
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/bin/gen-iwyu-dummy-lib b/bin/gen-iwyu-dummy-lib
index 1d47f04..aa757b6 100755
--- a/bin/gen-iwyu-dummy-lib
+++ b/bin/gen-iwyu-dummy-lib
@@ -37,12 +37,12 @@ echo '$(eval $(call 
gb_Module_add_targets,iwyudummy,StaticLibrary_iwyudummy))' >
 
 # prevent some common configuration errors
 echo 'ifneq ($(COMPILER_PLUGINS),)' > ${iwyu_LIB}
-echo '$(call gb_Output_error,--enable-compiler-plugins does not work well 
with this: bailing out)' > ${iwyu_LIB}
-echo 'endif' > ${iwyu_LIB}
+echo '$(call gb_Output_error,--enable-compiler-plugins does not work well 
with this: bailing out)' >> ${iwyu_LIB}
+echo 'endif' >> ${iwyu_LIB}
 
-echo '$(eval $(call gb_StaticLibrary_StaticLibrary,iwyudummy))' > ${iwyu_LIB}
+echo '$(eval $(call gb_StaticLibrary_StaticLibrary,iwyudummy))' >> ${iwyu_LIB}
 # clang will "compile" headers to .gch by default
-echo '$(eval $(call gb_StaticLibrary_add_cxxflags,iwyudummy,-x c++ 
-Wno-unused-macros))' >> ${iwyu_LIB}
+echo '$(eval $(call gb_StaticLibrary_add_cxxflags,iwyudummy,-x c++ 
-Wno-unused-macros -Wno-unused-const-variable))' >> ${iwyu_LIB}
 echo '$(eval $(call 
gb_StaticLibrary_use_custom_headers,iwyudummy,officecfg/registry))' >> 
${iwyu_LIB}
 echo '$(eval $(call gb_StaticLibrary_use_sdk_api,iwyudummy))' >> ${iwyu_LIB}
 echo '$(eval $(call gb_StaticLibrary_use_externals,iwyudummy,\' >> ${iwyu_LIB}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/gen-iwyu-dummy-lib

2016-01-18 Thread Peter Foley 
 bin/gen-iwyu-dummy-lib |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bee5797feb1b663fe308c18b4d5d6c16b05cda1b
Author: Peter Foley 
Date:   Sun Jan 17 09:40:47 2016 -0500

iwyu fixes

Change-Id: I2dc9218ae8c4ea51fea5f710664520a598e7c4a3
Reviewed-on: https://gerrit.libreoffice.org/21536
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/bin/gen-iwyu-dummy-lib b/bin/gen-iwyu-dummy-lib
index 92ec408..1d47f04 100755
--- a/bin/gen-iwyu-dummy-lib
+++ b/bin/gen-iwyu-dummy-lib
@@ -23,7 +23,7 @@ iwyu_INCLUDES=$(grep -h -r ":$" 
${BUILDDIR}/workdir/Dep/*Object* \
 iwyu_INCLUDEDIRS=$(echo "${iwyu_INCLUDES}" | sed -e "s,/[^/]*$,," | grep -v 
"^include" | sort -u)
 
 iwyu_EXTERNALS=$(ls ${SRCDIR}/*/*Library*mk ${SRCDIR}/*/*Executable*mk \
-| xargs awk -f bin/gen-iwyu-dummy-lib.awk \
+| xargs awk -f ${SRCDIR}/bin/gen-iwyu-dummy-lib.awk \
 | grep -v '$(\|)\|tde\|expat_x64\|zlib_x64\|mozilla\|apr\|serf')
 
 mkdir -p ${BUILDDIR}/iwyudummy
@@ -62,7 +62,7 @@ for dir in $(echo ${iwyu_INCLUDEDIRS_EXTRA} | sed -e "s/ 
/\n/g" | uniq) ${iwyu_I
 echo "-I${SRCDIR}/${dir} \\";
 done >> ${iwyu_LIB}
 # it fails to find stddef.h?
-echo '-I/usr/lib/clang/3.6/include \' >> ${iwyu_LIB}
+echo "-I/usr/lib/clang/$(llvm-config --version)/include \\" >> ${iwyu_LIB}
 echo "))" >> ${iwyu_LIB} >> ${iwyu_LIB}
 
 echo '$(eval $(call gb_StaticLibrary__add_iwyu_headers,iwyudummy,\' >> 
${iwyu_LIB}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/gen-iwyu-dummy-lib include/store store/source

2015-10-01 Thread Noel Grandin 
 bin/gen-iwyu-dummy-lib|2 +-
 include/store/store.h |4 +++-
 include/store/store.hxx   |4 +++-
 include/store/types.h |1 -
 store/source/stordata.hxx |1 +
 5 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit aed0a639f4af8e630dbd6bd4f2e0368b1481eae3
Author: Noel Grandin 
Date:   Wed Sep 16 13:07:48 2015 +0200

tdf#42949 remove unnecessary includes using iwyu

Change-Id: I13960721b7e15b1761aff8497391e39ae5645b89
Reviewed-on: https://gerrit.libreoffice.org/18616
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/bin/gen-iwyu-dummy-lib b/bin/gen-iwyu-dummy-lib
index 62e7c7b..92ec408 100755
--- a/bin/gen-iwyu-dummy-lib
+++ b/bin/gen-iwyu-dummy-lib
@@ -62,7 +62,7 @@ for dir in $(echo ${iwyu_INCLUDEDIRS_EXTRA} | sed -e "s/ 
/\n/g" | uniq) ${iwyu_I
 echo "-I${SRCDIR}/${dir} \\";
 done >> ${iwyu_LIB}
 # it fails to find stddef.h?
-echo '-I/usr/lib/clang/3.4/include \' >> ${iwyu_LIB}
+echo '-I/usr/lib/clang/3.6/include \' >> ${iwyu_LIB}
 echo "))" >> ${iwyu_LIB} >> ${iwyu_LIB}
 
 echo '$(eval $(call gb_StaticLibrary__add_iwyu_headers,iwyudummy,\' >> 
${iwyu_LIB}
diff --git a/include/store/store.h b/include/store/store.h
index 48852c7..1b48a13 100644
--- a/include/store/store.h
+++ b/include/store/store.h
@@ -20,8 +20,10 @@
 #ifndef INCLUDED_STORE_STORE_H
 #define INCLUDED_STORE_STORE_H
 
-#include 
 #include 
+#include 
+#include "rtl/ustring.h"
+#include "sal/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/store/store.hxx b/include/store/store.hxx
index d9edcf3..7a9d355 100644
--- a/include/store/store.hxx
+++ b/include/store/store.hxx
@@ -20,9 +20,11 @@
 #ifndef INCLUDED_STORE_STORE_HXX
 #define INCLUDED_STORE_STORE_HXX
 
+#include 
 #include 
+#include 
 #include 
-#include 
+#include "types.h"
 
 namespace store
 {
diff --git a/include/store/types.h b/include/store/types.h
index dd4fafc..b3b9ad5 100644
--- a/include/store/types.h
+++ b/include/store/types.h
@@ -21,7 +21,6 @@
 #define INCLUDED_STORE_TYPES_H
 
 #include 
-#include 
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/store/source/stordata.hxx b/store/source/stordata.hxx
index e53a9b6..ca116bb 100644
--- a/store/source/stordata.hxx
+++ b/store/source/stordata.hxx
@@ -24,6 +24,7 @@
 
 #include "sal/types.h"
 #include "sal/macros.h"
+#include "rtl/string.h"
 
 #include "store/types.h"
 #include "storbase.hxx"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/gen-iwyu-dummy-lib bin/gen-iwyu-dummy-lib.awk Makefile.in

2014-11-24 Thread Noel Grandin 
 Makefile.in|4 +++-
 bin/gen-iwyu-dummy-lib |   15 ---
 bin/gen-iwyu-dummy-lib.awk |   34 ++
 3 files changed, 49 insertions(+), 4 deletions(-)

New commits:
commit 460debad7968961084546e02eb2ac0750a63a7f4
Author: Noel Grandin n...@peralex.com
Date:   Thu Nov 20 09:47:17 2014 +0200

improvements to iwyudummy target

- split awk script into separate file
- make awk work on older awk version
- create new target in main Makefile.in to generate
  iwyudummy Makefile so we don't have to manually uncomment
  stuff
- exclude /usr includes from the generated makefile
- disable unused macros warnings to reduce noise
- add some sanity checking - prevent using the generated
  makefile with compiler-plugins enabled
- add new target for generating iwyu Makefile so we don't
  need to edit the Makefile when using it

Change-Id: I4af8eb7d1aa5419e546acb9ef905a0fe623db57d
Reviewed-on: https://gerrit.libreoffice.org/12980
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/Makefile.in b/Makefile.in
index 2f8de5d..6c2957f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -63,9 +63,11 @@ PARALLELISM_OPTION := $(if $(filter-out 0,$(PARALLELISM)),-j 
$(PARALLELISM),)
 IWYU_OPTION := $(if $(IWYU_PATH),-k CC=$(IWYU_PATH) CXX=$(IWYU_PATH),)
 
 iwyudummy: bootstrap fetch
-   # $(SRCDIR)/bin/gen-iwyu-dummy-lib
cd $(BUILDDIR)/iwyudummy  $(MAKE) $(IWYU_OPTION) $(GMAKE_OPTIONS)
 
+iwyudummy.generate:
+   $(SRCDIR)/bin/gen-iwyu-dummy-lib
+
 #
 # Partial Build
 #
diff --git a/bin/gen-iwyu-dummy-lib b/bin/gen-iwyu-dummy-lib
index ac117fe..62e7c7b 100755
--- a/bin/gen-iwyu-dummy-lib
+++ b/bin/gen-iwyu-dummy-lib
@@ -16,11 +16,15 @@
 
 set -e
 
-iwyu_INCLUDES=$(grep -h -r :$ ${BUILDDIR}/workdir/Dep/*Object* | grep -v 
'workdir\|config_host' | sed -e s,^${SRCDIR}/,, | sed -e s/:$//  | sort -u)
+iwyu_INCLUDES=$(grep -h -r :$ ${BUILDDIR}/workdir/Dep/*Object* \
+| grep -v 'workdir\|config_host' | grep -v ^/usr \
+| sed -e s,^${SRCDIR}/,, | sed -e s/:$//  | sort -u)
 
 iwyu_INCLUDEDIRS=$(echo ${iwyu_INCLUDES} | sed -e s,/[^/]*$,, | grep -v 
^include | sort -u)
 
-iwyu_EXTERNALS=$(ls ${SRCDIR}/*/*Library*mk ${SRCDIR}/*/*Executable*mk | xargs 
awk 'BEGIN {domatch=0;} /))/ {domatch=0;} domatch { if (!($1 in exts)) 
{exts[$1]; print $1;} } /use_external(s)?,/ { if (index($0,  { 
gsub(/.*,/, ); gsub(/)+/, ); if (!($0 in exts)) {exts[$0]; print $0; } } 
else { domatch=1;} }' | grep -v 
'$(\|)\|tde\|expat_x64\|zlib_x64\|mozilla\|apr\|serf')
+iwyu_EXTERNALS=$(ls ${SRCDIR}/*/*Library*mk ${SRCDIR}/*/*Executable*mk \
+| xargs awk -f bin/gen-iwyu-dummy-lib.awk \
+| grep -v '$(\|)\|tde\|expat_x64\|zlib_x64\|mozilla\|apr\|serf')
 
 mkdir -p ${BUILDDIR}/iwyudummy
 iwyu_MOD=${BUILDDIR}/iwyudummy/Module_iwyudummy.mk
@@ -31,9 +35,14 @@ echo include ${SRCDIR}/solenv/gbuild/partial_build.mk  
${BUILDDIR}/iwyudummy
 echo '$(eval $(call gb_Module_Module,iwyudummy))'  ${iwyu_MOD}
 echo '$(eval $(call gb_Module_add_targets,iwyudummy,StaticLibrary_iwyudummy))' 
 ${iwyu_MOD}
 
+# prevent some common configuration errors
+echo 'ifneq ($(COMPILER_PLUGINS),)'  ${iwyu_LIB}
+echo '$(call gb_Output_error,--enable-compiler-plugins does not work well 
with this: bailing out)'  ${iwyu_LIB}
+echo 'endif'  ${iwyu_LIB}
+
 echo '$(eval $(call gb_StaticLibrary_StaticLibrary,iwyudummy))'  ${iwyu_LIB}
 # clang will compile headers to .gch by default
-echo '$(eval $(call gb_StaticLibrary_add_cxxflags,iwyudummy,-x c++))'  
${iwyu_LIB}
+echo '$(eval $(call gb_StaticLibrary_add_cxxflags,iwyudummy,-x c++ 
-Wno-unused-macros))'  ${iwyu_LIB}
 echo '$(eval $(call 
gb_StaticLibrary_use_custom_headers,iwyudummy,officecfg/registry))'  
${iwyu_LIB}
 echo '$(eval $(call gb_StaticLibrary_use_sdk_api,iwyudummy))'  ${iwyu_LIB}
 echo '$(eval $(call gb_StaticLibrary_use_externals,iwyudummy,\'  ${iwyu_LIB}
diff --git a/bin/gen-iwyu-dummy-lib.awk b/bin/gen-iwyu-dummy-lib.awk
new file mode 100644
index 000..464d951
--- /dev/null
+++ b/bin/gen-iwyu-dummy-lib.awk
@@ -0,0 +1,34 @@
+BEGIN  { domatch = 0; }
+
+{
+if ($0 ~ /use_external(s)?,/ )
+{
+if (index($0, 
+{
+gsub(/.*,/, );
+gsub(/\)+/, ); 
+if (!($0 in exts))
+{
+exts[$0];
+print $0;
+}
+}
+else
+{
+   domatch = 1;
+}
+}
+else if ($0 ~ /\)\)/ )
+{
+domatch = 0;
+}
+else if (domatch == 1)
+{
+if (!($1 in exts))
+{
+exts[$1];
+print $1;
+}
+}
+}
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits