diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-11-06 12:12:33 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-11-12 11:46:43 +0000 |
| commit | 2b4fd2c89a38ccac13c72f2e94501a8702e7da4b (patch) | |
| tree | 8d1da4778021a1e753ca4d01d7cc8ff2e21b0d5d /officecfg | |
| parent | 08894f7c7def58431be699c3e59ef7bbc0c725a4 (diff) | |
re-base on ALv2 code. Includes:
Patches contributed by Pedro Giffuni:
Avoid some uses of non portable #!/bin/bash in shell scripts.
http://svn.apache.org/viewvc?view=revision&revision=1235297
Reduce the dependencies on non standard GNU copy.
http://svn.apache.org/viewvc?view=revision&revision=1238684
Correct /usr/bin/env path.
http://svn.apache.org/viewvc?view=revision&revision=1235619
Complex Toolbar Controls Extension from the SDK
Patches contributed by Ariel Constenla-Haile
http://svn.apache.org/viewvc?view=revision&revision=1190390
i118615 - make epm more verbose
http://svn.apache.org/viewvc?view=revision&revision=1204288
Patches contributed by Mathias Bauer (and others)
gnumake4 work variously
http://svn.apache.org/viewvc?view=revision&revision=1394707
http://svn.apache.org/viewvc?view=revision&revision=1394326
Patches contributed by Juergen Schmidt:
jsc341: i117327: take care if no dependency node in current
description exists, create one
http://svn.apache.org/viewvc?view=revision&revision=1172101
jsc341: i117327: add extra extension dependency check
http://svn.apache.org/viewvc?view=revision&revision=1172098
make initial branding changes
http://svn.apache.org/viewvc?view=revision&revision=1231878
Patches contributed by Ingo Schmidt
native373: #i117733# no linux jre installation on 64 bit systems
http://svn.apache.org/viewvc?view=revision&revision=1167536
native373: ##164464# improve debian support
http://svn.apache.org/viewvc?view=revision&revision=1167537
Patch contribtued by Armin Le-Grand:
Changed various aspects concerning usages of old vendor names
http://svn.apache.org/viewvc?view=revision&revision=1293313
fix for neon webdav, remove coinmp bits, improve odk script,
cleanup & remove OS/2 conditionals, system ucpp fixes,
remove OS/2 conditionals, restore our license filenames.
Diffstat (limited to 'officecfg')
4 files changed, 168 insertions, 0 deletions
diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk index 503a0a49ae2c..7b03616a48b5 100644 --- a/officecfg/Configuration_officecfg.mk +++ b/officecfg/Configuration_officecfg.mk @@ -32,6 +32,7 @@ $(eval $(call gb_Configuration_add_datas,registry,officecfg/registry/data,\ org/openoffice/Office/Calc.xcu \ org/openoffice/Office/Canvas.xcu \ org/openoffice/Office/Compatibility.xcu \ + org/openoffice/Office/ExtensionDependencies.xcu \ org/openoffice/Office/ExtensionManager.xcu \ org/openoffice/Office/Impress.xcu \ org/openoffice/Office/Jobs.xcu \ diff --git a/officecfg/registry/data/org/openoffice/Office/ExtensionDependencies.xcu b/officecfg/registry/data/org/openoffice/Office/ExtensionDependencies.xcu new file mode 100644 index 000000000000..7f1280daf0ad --- /dev/null +++ b/officecfg/registry/data/org/openoffice/Office/ExtensionDependencies.xcu @@ -0,0 +1,122 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + * 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 . +--> + +<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" + oor:name="ExtensionDependencies" oor:package="org.openoffice.Office"> + <node oor:name="Extensions"> + <node oor:name="com.oracle.Office.Connector.Professional" oor:op="replace"> + <prop oor:name="Versions"> + <value> + <it>1.0.0</it> + </value> + </prop> + <prop oor:name="Dependencies"> + <value><d:dependencies xmlns:d="http://openoffice.org/extensions/description/2006"><d:OpenOffice.org-maximal-version d:name="OpenOffice.org 3.3" value="3.3"/></d:dependencies></value> + </prop> + </node> + <node oor:name="org.openoffice.bi.OracleBIConnector" oor:op="replace"> + <prop oor:name="Versions"> + <value> + <it>1.0</it> + </value> + </prop> + <prop oor:name="Dependencies"> + <value><d:dependencies xmlns:d="http://openoffice.org/extensions/description/2006"><d:OpenOffice.org-maximal-version d:name="OpenOffice.org 3.3" value="3.3"/></d:dependencies></value> + </prop> + </node> + <node oor:name="com.sun.PresenterScreen-linux_x86" oor:op="replace"> + <prop oor:name="Versions"> + <value> + <it>1.0</it> + <it>1.0.1</it> + <it>1.0.2</it> + <it>1.0.3</it> + </value> + </prop> + <prop oor:name="Dependencies"> + <value><d:dependencies xmlns:d="http://openoffice.org/extensions/description/2006"><d:OpenOffice.org-maximal-version d:name="OpenOffice.org 3.2" value="3.2"/></d:dependencies></value> + </prop> + </node> + <node oor:name="com.sun.PresenterScreen-linux_x86_64" oor:op="replace"> + <prop oor:name="Versions"> + <value> + <it>1.0</it> + <it>1.0.1</it> + <it>1.0.2</it> + <it>1.0.3</it> + </value> + </prop> + <prop oor:name="Dependencies"> + <value><d:dependencies xmlns:d="http://openoffice.org/extensions/description/2006"><d:OpenOffice.org-maximal-version d:name="OpenOffice.org 3.2" value="3.2"/></d:dependencies></value> + </prop> + </node> + <node oor:name="com.sun.PresenterScreen-macosx_x86" oor:op="replace"> + <prop oor:name="Versions"> + <value> + <it>1.0</it> + <it>1.0.1</it> + <it>1.0.2</it> + <it>1.0.3</it> + </value> + </prop> + <prop oor:name="Dependencies"> + <value><d:dependencies xmlns:d="http://openoffice.org/extensions/description/2006"><d:OpenOffice.org-maximal-version d:name="OpenOffice.org 3.2" value="3.2"/></d:dependencies></value> + </prop> + </node> + <node oor:name="com.sun.PresenterScreen-windows_x86" oor:op="replace"> + <prop oor:name="Versions"> + <value> + <it>1.0</it> + <it>1.0.1</it> + <it>1.0.2</it> + <it>1.0.3</it> + </value> + </prop> + <prop oor:name="Dependencies"> + <value><d:dependencies xmlns:d="http://openoffice.org/extensions/description/2006"><d:OpenOffice.org-maximal-version d:name="OpenOffice.org 3.2" value="3.2"/></d:dependencies></value> + </prop> + </node> + <node oor:name="com.sun.PresenterScreen-solaris_x86" oor:op="replace"> + <prop oor:name="Versions"> + <value> + <it>1.0</it> + <it>1.0.1</it> + <it>1.0.2</it> + <it>1.0.3</it> + </value> + </prop> + <prop oor:name="Dependencies"> + <value><d:dependencies xmlns:d="http://openoffice.org/extensions/description/2006"><d:OpenOffice.org-maximal-version d:name="OpenOffice.org 3.2" value="3.2"/></d:dependencies></value> + </prop> + </node> + <node oor:name="com.sun.PresenterScreen-solaris_sparc" oor:op="replace"> + <prop oor:name="Versions"> + <value> + <it>1.0</it> + <it>1.0.1</it> + <it>1.0.2</it> + <it>1.0.3</it> + </value> + </prop> + <prop oor:name="Dependencies"> + <value><d:dependencies xmlns:d="http://openoffice.org/extensions/description/2006"><d:OpenOffice.org-maximal-version d:name="OpenOffice.org 3.2" value="3.2"/></d:dependencies></value> + </prop> + </node> + </node> +</oor:component-data>
\ No newline at end of file diff --git a/officecfg/registry/files.mk b/officecfg/registry/files.mk index 8501acb26cdd..4bb801549133 100644 --- a/officecfg/registry/files.mk +++ b/officecfg/registry/files.mk @@ -18,6 +18,7 @@ officecfg_XCSFILES := \ Office/Embedding \ Office/Events \ Office/ExtendedColorScheme \ + Office/ExtensionDependencies \ Office/ExtensionManager \ Office/FormWizard \ Office/Histories \ diff --git a/officecfg/registry/schema/org/openoffice/Office/ExtensionDependencies.xcs b/officecfg/registry/schema/org/openoffice/Office/ExtensionDependencies.xcs new file mode 100644 index 000000000000..bef17bb17297 --- /dev/null +++ b/officecfg/registry/schema/org/openoffice/Office/ExtensionDependencies.xcs @@ -0,0 +1,44 @@ +<!DOCTYPE oor:component-schema SYSTEM "../../../../component-schema.dtd"> +<!-- + * 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 . +--> +<oor:component-schema oor:name="ExtensionDependencies" oor:package="org.openoffice.Office" xml:lang="en-US" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <info> + <author>JSC</author> + <desc>Contains a list of extensions with additonal dependencies to overrule missing dependencies in extensions + or to control specific extensions in general.</desc> + </info> + <templates> + <group oor:name="Extension"> + <info><desc>Describes the additonal meta data for an extension whereas the node name have to be the extension identifier.</desc></info> + <prop oor:name="Versions" oor:type="oor:string-list" oor:localized="false"> + <info><desc>Specifies a list of extension versions for which the extra dependecies should be active.</desc></info> + </prop> + <prop oor:name="Platforms" oor:type="oor:string-list" oor:localized="false"> + <info><desc>Specifies a list of platforms for which the extra dependencies mechanism is active.</desc></info> + </prop> + <prop oor:name="Dependencies" oor:type="xs:string" oor:localized="false"> + <info><desc>Specifies a list of additonal dependencies.</desc></info> + </prop> + </group> + </templates> + <component> + <set oor:name="Extensions" oor:node-type="Extension"> + <info><desc>Specifies the list of extensions with extra dependecies.</desc></info> + </set> + </component> +</oor:component-schema> |