connectivity/Package_postgresql-sdbc.mk | 4 ++- cppuhelper/Module_cppuhelper.mk | 1 cppuhelper/Package_unorc.mk | 16 -------------- cppuhelper/source/unorc | 23 -------------------- desktop/Module_desktop.mk | 1 desktop/Package_scripts.mk | 24 +++++++++++---------- desktop/Package_scripts_install.mk | 33 ------------------------------ external/hyphen/ExternalPackage_hyphen.mk | 20 ------------------ external/hyphen/ExternalProject_hyphen.mk | 1 external/hyphen/Module_hyphen.mk | 14 +++++++----- extras/Package_wordbook.mk | 4 ++- sdext/Package_pdfimport_xpdfimport.mk | 4 ++- solenv/gbuild/Extension.mk | 12 +++++----- solenv/gbuild/HelpTarget.mk | 8 +++---- swext/Extension_wiki-publisher.mk | 16 ++++++++------ sysui/Package_share.mk | 4 ++- xmlhelp/Module_xmlhelp.mk | 1 xmlhelp/Package_xsl.mk | 18 ---------------- xsltml/ExternalPackage_xsltml.mk | 22 -------------------- xsltml/Module_xsltml.mk | 1 20 files changed, 52 insertions(+), 175 deletions(-)
New commits: commit ccf4f1d80e82b2fa5156f1a351a5e1cd8dde3be0 Author: Michael Stahl <mst...@redhat.com> Date: Thu Oct 24 17:23:29 2013 +0200 hyphen: stop building hyph_en_US.dic too Change-Id: I05929be5dbc41ba6889bd593ad0ce0061367ea37 diff --git a/external/hyphen/ExternalProject_hyphen.mk b/external/hyphen/ExternalProject_hyphen.mk index e7d3673..573fbae 100644 --- a/external/hyphen/ExternalProject_hyphen.mk +++ b/external/hyphen/ExternalProject_hyphen.mk @@ -22,7 +22,6 @@ $(call gb_ExternalProject_get_state_target,hyphen,build): $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no) \ $(if $(filter C52U,$(COM)$(CPU)),CFLAGS="-m64") \ && $(MAKE) \ - $(if $(filter YESYES,$(SYSTEM_HYPH)$(WITH_MYSPELL_DICTS)),hyph_en_US.dic) \ ) # vim: set noet sw=4 ts=4: diff --git a/external/hyphen/Module_hyphen.mk b/external/hyphen/Module_hyphen.mk index 1dde6dd..80dae1f 100644 --- a/external/hyphen/Module_hyphen.mk +++ b/external/hyphen/Module_hyphen.mk @@ -9,23 +9,26 @@ $(eval $(call gb_Module_Module,hyphen)) -ifneq ($(or $(filter NO,$(SYSTEM_HYPH)),$(filter TRUE,$(WITH_MYSPELL_DICTS))),) +ifeq ($(SYSTEM_HYPH),NO) + $(eval $(call gb_Module_add_targets,hyphen,\ UnpackedTarball_hyphen \ )) + ifeq ($(COM),MSC) -ifeq ($(SYSTEM_HYPH),NO) $(eval $(call gb_Module_add_targets,hyphen,\ StaticLibrary_hyphen \ )) -endif else + $(eval $(call gb_Module_add_targets,hyphen,\ ExternalProject_hyphen \ )) -endif -endif + +endif # $(COM) + +endif # $(SYSTEM_HYPH) # vim: set noet sw=4 ts=4: commit d1f46c8a3f25370a8cb5b360cd23835e693a906c Author: Michael Stahl <mst...@redhat.com> Date: Thu Oct 24 17:18:05 2013 +0200 hyphen: remove ExternalPackage_hyphen It only contained hyph_en_US.dic, which is actually unused; the usage in dictionaries (for a writingaids.zip) was removed years ago in commit 72682b9ac937472b9c48c8a9be70be902ff645e8. Change-Id: I523c60614bddb8596ccff52d3c4d648111846856 diff --git a/external/hyphen/ExternalPackage_hyphen.mk b/external/hyphen/ExternalPackage_hyphen.mk deleted file mode 100644 index 13303cc..0000000 --- a/external/hyphen/ExternalPackage_hyphen.mk +++ /dev/null @@ -1,20 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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/. -# - -$(eval $(call gb_ExternalPackage_ExternalPackage,hyphen,hyphen)) - -ifeq ($(WITH_MYSPELL_DICTS),YES) - -$(eval $(call gb_ExternalPackage_add_unpacked_files,hyphen,bin,\ - hyph_en_US.dic \ -)) - -endif - -# vim: set noet sw=4 ts=4: diff --git a/external/hyphen/Module_hyphen.mk b/external/hyphen/Module_hyphen.mk index 2ab3245..1dde6dd 100644 --- a/external/hyphen/Module_hyphen.mk +++ b/external/hyphen/Module_hyphen.mk @@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,hyphen)) ifneq ($(or $(filter NO,$(SYSTEM_HYPH)),$(filter TRUE,$(WITH_MYSPELL_DICTS))),) $(eval $(call gb_Module_add_targets,hyphen,\ UnpackedTarball_hyphen \ - ExternalPackage_hyphen \ )) ifeq ($(COM),MSC) commit 56bb796673657c9f8683bbff08070c77c4c889cd Author: Michael Stahl <mst...@redhat.com> Date: Thu Oct 24 16:19:50 2013 +0200 xmlhelp: remove Package_xsl Change-Id: Id0a5213b39886e2f6929f7ff2c014ed861d1da91 diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index 42da363..da5be96 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -440,19 +440,19 @@ define gb_Extension__compile_help_onelang $(call gb_Extension_get_rootdir,$(1))/help/$(2).done : \ $(gb_Extension_HELPINDEXERDEPS) \ $(gb_Extension_HELPLINKERDEPS) \ - $(OUTDIR_FOR_BUILD)/bin/embed.xsl \ - $(OUTDIR_FOR_BUILD)/bin/idxcaption.xsl \ - $(OUTDIR_FOR_BUILD)/bin/idxcontent.xsl | \ + $(SRCDIR)/xmlhelp/util/embed.xsl \ + $(SRCDIR)/xmlhelp/util/idxcaption.xsl \ + $(SRCDIR)/xmlhelp/util/idxcontent.xsl | \ $(call gb_Extension_get_rootdir,$(1))/help/.dir $$(call gb_Output_announce,$(1) $(2),$(true),XHC,3) $$(call gb_Helper_abbreviate_dirs, \ mkdir -p $$(basename $$@) && \ $$(gb_Extension_HELPLINKERCOMMAND) -mod help \ -extlangsrc $(call gb_Extension_get_workdir,$(1))/help/$(2) \ - -sty $(OUTDIR_FOR_BUILD)/bin/embed.xsl \ + -sty $(SRCDIR)/xmlhelp/util/embed.xsl \ -extlangdest $$(basename $$@) \ - -idxcaption $(OUTDIR_FOR_BUILD)/bin/idxcaption.xsl \ - -idxcontent $(OUTDIR_FOR_BUILD)/bin/idxcontent.xsl \ + -idxcaption $(SRCDIR)/xmlhelp/util/idxcaption.xsl \ + -idxcontent $(SRCDIR)/xmlhelp/util/idxcontent.xsl \ $$(HELPFILES) && \ (cd $(call gb_Extension_get_workdir,$(1))/help/$(2) && \ $$(gb_Extension_ZIPCOMMAND) -r $$(basename $$@)/help.jar \ diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk index a194d0b..da9e5af 100644 --- a/solenv/gbuild/HelpTarget.mk +++ b/solenv/gbuild/HelpTarget.mk @@ -269,10 +269,10 @@ endef gb_HelpLinkTarget_HELPLINKERDEPS := $(call gb_Executable_get_runtime_dependencies,HelpLinker) gb_HelpLinkTarget_HELPLINKERCOMMAND := $(call gb_Executable_get_command,HelpLinker) -gb_HelpLinkTarget_COMPACTTARGET := $(OUTDIR)/bin/compact.xsl -gb_HelpLinkTarget_EMBEDTARGET := $(OUTDIR)/bin/embed.xsl -gb_HelpLinkTarget_IDXCAPTIONTARGET := $(OUTDIR)/bin/idxcaption.xsl -gb_HelpLinkTarget_IDXCONTENTTARGET := $(OUTDIR)/bin/idxcontent.xsl +gb_HelpLinkTarget_COMPACTTARGET := $(SRCDIR)/xmlhelp/util/compact.xsl +gb_HelpLinkTarget_EMBEDTARGET := $(SRCDIR)/xmlhelp/util/embed.xsl +gb_HelpLinkTarget_IDXCAPTIONTARGET := $(SRCDIR)/xmlhelp/util/idxcaption.xsl +gb_HelpLinkTarget_IDXCONTENTTARGET := $(SRCDIR)/xmlhelp/util/idxcontent.xsl gb_HelpLinkTarget_DEPS := \ $(gb_HelpLinkTarget_HELPLINKERDEPS) \ $(gb_HelpLinkTarget_COMPACTTARGET) \ diff --git a/xmlhelp/Module_xmlhelp.mk b/xmlhelp/Module_xmlhelp.mk index 5e5105d2..1cba02a 100644 --- a/xmlhelp/Module_xmlhelp.mk +++ b/xmlhelp/Module_xmlhelp.mk @@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,xmlhelp)) $(eval $(call gb_Module_add_targets,xmlhelp,\ Library_tvhlp1 \ Library_ucpchelp1 \ - Package_xsl \ Package_helpxsl \ )) diff --git a/xmlhelp/Package_xsl.mk b/xmlhelp/Package_xsl.mk deleted file mode 100644 index f03e228..0000000 --- a/xmlhelp/Package_xsl.mk +++ /dev/null @@ -1,18 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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/. -# - -$(eval $(call gb_Package_Package,xmlhelp_xsl,$(SRCDIR)/xmlhelp/util)) - -$(eval $(call gb_Package_add_file,xmlhelp_xsl,bin/compact.xsl,compact.xsl)) -$(eval $(call gb_Package_add_file,xmlhelp_xsl,bin/embed.xsl,embed.xsl)) -$(eval $(call gb_Package_add_file,xmlhelp_xsl,bin/idxcaption.xsl,idxcaption.xsl)) -$(eval $(call gb_Package_add_file,xmlhelp_xsl,bin/idxcontent.xsl,idxcontent.xsl)) -$(eval $(call gb_Package_add_file,xmlhelp_xsl,bin/main_transform.xsl,main_transform.xsl)) - -# vim: set shiftwidth=4 tabstop=4 noexpandtab: commit 250198ad0e02741b254ce191ff5e110f63aa6e21 Author: Michael Stahl <mst...@redhat.com> Date: Thu Oct 24 15:57:35 2013 +0200 connectivity: deliver postgresql-sdbc.ini to INSTDIR Change-Id: I0317252e17b0ddadc5e4a1bebb0c7b21963d57fe diff --git a/connectivity/Package_postgresql-sdbc.mk b/connectivity/Package_postgresql-sdbc.mk index 2a92582..c4f1d24 100644 --- a/connectivity/Package_postgresql-sdbc.mk +++ b/connectivity/Package_postgresql-sdbc.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,connectivity_postgresql-sdbc,$(SRCDIR)/connectivity/source/drivers/postgresql)) -$(eval $(call gb_Package_add_file,connectivity_postgresql-sdbc,bin/postgresql-sdbc.ini,postgresql-sdbc.ini)) +$(eval $(call gb_Package_set_outdir,connectivity_postgresql-sdbc,$(INSTROOT))) + +$(eval $(call gb_Package_add_file,connectivity_postgresql-sdbc,$(LIBO_BIN_FOLDER)/postgresql-sdbc.ini,postgresql-sdbc.ini)) # vim: set noet sw=4 ts=4: commit d8be8a9c17bedb5a0cfb4b5ea1a2f02f59582cad Author: Michael Stahl <mst...@redhat.com> Date: Thu Oct 24 15:47:21 2013 +0200 cppuhelper: remove obsolete Package_unorc Change-Id: I4d513b69527ac21949f03b847a4638b92aef0a3e diff --git a/cppuhelper/Module_cppuhelper.mk b/cppuhelper/Module_cppuhelper.mk index 7f11f2b..ba1b008 100644 --- a/cppuhelper/Module_cppuhelper.mk +++ b/cppuhelper/Module_cppuhelper.mk @@ -13,7 +13,6 @@ $(eval $(call gb_Module_Module,cppuhelper)) $(eval $(call gb_Module_add_targets,cppuhelper,\ InternalUnoApi_cppuhelper \ Library_cppuhelper \ - Package_unorc \ StaticLibrary_findsofficepath \ )) diff --git a/cppuhelper/Package_unorc.mk b/cppuhelper/Package_unorc.mk deleted file mode 100644 index 172f10e..0000000 --- a/cppuhelper/Package_unorc.mk +++ /dev/null @@ -1,16 +0,0 @@ -# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- -# -# -# 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/. -# - -$(eval $(call gb_Package_Package,cppuhelper_unorc,$(SRCDIR)/cppuhelper/source)) - -$(eval $(call gb_Package_add_file,cppuhelper_unorc,bin/uno.ini,unorc)) -$(eval $(call gb_Package_add_file,cppuhelper_unorc,lib/unorc,unorc)) - -# vim: set noet sw=4 ts=4: diff --git a/cppuhelper/source/unorc b/cppuhelper/source/unorc deleted file mode 100644 index 48c8b0c..0000000 --- a/cppuhelper/source/unorc +++ /dev/null @@ -1,23 +0,0 @@ -= -= 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 incorporates work covered by the following license notice: -= -= Licensed to the Apache Software Foundation (ASF) under one or more -= contributor license agreements. See the NOTICE file distributed -= with this work for additional information regarding copyright -= ownership. The ASF licenses this file to you under the Apache -= License, Version 2.0 (the "License"); you may not use this file -= except in compliance with the License. You may obtain a copy of -= the License at http://www.apache.org/licenses/LICENSE-2.0 . -= - -[Bootstrap] -URE_INTERNAL_LIB_DIR=${ORIGIN} -URE_INTERNAL_JAVA_DIR=${ORIGIN}/../bin -UNO_SERVICES=${URE_MORE_SERVICES} -UNO_TYPES=${ORIGIN}/../bin/udkapi.rdb ${URE_MORE_TYPES} commit cacce520c64c3f1444f377bbe98f0f17bac4db40 Author: Michael Stahl <mst...@redhat.com> Date: Thu Oct 24 15:38:44 2013 +0200 desktop: need only one Package_scripts Change-Id: Ia47d1cc8c2d754f74e281eac82c76fbaf12d8541 diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk index e13e8fc..2c70992 100644 --- a/desktop/Module_desktop.mk +++ b/desktop/Module_desktop.mk @@ -40,7 +40,6 @@ $(eval $(call gb_Module_add_targets,desktop,\ Library_migrationoo3 \ Library_unopkgapp \ Package_scripts \ - Package_scripts_install \ Pagein_calc \ Pagein_common \ Pagein_draw \ diff --git a/desktop/Package_scripts.mk b/desktop/Package_scripts.mk index 5171cb8..046ba69 100644 --- a/desktop/Package_scripts.mk +++ b/desktop/Package_scripts.mk @@ -7,25 +7,27 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,desktop_scripts,$(SRCDIR)/desktop/scripts)) +$(eval $(call gb_Package_Package,desktop_scripts_install,$(SRCDIR)/desktop/scripts)) + +$(eval $(call gb_Package_set_outdir,desktop_scripts_install,$(INSTROOT))) ifeq (,$(filter MACOSX WNT,$(OS))) -$(eval $(call gb_Package_add_file,desktop_scripts,bin/gdbtrace,gdbtrace)) -$(eval $(call gb_Package_add_file,desktop_scripts,bin/sbase,sbase.sh)) -$(eval $(call gb_Package_add_file,desktop_scripts,bin/scalc,scalc.sh)) -$(eval $(call gb_Package_add_file,desktop_scripts,bin/sdraw,sdraw.sh)) -$(eval $(call gb_Package_add_file,desktop_scripts,bin/simpress,simpress.sh)) -$(eval $(call gb_Package_add_file,desktop_scripts,bin/smath,smath.sh)) -$(eval $(call gb_Package_add_file,desktop_scripts,bin/swriter,swriter.sh)) +$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/gdbtrace,gdbtrace)) +$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/sbase,sbase.sh)) +$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/scalc,scalc.sh)) +$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/sdraw,sdraw.sh)) +$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/simpress,simpress.sh)) +$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/smath,smath.sh)) +$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/swriter,swriter.sh)) endif ifneq ($(OS),WNT) -$(eval $(call gb_Package_add_file,desktop_scripts,bin/unoinfo,unoinfo.sh)) -$(eval $(call gb_Package_add_file,desktop_scripts,bin/unopkg,unopkg.sh)) +$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/unoinfo,unoinfo.sh)) +$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/unopkg,unopkg.sh)) endif -# vim: set ts=4 sw=4 et: +# vim: set ts=4 sw=4 noet: diff --git a/desktop/Package_scripts_install.mk b/desktop/Package_scripts_install.mk deleted file mode 100644 index 046ba69..0000000 --- a/desktop/Package_scripts_install.mk +++ /dev/null @@ -1,33 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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/. -# - -$(eval $(call gb_Package_Package,desktop_scripts_install,$(SRCDIR)/desktop/scripts)) - -$(eval $(call gb_Package_set_outdir,desktop_scripts_install,$(INSTROOT))) - -ifeq (,$(filter MACOSX WNT,$(OS))) - -$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/gdbtrace,gdbtrace)) -$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/sbase,sbase.sh)) -$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/scalc,scalc.sh)) -$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/sdraw,sdraw.sh)) -$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/simpress,simpress.sh)) -$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/smath,smath.sh)) -$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/swriter,swriter.sh)) - -endif - -ifneq ($(OS),WNT) - -$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/unoinfo,unoinfo.sh)) -$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/unopkg,unopkg.sh)) - -endif - -# vim: set ts=4 sw=4 noet: commit 3f8ded9c5c4cf0d343f992c87f6ef3b15ba6b59c Author: Michael Stahl <mst...@redhat.com> Date: Thu Oct 24 15:24:03 2013 +0200 sdext: deliver that weird pdf file to INSTDIR Change-Id: I3d5daf2ab957eb98c80e936406721a7eb627c436 diff --git a/sdext/Package_pdfimport_xpdfimport.mk b/sdext/Package_pdfimport_xpdfimport.mk index 02af5a5..5236306 100644 --- a/sdext/Package_pdfimport_xpdfimport.mk +++ b/sdext/Package_pdfimport_xpdfimport.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,sdext_pdfimport_pdf,$(SRCDIR)/sdext)) -$(eval $(call gb_Package_add_file,sdext_pdfimport_pdf,bin/xpdfimport_err.pdf,source/pdfimport/dialogs/xpdfimport_err.pdf)) +$(eval $(call gb_Package_set_outdir,sdext_pdfimport_pdf,$(INSTROOT))) + +$(eval $(call gb_Package_add_file,sdext_pdfimport_pdf,share/xpdfimport/xpdfimport_err.pdf,source/pdfimport/dialogs/xpdfimport_err.pdf)) # vim: set noet sw=4 ts=4: commit c801ab3676e3a17dc471dfebc685a5a603586d67 Author: Michael Stahl <mst...@redhat.com> Date: Thu Oct 24 14:41:30 2013 +0200 xsltml: remove ExternalPackage, use files from WORKDIR Change-Id: Ib2ca7cbf15fd374fd822fa096e0e3f3502598245 diff --git a/swext/Extension_wiki-publisher.mk b/swext/Extension_wiki-publisher.mk index 03ddfad..26d6a20 100644 --- a/swext/Extension_wiki-publisher.mk +++ b/swext/Extension_wiki-publisher.mk @@ -11,6 +11,8 @@ $(eval $(call gb_Extension_Extension,wiki-publisher,swext/mediawiki/src)) +$(eval $(call gb_Extension_use_unpacked,wiki-publisher,xsltml)) + $(eval $(call gb_Extension_use_default_description,wiki-publisher)) $(eval $(call gb_Extension_use_default_license,wiki-publisher)) @@ -36,13 +38,13 @@ $(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/Module1.xba,$(SRCD $(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/script.xlb,$(SRCDIR)/swext/mediawiki/dialogs/script.xlb)) $(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/dialog.xlb,$(SRCDIR)/swext/mediawiki/dialogs/dialog.xlb)) $(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/SendToMediaWiki.xdl,$(SRCDIR)/swext/mediawiki/dialogs/SendToMediaWiki.xdl)) -$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/cmarkup.xsl,$(OUTDIR)/bin/xslt/export/xsltml/cmarkup.xsl)) -$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/entities.xsl,$(OUTDIR)/bin/xslt/export/xsltml/entities.xsl)) -$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/glayout.xsl,$(OUTDIR)/bin/xslt/export/xsltml/glayout.xsl)) -$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/mmltex.xsl,$(OUTDIR)/bin/xslt/export/xsltml/mmltex.xsl)) -$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/scripts.xsl,$(OUTDIR)/bin/xslt/export/xsltml/scripts.xsl)) -$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/tables.xsl,$(OUTDIR)/bin/xslt/export/xsltml/tables.xsl)) -$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/tokens.xsl,$(OUTDIR)/bin/xslt/export/xsltml/tokens.xsl)) +$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/cmarkup.xsl,$(call gb_UnpackedTarball_get_dir,xsltml)/cmarkup.xsl)) +$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/entities.xsl,$(call gb_UnpackedTarball_get_dir,xsltml)/entities.xsl)) +$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/glayout.xsl,$(call gb_UnpackedTarball_get_dir,xsltml)/glayout.xsl)) +$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/mmltex.xsl,$(call gb_UnpackedTarball_get_dir,xsltml)/mmltex.xsl)) +$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/scripts.xsl,$(call gb_UnpackedTarball_get_dir,xsltml)/scripts.xsl)) +$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/tables.xsl,$(call gb_UnpackedTarball_get_dir,xsltml)/tables.xsl)) +$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/tokens.xsl,$(call gb_UnpackedTarball_get_dir,xsltml)/tokens.xsl)) $(eval $(call gb_Extension_add_file,wiki-publisher,filter/odt2mediawiki.xsl,$(SRCDIR)/swext/mediawiki/src/filter/odt2mediawiki.xsl)) $(eval $(call gb_Extension_add_file,wiki-publisher,license/THIRDPARTYLICENSEREADME.html,$(SRCDIR)/swext/mediawiki/src/THIRDPARTYLICENSEREADME.html)) $(eval $(call gb_Extension_add_file,wiki-publisher,templates/MediaWiki/mediawiki.ott,$(SRCDIR)/swext/mediawiki/src/filter/mediawiki.ott)) diff --git a/xsltml/ExternalPackage_xsltml.mk b/xsltml/ExternalPackage_xsltml.mk deleted file mode 100644 index bac40f1..0000000 --- a/xsltml/ExternalPackage_xsltml.mk +++ /dev/null @@ -1,22 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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/. -# - -$(eval $(call gb_ExternalPackage_ExternalPackage,xsltml_xsl,xsltml)) - -$(eval $(call gb_ExternalPackage_add_unpacked_files,xsltml_xsl,bin/xslt/export/xsltml,\ - entities.xsl \ - glayout.xsl \ - mmltex.xsl \ - cmarkup.xsl \ - scripts.xsl \ - tables.xsl \ - tokens.xsl \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/xsltml/Module_xsltml.mk b/xsltml/Module_xsltml.mk index 2f2bd12..09877a7 100644 --- a/xsltml/Module_xsltml.mk +++ b/xsltml/Module_xsltml.mk @@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,xsltml)) ifeq ($(ENABLE_MEDIAWIKI),TRUE) $(eval $(call gb_Module_add_targets,xsltml,\ - ExternalPackage_xsltml \ UnpackedTarball_xsltml \ )) commit b96913f2ec75687eb055e17db5c979660216914a Author: Michael Stahl <mst...@redhat.com> Date: Thu Oct 24 14:40:35 2013 +0200 extras: deliver wordbook to INSTDIR Change-Id: I36ed8f8a83938674b7b21dc1930dc1cac11ad76f diff --git a/extras/Package_wordbook.mk b/extras/Package_wordbook.mk index dc79fa8..682c5ae 100644 --- a/extras/Package_wordbook.mk +++ b/extras/Package_wordbook.mk @@ -9,7 +9,9 @@ $(eval $(call gb_Package_Package,extras_wordbook,$(SRCDIR)/extras/source/wordbook)) -$(eval $(call gb_Package_add_files,extras_wordbook,pck,\ +$(eval $(call gb_Package_set_outdir,extras_wordbook,$(INSTROOT))) + +$(eval $(call gb_Package_add_files,extras_wordbook,share/wordbook,\ en-GB.dic \ en-US.dic \ sl.dic \ commit 86299473eb3fc0c6ff036443e11d6e0b4ec6d408 Author: Michael Stahl <mst...@redhat.com> Date: Thu Oct 24 14:13:00 2013 +0200 sysui: deliver .desktop files to INSTDIR Change-Id: Ie8cff1b77145cdec2b4cb5650987809d097a71cd diff --git a/sysui/Package_share.mk b/sysui/Package_share.mk index ce1d32a..11122b4 100644 --- a/sysui/Package_share.mk +++ b/sysui/Package_share.mk @@ -9,7 +9,9 @@ $(eval $(call gb_Package_Package,share,$(share_WORKDIR)/libreoffice)) -$(eval $(call gb_Package_add_files,share,pck,\ +$(eval $(call gb_Package_set_outdir,share,$(INSTROOT))) + +$(eval $(call gb_Package_add_files,share,share/xdg,\ $(addsuffix .desktop,$(LAUNCHERLIST)) \ )) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits