mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

take out @PLATFORM@ from extension ID

Browse Source 
There is <platform> tag for that in description.xml...
It just caused complications, e.g. in help.tree.

Change-Id: Iee51fc62f314972d8cc08b63c0c8dc2ab8dd8f16
This commit is contained in:
Andras Timar
2012-09-25 14:39:41 +02:00
parent fc6351f5d3
commit 21a82f4f91
7 changed files with 6 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
sdext/CustomTarget_presenter.mk
View File

@@ -1,41 +0,0 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License or as specified alternatively below. You may obtain a copy of
# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# Major Contributor(s):
# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
# (initial developer)
#
# All Rights Reserved.
#
# For minor contributions see the git repository.
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
$(eval $(call gb_CustomTarget_CustomTarget,sdext/source/presenter/help/en-US/com.sun.PresenterScreen))
$(call gb_CustomTarget_get_target,sdext/source/presenter/help/en-US/com.sun.PresenterScreen) : \
$(call gb_CustomTarget_get_workdir,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)/presenter.xhp
include $(SRCDIR)/sdext/platform.mk
$(call gb_CustomTarget_get_workdir,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)/presenter.xhp : \
$(SRCDIR)/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp \
| $(call gb_CustomTarget_get_workdir,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1)
sed "s/PLATFORMID/$(sdext_PLATFORM)/" < $< > $@
# vim:set shiftwidth=4 tabstop=4 noexpandtab:

4
sdext/Extension_presenter.mk
View File

@@ -141,9 +141,9 @@ $(eval $(call gb_Extension_add_files,presenter-screen,registry/data/org/openoffi
$(call gb_XcuDataTarget_get_target,sdext/source/presenter/registry/data/org/openoffice/Office/ProtocolHandler.xcu) \
))
$(eval $(call gb_Extension_add_helpfile,presenter-screen,$(WORKDIR)/CustomTarget/sdext/source/presenter/help/en-US,com.sun.PresenterScreen-$(sdext_PLATFORM)/presenter.xhp,com.sun.PresenterScreen/presenter.xhp))
$(eval $(call gb_Extension_add_helpfile,presenter-screen,$(SRCDIR)/sdext/source/presenter/help/en-US,com.sun.PresenterScreen/presenter.xhp,com.sun.PresenterScreen/presenter.xhp))
$(eval $(call gb_Extension_add_helptreefile,presenter-screen,$(SRCDIR)/sdext/source/presenter/help/en-US,/help.tree,com.sun.PresenterScreen/help.tree,com.sun.PresenterScreen-$(sdext_PLATFORM)))
$(eval $(call gb_Extension_add_helptreefile,presenter-screen,$(SRCDIR)/sdext/source/presenter/help/en-US,/help.tree,com.sun.PresenterScreen/help.tree,com.sun.PresenterScreen))

1
sdext/Module_sdext.mk
View File

@@ -56,7 +56,6 @@ endif
ifeq ($(ENABLE_PRESENTER_SCREEN),YES)
$(eval $(call gb_Module_add_targets,sdext,\
Configuration_presenter \
CustomTarget_presenter \
Extension_presenter \
Library_presenter \
Rdb_presenter \

2
sdext/source/minimizer/description.xml
View File

@@ -5,7 +5,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:dep="http://openoffice.org/extensions/description/2006">
<identifier value="com.sun.star.PresentationMinimizer-@PLATFORM@"/>
<identifier value="com.sun.star.PresentationMinimizer"/>
<dependencies>
<OpenOffice.org-minimal-version value="2.3" dep:name="OpenOffice.org 2.3"/>

2
sdext/source/pdfimport/description.xml
View File

@@ -4,7 +4,7 @@
xmlns="http://openoffice.org/extensions/description/2006"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:dep="http://openoffice.org/extensions/description/2006">
<identifier value="com.sun.star.PDFImport-@PLATFORM@" />
<identifier value="com.sun.star.PDFImport" />
<dependencies>
<OpenOffice.org-minimal-version value="3.0" dep:name="OpenOffice.org 3.0"/>

2
sdext/source/presenter/description.xml
View File

@@ -5,7 +5,7 @@
xmlns:dep="http://openoffice.org/extensions/description/2006"
xmlns:xlink="http://www.w3.org/1999/xlink">
<identifier value="com.sun.PresenterScreen-@PLATFORM@" />
<identifier value="com.sun.PresenterScreen" />
<dependencies>
<OpenOffice.org-minimal-version value="3.3" dep:name="OpenOffice.org 3.3"/>

2
sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp
View File

@@ -34,7 +34,7 @@
<meta>
<topic id="textpresenterxml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit" l10n="NEW">Presenter Console Keyboard Shortcuts</title>
<filename>/com.sun.PresenterScreen-PLATFORMID/presenter.xhp</filename>
<filename>/com.sun.PresenterScreen/presenter.xhp</filename>
</topic>
</meta>
<body>