Module_tail_build.mk | 1 + postprocess/prj/build.lst | 2 +- solenv/gbuild/UnoApiTarget.mk | 4 ++-- solenv/gbuild/platform/macosx.mk | 3 +-- tail_build/prj/build.lst | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)
New commits: commit 9da0670b601c8c186b0bfbd28ea055016db376ad Author: David Tardon <dtar...@redhat.com> Date: Thu Apr 19 19:27:19 2012 +0200 extension libs should have no RPATH At least that is how it seems to work in the old build system: LINFLAGSRUNPATH_OXT in solenv/inc/unxmacx.mk is empty, just like for other platforms . On the other side, macosx-change-install-names.pl only lists OXT in combination with URELIB... Now choose :-) diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 2ab1336..ab955cf 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -162,8 +162,7 @@ gb_LinkTarget__RPATHS := \ # $(call gb_LinkTarget__get_installname,libfilename,soversion,layerprefix) define gb_LinkTarget__get_installname -$(if $(3),-install_name '$(3)$(1)$(if $(2),.$(2))', - $(call gb_Output_error,cannot determine -install_name for $(3))) +$(if $(3),-install_name '$(3)$(1)$(if $(2),.$(2))') endef gb_LinkTarget_CFLAGS := $(gb_CFLAGS) commit ab6e1860ba5d41b992b9695121b5a311f2cab3b3 Author: David Tardon <dtar...@redhat.com> Date: Mon Apr 16 06:22:48 2012 +0200 change announce diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk index 64ed831..8bc5b1f 100644 --- a/solenv/gbuild/UnoApiTarget.mk +++ b/solenv/gbuild/UnoApiTarget.mk @@ -109,7 +109,7 @@ $(call gb_UnoApiTarget__command_impl,$(gb_UnoApiTarget_RDBMAKERCOMMAND),-O$(1) - endef define gb_UnoApiTarget__command -$(call gb_Output_announce,$*,$(true),RDB,3) +$(call gb_Output_announce,$*,$(true),UNO,4) mkdir -p $(dir $(1)) && \ $(if $(UNOAPI_FILES),\ $(call gb_UnoApiTarget__regmerge_command_impl,$(1),$(UNOAPI_ROOT),$(UNOAPI_FILES)),\ @@ -139,7 +139,7 @@ $(call gb_UnoApiTarget_get_target,%): .PHONY : $(call gb_UnoApiTarget_get_clean_target,%) $(call gb_UnoApiTarget_get_clean_target,%) : - $(call gb_Output_announce,$*,$(false),RDB,3) + $(call gb_Output_announce,$*,$(false),UNO,4) -$(call gb_Helper_abbreviate_dirs,\ rm -f $(call gb_UnoApiTarget_get_target,$*)) -rm -rf $(call gb_UnoApiTarget_get_dep_target,$*) \ commit dc4911f6cd08ee813c8172cfe3fa928dbf498755 Author: David Tardon <dtar...@redhat.com> Date: Sat Apr 14 16:07:25 2012 +0200 move unodevtools to tail_build diff --git a/Module_tail_build.mk b/Module_tail_build.mk index a19f71c..cb000ca 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -84,6 +84,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ toolkit \ ucb \ UnoControls \ + unodevtools \ unoxml \ uui \ vbahelper \ diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst index 745c251..2521262 100644 --- a/postprocess/prj/build.lst +++ b/postprocess/prj/build.lst @@ -1,4 +1,4 @@ -po postprocess :: BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n embedserv EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk DESKTOP:scp2 testtools wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport tail_build NULL +po postprocess :: BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n embedserv EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk DESKTOP:scp2 testtools wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport tail_build NULL po postprocess usr1 - all po_mkout NULL po postprocess\checkxml nmake - all po_checkxml NULL po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst index 9d02e0c..a7c399a 100644 --- a/tail_build/prj/build.lst +++ b/tail_build/prj/build.lst @@ -1,2 +1,2 @@ -tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain VIGRA:vigra X11_EXTENSIONS:x11_extensions XPDF:xpdf ZLIB:zlib basegfx bridges comphelper DBCONNECTIVITY:connectivity cppu cppuhelper cpputools i18npool i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar rsc sal salhelper sax shell solenv soltools sot stoc svl sysui tools ucbhelper udkapi unoil uno test unotools ure xmlreader xsltml NULL +tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo DESKTOP:codemaker CURL:curl FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain VIGRA:vigra X11_EXTENSIONS:x11_extensions XPDF:xpdf ZLIB:zlib basegfx bridges comphelper DBCONNECTIVITY:connectivity cppu cppuhelper cpputools i18npool i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar rsc sal salhelper sax shell solenv soltools sot stoc svl sysui tools ucbhelpe r udkapi unoil unotest unotools ure xmlreader xsltml NULL tb tail_build\prj nmake - all tb_prj NULL _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits