officecfg/util/sanity.xsl | 77 ----------------------------------------- solenv/gbuild/Configuration.mk | 7 --- 2 files changed, 1 insertion(+), 83 deletions(-)
New commits: commit 014336cc67710dd84a8e4caf3372773826be056f Author: Stephan Bergmann <[email protected]> AuthorDate: Thu Jul 20 13:12:07 2023 +0200 Commit: Stephan Bergmann <[email protected]> CommitDate: Fri Jul 21 08:16:16 2023 +0200 Remove officecfg/util/sanity.xsl check of no value .xcs <desc> is merely glorified comment syntax by now, and the check had caused unnecessary grief in 3c41b32562d5ccdd306000484c5b16245b2b4a4f "tdf#156308: Restore use of /org.openoffice.Office.Recovery/AutoSave" Change-Id: I1c44836e497e4066766033ffac9b9c39a8f007be Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154672 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/officecfg/util/sanity.xsl b/officecfg/util/sanity.xsl deleted file mode 100644 index 6dd3e9ddf1dd..000000000000 --- a/officecfg/util/sanity.xsl +++ /dev/null @@ -1,77 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<!-- - * 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 . ---> -<xsl:transform xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:xs="http://www.w3.org/2001/XMLSchema"; - xmlns:oor="http://openoffice.org/2001/registry"; - version="1.0"> - -<xsl:output method="text" indent="no" encoding="ISO-8859-1"/> - -<xsl:namespace-alias stylesheet-prefix="xs" result-prefix="xs"></xsl:namespace-alias> - - <!-- match root --> - <xsl:template match="/"> - <xsl:apply-templates/> - </xsl:template> - - <!-- match all elements that could possibly contain info/desc elements --> - <xsl:template match="group|set|node-ref|prop|enumeration|length|minLength|maxLength|minInclusive|maxInclusive|minExclusive|maxExclusive|whiteSpace"> - - <xsl:if test="(1>string-length(info/desc)) and (not(info/deprecated))"> - <!-- print TPF's path to current node --> - <xsl:message terminate="yes"> - - <!-- print linefeed --> - <xsl:text> </xsl:text> - <xsl:text>ERROR: No info/desc element specified or string length of info/desc element is 0.</xsl:text> - <xsl:text> </xsl:text> - <xsl:text> There has to be a reasonable description to be specified for any item.</xsl:text> - <xsl:text> </xsl:text> - - <xsl:text> - path: </xsl:text> - <xsl:for-each select="ancestor-or-self::*"><xsl:text>/</xsl:text> - <xsl:value-of select="local-name(.)"/> - <xsl:choose> - <xsl:when test="@oor:name">[<xsl:value-of select="@oor:name"/>]</xsl:when> - <xsl:when test="@oor:value">[<xsl:value-of select="@oor:value"/>]</xsl:when> - </xsl:choose> - </xsl:for-each> - - <xsl:text> </xsl:text> - <xsl:text> - author: </xsl:text> - - <xsl:for-each select="ancestor-or-self::*"> - <!-- print element name --> - <xsl:if test="info/author"> - <!-- print arrow --> - <xsl:text>-></xsl:text> - <xsl:value-of select="info/author"/> - </xsl:if> - </xsl:for-each> - - </xsl:message> - - </xsl:if> - - <xsl:apply-templates/> - - </xsl:template> - -</xsl:transform> diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk index 67bea78d8b35..03f0f3ec3713 100644 --- a/solenv/gbuild/Configuration.mk +++ b/solenv/gbuild/Configuration.mk @@ -64,7 +64,6 @@ endef gb_Configuration_LANGS := en-US $(filter-out en-US,$(gb_WITH_LANG)) gb_XcsTarget_XSLT_SchemaVal := $(SRCDIR)/officecfg/util/schema_val.xsl -gb_XcsTarget_XSLT_Sanity := $(SRCDIR)/officecfg/util/sanity.xsl gb_XcsTarget_XSLT_SchemaTrim := $(SRCDIR)/officecfg/util/schema_trim.xsl gb_XcsTarget_DTD_Schema := $(SRCDIR)/officecfg/registry/component-schema.dtd @@ -78,10 +77,6 @@ $(call gb_Helper_abbreviate_dirs,\ $(gb_Configuration__stringparam_schemaRoot) \ $(gb_XcsTarget_XSLT_SchemaVal) \ $(3) && \ - $(gb_Configuration_XSLTCOMMAND) --nonet \ - --noout \ - $(gb_XcsTarget_XSLT_Sanity) \ - $(3) && \ $(gb_Configuration_XSLTCOMMAND) --nonet \ -o $(1) \ --stringparam LIBO_SHARE_FOLDER $(LIBO_SHARE_FOLDER) \ @@ -91,7 +86,7 @@ $(call gb_Helper_abbreviate_dirs,\ endef $(call gb_XcsTarget_get_target,%) : \ - $(gb_XcsTarget_XSLT_SchemaVal) $(gb_XcsTarget_XSLT_Sanity) \ + $(gb_XcsTarget_XSLT_SchemaVal) \ $(gb_XcsTarget_XSLT_SchemaTrim) $(gb_XcsTarget_DTD_Schema) \ | $(gb_Configuration_XSLTCOMMAND_DEPS) $(call gb_Output_announce,$*,$(true),XCS,1)
