summaryrefslogtreecommitdiff
path: root/sdext
diff options
context:
space:
mode:
authorAndras Timar <atimar@suse.com>2012-09-25 14:39:41 +0200
committerAndras Timar <atimar@suse.com>2012-09-25 21:23:38 +0200
commit21a82f4f91eb9940e5dd01c75e2f68721a431f09 (patch)
tree177aafcd1908100850ed0826a229c003d8aebf67 /sdext
parentfc6351f5d36f8b6be5e52a2ea1f191de81eacc71 (diff)
take out @PLATFORM@ from extension ID
There is <platform> tag for that in description.xml... It just caused complications, e.g. in help.tree. Change-Id: Iee51fc62f314972d8cc08b63c0c8dc2ab8dd8f16
Diffstat (limited to 'sdext')
-rw-r--r--sdext/CustomTarget_presenter.mk41
-rw-r--r--sdext/Extension_presenter.mk4
-rw-r--r--sdext/Module_sdext.mk1
-rw-r--r--sdext/source/minimizer/description.xml2
-rw-r--r--sdext/source/pdfimport/description.xml2
-rw-r--r--sdext/source/presenter/description.xml2
-rw-r--r--sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp2
7 files changed, 6 insertions, 48 deletions
diff --git a/sdext/CustomTarget_presenter.mk b/sdext/CustomTarget_presenter.mk
deleted file mode 100644
index afecd49f763a..000000000000
--- a/sdext/CustomTarget_presenter.mk
+++ /dev/null
@@ -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:
diff --git a/sdext/Extension_presenter.mk b/sdext/Extension_presenter.mk
index 66f93a8f2a81..771f8d6f178c 100644
--- a/sdext/Extension_presenter.mk
+++ b/sdext/Extension_presenter.mk
@@ -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))
diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk
index 7bba9d936232..0ab6444d1a3a 100644
--- a/sdext/Module_sdext.mk
+++ b/sdext/Module_sdext.mk
@@ -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 \
diff --git a/sdext/source/minimizer/description.xml b/sdext/source/minimizer/description.xml
index f071a0622ecf..2ef926854bbe 100644
--- a/sdext/source/minimizer/description.xml
+++ b/sdext/source/minimizer/description.xml
@@ -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"/>
diff --git a/sdext/source/pdfimport/description.xml b/sdext/source/pdfimport/description.xml
index 08160046f0fd..893f62a8cd06 100644
--- a/sdext/source/pdfimport/description.xml
+++ b/sdext/source/pdfimport/description.xml
@@ -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"/>
diff --git a/sdext/source/presenter/description.xml b/sdext/source/presenter/description.xml
index be71e449113f..8be0767c95e7 100644
--- a/sdext/source/presenter/description.xml
+++ b/sdext/source/presenter/description.xml
@@ -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"/>
diff --git a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp b/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp
index 1c07357eac78..c57997175a92 100644
--- a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp
+++ b/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp
@@ -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>