[Libreoffice-commits] .: 2 commits - sdext/CustomTarget_presenter.mk sdext/Extension_presenter.mk sdext/Module_sdext.mk sdext/source swext/mediawiki
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Sep 25 12:21:50 PDT 2012
sdext/CustomTarget_presenter.mk | 41 ----------
sdext/Extension_presenter.mk | 4
sdext/Module_sdext.mk | 1
sdext/source/minimizer/description.xml | 2
sdext/source/pdfimport/description.xml | 2
sdext/source/presenter/description.xml | 2
sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp | 2
swext/mediawiki/help/help.tree | 10 +-
8 files changed, 11 insertions(+), 53 deletions(-)
New commits:
commit 4a2503e5a6e33a0ba5d93712427d78b705c83708
Author: Andras Timar <atimar at suse.com>
Date: Tue Sep 25 16:36:07 2012 +0200
set paths in help tree file of MediaWiki extension help
we set the paths here to their runtime values, because in new
build "paradigm" English tree is not updated, just copied. No
problem with that, we'll fix regressions later. Now it works
even in en-US build, but nodes are not localized, because
update_tree.pl does not find localizations due to the changed
paths. update_tree.pl is a hack and must die. It will be killed
in feature/killsdf branch.
Change-Id: Ic16eca538182f5548d4d6c2a23f9bc9764da6b62
diff --git a/swext/mediawiki/help/help.tree b/swext/mediawiki/help/help.tree
index d258c94..ac223de 100644
--- a/swext/mediawiki/help/help.tree
+++ b/swext/mediawiki/help/help.tree
@@ -12,11 +12,11 @@
<tree_view>
<help_section application="swriter" id="02" title="MediaWiki">
<node id="0224" title="MediaWiki">
- <topic id="help/help/wiki.xhp">MediaWiki</topic>
- <topic id="help/help/wikiaccount.xhp">Wiki Publisher</topic>
- <topic id="help/help/wikiformats.xhp">MediaWiki Formats</topic>
- <topic id="help/help/wikisend.xhp">Send to MediaWiki</topic>
- <topic id="help/help/wikisettings.xhp">MediaWiki Options</topic>
+ <topic id="help/com.sun.wiki-publisher/wiki.xhp">MediaWiki</topic>
+ <topic id="help/com.sun.wiki-publisher/wikiaccount.xhp">Wiki Publisher</topic>
+ <topic id="help/com.sun.wiki-publisher/wikiformats.xhp">MediaWiki Formats</topic>
+ <topic id="help/com.sun.wiki-publisher/wikisend.xhp">Send to MediaWiki</topic>
+ <topic id="help/com.sun.wiki-publisher/wikisettings.xhp">MediaWiki Options</topic>
</node>
</help_section>
</tree_view>
commit 21a82f4f91eb9940e5dd01c75e2f68721a431f09
Author: Andras Timar <atimar at suse.com>
Date: Tue Sep 25 14:39:41 2012 +0200
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
diff --git a/sdext/CustomTarget_presenter.mk b/sdext/CustomTarget_presenter.mk
deleted file mode 100644
index afecd49..0000000
--- 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 at 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 66f93a8..771f8d6 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 7bba9d9..0ab6444 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 f071a06..2ef9268 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- at 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 0816004..893f62a 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- at 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 be71e44..8be0767 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- at 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 1c07357..c579971 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>
More information about the Libreoffice-commits
mailing list