Revert "take out @PLATFORM@ from extension ID"

This reverts commit 21a82f4f91eb9940e5dd01c75e2f68721a431f09.

7 files changed, 48 insertions, 6 deletions

diff --git a/sdext/CustomTarget_presenter.mk b/sdext/CustomTarget_presenter.mk
new file mode 100644
index 000000000000..afecd49f763a
--- /dev/null
+++ b/sdext/CustomTarget_presenter.mk
@@ -0,0 +1,41 @@
+# -*- 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 771f8d6f178c..66f93a8f2a81 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,$(SRCDIR)/sdext/source/presenter/help/en-US,com.sun.PresenterScreen/presenter.xhp,com.sun.PresenterScreen/presenter.xhp))
+$(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_helptreefile,presenter-screen,$(SRCDIR)/sdext/source/presenter/help/en-US,/help.tree,com.sun.PresenterScreen/help.tree,com.sun.PresenterScreen))
+$(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)))
 
 
 
diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk
index 0ab6444d1a3a..7bba9d936232 100644
--- a/sdext/Module_sdext.mk
+++ b/sdext/Module_sdext.mk
@@ -56,6 +56,7 @@ 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 2ef926854bbe..f071a0622ecf 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"/>
+    <identifier value="com.sun.star.PresentationMinimizer-@PLATFORM@"/>
 
     <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 893f62a8cd06..08160046f0fd 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" />
+    <identifier value="com.sun.star.PDFImport-@PLATFORM@" />
 
     <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 8be0767c95e7..be71e449113f 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" />
+  <identifier value="com.sun.PresenterScreen-@PLATFORM@" />
 
   <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 c57997175a92..1c07357eac78 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/presenter.xhp</filename>
+         <filename>/com.sun.PresenterScreen-PLATFORMID/presenter.xhp</filename>
       </topic>
    </meta>
    <body>