From 2b4fd2c89a38ccac13c72f2e94501a8702e7da4b Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Tue, 6 Nov 2012 12:12:33 +0000 Subject: 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. --- officecfg/Configuration_officecfg.mk | 1 + .../openoffice/Office/ExtensionDependencies.xcu | 122 +++++++++++++++++++++ officecfg/registry/files.mk | 1 + .../openoffice/Office/ExtensionDependencies.xcs | 44 ++++++++ 4 files changed, 168 insertions(+) create mode 100644 officecfg/registry/data/org/openoffice/Office/ExtensionDependencies.xcu create mode 100644 officecfg/registry/schema/org/openoffice/Office/ExtensionDependencies.xcs (limited to 'officecfg') 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 @@ + + + + + + + + + 1.0.0 + + + + <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> + + + + + + 1.0 + + + + <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> + + + + + + 1.0 + 1.0.1 + 1.0.2 + 1.0.3 + + + + <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> + + + + + + 1.0 + 1.0.1 + 1.0.2 + 1.0.3 + + + + <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> + + + + + + 1.0 + 1.0.1 + 1.0.2 + 1.0.3 + + + + <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> + + + + + + 1.0 + 1.0.1 + 1.0.2 + 1.0.3 + + + + <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> + + + + + + 1.0 + 1.0.1 + 1.0.2 + 1.0.3 + + + + <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> + + + + + + 1.0 + 1.0.1 + 1.0.2 + 1.0.3 + + + + <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> + + + + \ 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 @@ + + + + + JSC + Contains a list of extensions with additonal dependencies to overrule missing dependencies in extensions + or to control specific extensions in general. + + + + Describes the additonal meta data for an extension whereas the node name have to be the extension identifier. + + Specifies a list of extension versions for which the extra dependecies should be active. + + + Specifies a list of platforms for which the extra dependencies mechanism is active. + + + Specifies a list of additonal dependencies. + + + + + + Specifies the list of extensions with extra dependecies. + + + -- cgit v1.2.3