Module_tail_build.mk | 1 + codemaker/StaticLibrary_codemaker.mk | 1 + codemaker/StaticLibrary_codemaker_cpp.mk | 1 + codemaker/StaticLibrary_codemaker_java.mk | 1 + extensions/Executable_nsplugin.mk | 6 ++++++ extensions/source/nsplugin/source/so_instance.cxx | 2 +- lingucomponent/StaticLibrary_ulingu.mk | 10 ++++++++++ sax/StaticLibrary_sax_shared.mk | 4 ++++ sdext/StaticLibrary_pdfimport_s.mk | 9 +++++++++ sdext/source/presenter/PresenterWindowManager.hxx | 1 - solenv/gbuild/Configuration.mk | 8 ++++---- solenv/gbuild/InternalUnoApi.mk | 9 ++++++--- tail_build/prj/build.lst | 2 +- testtools/StaticLibrary_bridgetest.mk | 5 +++++ vcl/StaticLibrary_headless.mk | 13 +++++++++++++ vcl/StaticLibrary_vclmain.mk | 3 +++ writerperfect/StaticLibrary_writerperfect.mk | 10 ++++++++++ 17 files changed, 76 insertions(+), 10 deletions(-)
New commits: commit 9516c661e86f99cb625e13fe6e040ae74d66a3dd Author: David Tardon <dtar...@redhat.com> Date: Mon Oct 1 07:24:16 2012 +0200 add saxon to tail_build Change-Id: I01e2b99a2618c3b4e5e80dc9e38652e75ef5217d diff --git a/Module_tail_build.mk b/Module_tail_build.mk index db82ee1..a0c958b 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -124,6 +124,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ salhelper \ sane \ sax \ + $(call gb_Helper_optional,SAXON,saxon) \ sc \ scaddins \ sccomp \ diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst index 5e84fda..4129e20 100644 --- a/tail_build/prj/build.lst +++ b/tail_build/prj/build.lst @@ -1,2 +1,2 @@ -tb tail_build : BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon XPDF:xpdf ZLIB:zlib external RHINO:rhino sal solenv soltools NULL +tb tail_build : BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland stax XPDF:xpdf ZLIB:zlib external RHINO:rhino sal solenv soltools NULL tb tail_build\prj nmake - all tb_prj NULL commit 5013ebbffdd37a68c49a34e9c1b4e69c36a86912 Author: David Tardon <dtar...@redhat.com> Date: Mon Oct 1 06:17:06 2012 +0200 fix InternalUnoApi IDL deps Change-Id: I02bd49c6f6b252c6797292b8e4a9bc319fe0947e diff --git a/solenv/gbuild/InternalUnoApi.mk b/solenv/gbuild/InternalUnoApi.mk index 3dd32ee..8949323 100644 --- a/solenv/gbuild/InternalUnoApi.mk +++ b/solenv/gbuild/InternalUnoApi.mk @@ -52,7 +52,10 @@ $(call gb_InternalUnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$( $(call gb_InternalUnoApi_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1)_out) $(call gb_InternalUnoApi_get_clean_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_clean_target,$(1)) -$(call gb_UnoApiTarget_get_headers_target,$(1)) : $(gb_Helper_MISCDUMMY) +$(call gb_UnoApiTarget_get_headers_target,$(1)_out) : $(gb_Helper_MISCDUMMY) +$(call gb_UnoApiTarget_get_headers_target,$(1)) : $(call gb_UnoApiTarget_get_headers_target,$(1)_out) +$(call gb_UnoApiTarget_get_external_headers_target,$(1)_out) : $(gb_Helper_MISCDUMMY) +$(call gb_UnoApiTarget_get_external_headers_target,$(1)) : $(call gb_UnoApiTarget_get_external_headers_target,$(1)_out) $(call gb_Deliver_add_deliverable,$(call gb_InternalUnoApi_get_target,$(1)),$(call gb_UnoApiTarget_get_target,$(1)_out),$(1)) @@ -72,8 +75,8 @@ endef define gb_InternalUnoApi__use_api $(call gb_UnoApiHeadersTarget_use_api,$(1),$(2)) -$(call gb_InternalUnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(2)) -$(call gb_UnoApiTarget_get_external_headers_target,$(1)) : $(call gb_UnoApiTarget_get_headers_target,$(2)) +$(call gb_InternalUnoApi_get_target,$(1)_out) : $(call gb_UnoApiTarget_get_target,$(2)) +$(call gb_UnoApiTarget_get_external_headers_target,$(1)_out) : $(call gb_UnoApiTarget_get_headers_target,$(2)) endef commit 93a3e81816e3479c0d107ba44d473134b51a7712 Author: David Tardon <dtar...@redhat.com> Date: Sun Sep 30 18:51:11 2012 +0200 add missing deps on headers to static libs Change-Id: I7a28dfa13bf0f98a654eca98eb1cdfd99177f37a diff --git a/codemaker/StaticLibrary_codemaker.mk b/codemaker/StaticLibrary_codemaker.mk index bbea555..04b53db 100644 --- a/codemaker/StaticLibrary_codemaker.mk +++ b/codemaker/StaticLibrary_codemaker.mk @@ -29,6 +29,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,codemaker)) $(eval $(call gb_StaticLibrary_use_packages,codemaker,\ codemaker_inc \ + registry_inc \ sal_generated \ )) diff --git a/codemaker/StaticLibrary_codemaker_cpp.mk b/codemaker/StaticLibrary_codemaker_cpp.mk index b8cabf4..92678fa 100644 --- a/codemaker/StaticLibrary_codemaker_cpp.mk +++ b/codemaker/StaticLibrary_codemaker_cpp.mk @@ -29,6 +29,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,codemaker_cpp)) $(eval $(call gb_StaticLibrary_use_packages,codemaker_cpp,\ codemaker_inc \ + registry_inc \ )) $(eval $(call gb_StaticLibrary_add_exception_objects,codemaker_cpp,\ diff --git a/codemaker/StaticLibrary_codemaker_java.mk b/codemaker/StaticLibrary_codemaker_java.mk index 6538e38..f33d38e 100644 --- a/codemaker/StaticLibrary_codemaker_java.mk +++ b/codemaker/StaticLibrary_codemaker_java.mk @@ -29,6 +29,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,codemaker_java)) $(eval $(call gb_StaticLibrary_use_packages,codemaker_java,\ codemaker_inc \ + registry_inc \ )) $(eval $(call gb_StaticLibrary_add_exception_objects,codemaker_java,\ diff --git a/lingucomponent/StaticLibrary_ulingu.mk b/lingucomponent/StaticLibrary_ulingu.mk index 3bc66a2..9767efa 100644 --- a/lingucomponent/StaticLibrary_ulingu.mk +++ b/lingucomponent/StaticLibrary_ulingu.mk @@ -27,6 +27,16 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,ulingu)) +$(eval $(call gb_StaticLibrary_use_packages,ulingu,\ + comphelper_inc \ + cppu_inc \ + cppuhelper_inc \ + i18npool_inc \ + linguistic_inc \ + tools_inc \ + unotools_inc \ +)) + $(eval $(call gb_StaticLibrary_use_api,ulingu,\ udkapi \ offapi \ diff --git a/sax/StaticLibrary_sax_shared.mk b/sax/StaticLibrary_sax_shared.mk index cdbc3c8..bf6887c 100644 --- a/sax/StaticLibrary_sax_shared.mk +++ b/sax/StaticLibrary_sax_shared.mk @@ -9,6 +9,10 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,sax_shared)) +$(eval $(call gb_StaticLibrary_use_packages,sax_shared,\ + cppu_inc \ +)) + $(eval $(call gb_StaticLibrary_set_include,sax_shared,\ -I$(SRCDIR)/sax/inc \ $$(INCLUDE) \ diff --git a/sdext/StaticLibrary_pdfimport_s.mk b/sdext/StaticLibrary_pdfimport_s.mk index 20065a9..bf49da3 100644 --- a/sdext/StaticLibrary_pdfimport_s.mk +++ b/sdext/StaticLibrary_pdfimport_s.mk @@ -30,6 +30,11 @@ include $(dir $(realpath $(lastword $(MAKEFILE_LIST))))platform.mk $(eval $(call gb_StaticLibrary_StaticLibrary,pdfimport_s)) $(eval $(call gb_StaticLibrary_use_packages,pdfimport_s,\ + basegfx_inc \ + comphelper_inc \ + cppu_inc \ + cppuhelper_inc \ + o3tl_inc \ tools_inc \ )) diff --git a/testtools/StaticLibrary_bridgetest.mk b/testtools/StaticLibrary_bridgetest.mk index ed96f34..23254e7 100644 --- a/testtools/StaticLibrary_bridgetest.mk +++ b/testtools/StaticLibrary_bridgetest.mk @@ -27,6 +27,11 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,testtools_bridgetest_s)) +$(eval $(call gb_StaticLibrary_use_packages,testtools_bridgetest_s,\ + cppu_inc \ + cppuhelper_inc \ +)) + $(eval $(call gb_StaticLibrary_use_internal_api,testtools_bridgetest_s,\ bridgetest \ )) diff --git a/vcl/StaticLibrary_headless.mk b/vcl/StaticLibrary_headless.mk index a07497c..a3dc220 100644 --- a/vcl/StaticLibrary_headless.mk +++ b/vcl/StaticLibrary_headless.mk @@ -28,6 +28,19 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,headless)) +$(eval $(call gb_StaticLibrary_use_packages,headless,\ + basebmp_inc \ + basegfx_inc \ + comphelper_inc \ + cppu_inc \ + cppuhelper_inc \ + i18npool_inc \ + i18nutil_inc \ + o3tl_inc \ + tools_inc \ + unotools_inc \ +)) + $(eval $(call gb_StaticLibrary_use_api,headless,\ offapi \ udkapi \ diff --git a/vcl/StaticLibrary_vclmain.mk b/vcl/StaticLibrary_vclmain.mk index 05a6f3e..98998bb 100644 --- a/vcl/StaticLibrary_vclmain.mk +++ b/vcl/StaticLibrary_vclmain.mk @@ -29,6 +29,9 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,vclmain)) $(eval $(call gb_StaticLibrary_use_packages,vclmain,\ + comphelper_inc \ + cppu_inc \ + cppuhelper_inc \ tools_inc \ )) diff --git a/writerperfect/StaticLibrary_writerperfect.mk b/writerperfect/StaticLibrary_writerperfect.mk index 6aec3ae..995b1ba 100644 --- a/writerperfect/StaticLibrary_writerperfect.mk +++ b/writerperfect/StaticLibrary_writerperfect.mk @@ -19,6 +19,16 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,writerperfect)) +$(eval $(call gb_StaticLibrary_use_packages,writerperfect,\ + comphelper_inc \ + cppu_inc \ + cppuhelper_inc \ + sot_inc \ + tools_inc \ + unotools_inc \ + xmloff_inc \ +)) + $(eval $(call gb_StaticLibrary_set_include,writerperfect,\ $$(INCLUDE) \ -I$(SRCDIR)/writerperfect/source \ commit 898c34603555b64b330ef5a45b7e60eb82e25b66 Author: David Tardon <dtar...@redhat.com> Date: Sun Sep 30 14:17:16 2012 +0200 do not rely on target-spec. var. inheritance The whole idea of having two paths to look for schemas (one local, for module, and one global, in $(OUTDIR)) is bad anyway, because there is no way to do it in XSLT without warning if the checked schema does not exist in the first path. I see two ways out of that: 1. rewrite schema_val.xsl in a decent language 2. split the node reference check in schema_val.xsl into two phases: the first phase returns a list of subpaths to check, a helper script processes that, finds the real paths and feeds it to the second phase XSL, which does the internal check. Change-Id: Icfe3f9ec0960cfd3423c1223ad8f495d7634b25a diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk index e02d0da..f8b5114 100644 --- a/solenv/gbuild/Configuration.mk +++ b/solenv/gbuild/Configuration.mk @@ -54,6 +54,8 @@ # gb_Configuration__get_source = $(SRCDIR)/$(2) +# The main LibreOffice registry +gb_Configuration_PRIMARY_REGISTRY_NAME := registry # XcsTarget class @@ -77,7 +79,7 @@ $(call gb_Helper_abbreviate_dirs,\ --noout \ --stringparam componentName $(subst /,.,$(basename $(XCSFILE))) \ --stringparam root $(subst $(XCSFILE),,$(3)) \ - $(if $(SCHEMA_ROOT),--stringparam schemaRoot $(SCHEMA_ROOT)) \ + $(if $(PRIMARY_REGISTRY),,--stringparam schemaRoot $(call gb_XcsTarget_get_outdir_target,)) \ $(gb_XcsTarget_XSLT_SchemaVal) \ $(3) && \ $(gb_XSLTPROC) --nonet \ @@ -353,8 +355,6 @@ $(foreach lang,$(gb_Configuration_LANGS),$(eval \ $(call gb_Configuration_get_clean_target,$(1)) : \ $(call gb_Zip_get_clean_target,$(1)_$(lang)))) -$(call gb_Configuration_get_target,$(1)) : SCHEMA_ROOT := - $$(eval $$(call gb_Module_register_target,$(call gb_Configuration_get_target,$(1)),$(call gb_Configuration_get_clean_target,$(1)))) endef @@ -368,6 +368,7 @@ $(call gb_Configuration_get_clean_target,$(1)) : \ $(call gb_XcsTarget_get_target,$(2)/$(3)) : \ $(call gb_Configuration__get_source,$(1),$(2)/$(3)) \ $(call gb_Configuration_get_preparation_target,$(1)) +$(call gb_XcsTarget_get_target,$(2)/$(3)) : PRIMARY_REGISTRY := $(filter $(1),$(gb_Configuration_PRIMARY_REGISTRY_NAME)) $(call gb_XcsTarget_get_target,$(2)/$(3)) : XCSFILE := $(3) $(call gb_XcsTarget_get_clean_target,$(2)/$(3)) : XCSFILE := $(3) $(call gb_Configuration_get_target,$(1)) : \ @@ -508,7 +509,6 @@ endef # $(eval $(call gb_Configuration_use_configuration,foo,registry)) define gb_Configuration_use_configuration $(call gb_Configuration_get_preparation_target,$(1)) : $(call gb_Configuration_get_target,$(2)) -$(call gb_Configuration_get_target,$(1)) : SCHEMA_ROOT := $(gb_Configuration_registry)/schema endef commit 6e9c84461a5b86275b61003de8753a6699fad1ba Author: David Tardon <dtar...@redhat.com> Date: Sun Sep 30 08:13:57 2012 +0200 drop unused include Change-Id: I21360e2d65b64bc27f02d677eda05f9d9d765367 diff --git a/sdext/source/presenter/PresenterWindowManager.hxx b/sdext/source/presenter/PresenterWindowManager.hxx index d2a5ae2..88a748e 100644 --- a/sdext/source/presenter/PresenterWindowManager.hxx +++ b/sdext/source/presenter/PresenterWindowManager.hxx @@ -47,7 +47,6 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase4.hxx> -#include <tools/gen.hxx> #include <rtl/ref.hxx> #include <boost/noncopyable.hpp> #include <boost/shared_ptr.hpp> commit b7bc73de34f1fda3f5ce533e139a19d54b142c10 Author: David Tardon <dtar...@redhat.com> Date: Sun Sep 30 07:35:08 2012 +0200 add missing dep for tools/errcode.hxx Change-Id: I6e63a545332a1b865a26b355db49869c214f97c7 diff --git a/sdext/StaticLibrary_pdfimport_s.mk b/sdext/StaticLibrary_pdfimport_s.mk index 699e3e7..20065a9 100644 --- a/sdext/StaticLibrary_pdfimport_s.mk +++ b/sdext/StaticLibrary_pdfimport_s.mk @@ -29,6 +29,10 @@ include $(dir $(realpath $(lastword $(MAKEFILE_LIST))))platform.mk $(eval $(call gb_StaticLibrary_StaticLibrary,pdfimport_s)) +$(eval $(call gb_StaticLibrary_use_packages,pdfimport_s,\ + tools_inc \ +)) + $(eval $(call gb_StaticLibrary_use_api,pdfimport_s,\ offapi \ udkapi \ commit 25a7a4bb6cc226f5a7d2d7352b10ebaa049661ff Author: David Tardon <dtar...@redhat.com> Date: Sun Sep 30 06:56:04 2012 +0200 add missing deps for tools/color.hxx Change-Id: I164afe17c3bff2f7d7f2b9daec0d5a5ca8fdf97a diff --git a/extensions/Executable_nsplugin.mk b/extensions/Executable_nsplugin.mk index 0f6af60..866257e 100644 --- a/extensions/Executable_nsplugin.mk +++ b/extensions/Executable_nsplugin.mk @@ -30,6 +30,12 @@ $(eval $(call gb_Executable_Executable,nsplugin)) +$(eval $(call gb_Executable_use_packages,nsplugin,\ + basegfx_inc \ + comphelper_inc \ + tools_inc \ +)) + $(eval $(call gb_Executable_use_sdk_api,nsplugin)) $(eval $(call gb_Executable_add_exception_objects,nsplugin,\ diff --git a/extensions/source/nsplugin/source/so_instance.cxx b/extensions/source/nsplugin/source/so_instance.cxx index c9b6ee9..4aeb45a 100644 --- a/extensions/source/nsplugin/source/so_instance.cxx +++ b/extensions/source/nsplugin/source/so_instance.cxx @@ -39,7 +39,7 @@ #include <com/sun/star/presentation/XPresentation.hpp> #include <com/sun/star/presentation/XPresentationSupplier.hpp> #include <comphelper/processfactory.hxx> -#include <vcl/window.hxx> +#include <tools/color.hxx> #include <rtl/textenc.h> #include <rtl/locale.h> #include <osl/nlsupport.h> _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits