Skip to content

C
core
Kaydet (Commit) fa2801f2 authored tarafından Tor Lillqvist's avatar Tor Lillqvist
Dosyalara gözat
Seçenekler

Handle LIBO_SHARE_HELP_FOLDER 

Change-Id: I4f004321c58da1d81a2cc3c80504347db583d86a
üst 52803dca
Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 13 deletions
officecfg/registry/data/org/openoffice/Office/Paths.xcu
Dosyayı görüntüle @ fa2801f2
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
</node> </node>
<node oor:name="Help" oor:op="fuse" oor:mandatory="true"> <node oor:name="Help" oor:op="fuse" oor:mandatory="true">
<node oor:name="InternalPaths"> <node oor:name="InternalPaths">
<node oor:name="$(instpath)/help" oor:op="fuse"/> <node oor:name="$(instpath)/@LIBO_SHARE_HELP_FOLDER@" oor:op="fuse"/>
</node> </node>
</node> </node>
<node oor:name="Linguistic" oor:op="fuse" oor:mandatory="true"> <node oor:name="Linguistic" oor:op="fuse" oor:mandatory="true">
......
officecfg/registry/schema/org/openoffice/Office/Common.xcs
Dosyayı görüntüle @ fa2801f2
...@@ -1652,7 +1652,7 @@ ...@@ -1652,7 +1652,7 @@
<info> <info>
<desc>Specifies the path to the Office help files.</desc> <desc>Specifies the path to the Office help files.</desc>
</info> </info>
<value>$(instpath)/help</value> <value>$(instpath)/@LIBO_SHARE_HELP_FOLDER@</value>
</prop> </prop>
<prop oor:name="Linguistic" oor:type="xs:string" oor:nillable="false"> <prop oor:name="Linguistic" oor:type="xs:string" oor:nillable="false">
<info> <info>
...@@ -1847,7 +1847,7 @@ ...@@ -1847,7 +1847,7 @@
<desc>Specifies the default directory where Office help files are <desc>Specifies the default directory where Office help files are
located.</desc> located.</desc>
</info> </info>
<value>$(instpath)/help</value> <value>$(instpath)/@LIBO_SHARE_HELP_FOLDER@</value>
</prop> </prop>
<prop oor:name="Linguistic" oor:type="xs:string" oor:nillable="false"> <prop oor:name="Linguistic" oor:type="xs:string" oor:nillable="false">
<info> <info>
......
officecfg/util/alllang.xsl
Dosyayı görüntüle @ fa2801f2
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
<xsl:param name="fallback-locale">en-US</xsl:param> <xsl:param name="fallback-locale">en-US</xsl:param>
<xsl:param name="LIBO_SHARE_FOLDER"/> <xsl:param name="LIBO_SHARE_FOLDER"/>
<xsl:param name="LIBO_SHARE_HELP_FOLDER"/>
<xsl:variable name="schemaRootURL"> <xsl:variable name="schemaRootURL">
<xsl:value-of select="$schemaRoot"/> <xsl:value-of select="$schemaRoot"/>
...@@ -341,19 +342,23 @@ ...@@ -341,19 +342,23 @@
<xsl:template match="@oor:name"> <xsl:template match="@oor:name">
<xsl:attribute name="oor:name"> <xsl:attribute name="oor:name">
<xsl:call-template name="replace"> <xsl:call-template name="replacetwo">
<xsl:with-param name="input" select="current()"/> <xsl:with-param name="input" select="current()"/>
<xsl:with-param name="pattern" select="'@LIBO_SHARE_FOLDER@'"/> <xsl:with-param name="pattern1" select="'@LIBO_SHARE_FOLDER@'"/>
<xsl:with-param name="replace" select="$LIBO_SHARE_FOLDER"/> <xsl:with-param name="replace1" select="$LIBO_SHARE_FOLDER"/>
<xsl:with-param name="pattern2" select="'@LIBO_SHARE_HELP_FOLDER@'"/>
<xsl:with-param name="replace2" select="$LIBO_SHARE_HELP_FOLDER"/>
</xsl:call-template> </xsl:call-template>
</xsl:attribute> </xsl:attribute>
</xsl:template> </xsl:template>
<xsl:template match="text()"> <xsl:template match="text()">
<xsl:call-template name="replace"> <xsl:call-template name="replacetwo">
<xsl:with-param name="input" select="current()"/> <xsl:with-param name="input" select="current()"/>
<xsl:with-param name="pattern" select="'@LIBO_SHARE_FOLDER@'"/> <xsl:with-param name="pattern1" select="'@LIBO_SHARE_FOLDER@'"/>
<xsl:with-param name="replace" select="$LIBO_SHARE_FOLDER"/> <xsl:with-param name="replace1" select="$LIBO_SHARE_FOLDER"/>
<xsl:with-param name="pattern2" select="'@LIBO_SHARE_HELP_FOLDER@'"/>
<xsl:with-param name="replace2" select="$LIBO_SHARE_HELP_FOLDER"/>
</xsl:call-template> </xsl:call-template>
</xsl:template> </xsl:template>
...@@ -378,4 +383,39 @@ ...@@ -378,4 +383,39 @@
</xsl:choose> </xsl:choose>
</xsl:template> </xsl:template>
<xsl:template name="replacetwo">
<xsl:param name="input"/>
<xsl:param name="pattern1"/>
<xsl:param name="replace1"/>
<xsl:param name="pattern2"/>
<xsl:param name="replace2"/>
<xsl:choose>
<xsl:when test="contains($input, $pattern1)">
<xsl:call-template name="replace">
<xsl:with-param
name="input" select="substring-before($input, $pattern1)"/>
<xsl:with-param name="pattern" select="$pattern2"/>
<xsl:with-param name="replace" select="$replace2"/>
</xsl:call-template>
<xsl:value-of select="$replace1"/>
<xsl:call-template name="replacetwo">
<xsl:with-param
name="input" select="substring-after($input, $pattern1)"/>
<xsl:with-param name="pattern1" select="$pattern1"/>
<xsl:with-param name="replace1" select="$replace1"/>
<xsl:with-param name="pattern2" select="$pattern2"/>
<xsl:with-param name="replace2" select="$replace2"/>
</xsl:call-template>
</xsl:when>
<xsl:otherwise>
<xsl:call-template name="replace">
<xsl:with-param
name="input" select="$input"/>
<xsl:with-param name="pattern" select="$pattern2"/>
<xsl:with-param name="replace" select="$replace2"/>
</xsl:call-template>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
</xsl:transform> </xsl:transform>
officecfg/util/schema_trim.xsl
Dosyayı görüntüle @ fa2801f2
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
version="1.0"> version="1.0">
<xsl:param name="LIBO_SHARE_FOLDER"/> <xsl:param name="LIBO_SHARE_FOLDER"/>
<xsl:param name="LIBO_SHARE_HELP_FOLDER"/>
<!-- Get the correct format --> <!-- Get the correct format -->
<xsl:output method="xml" indent="yes"/> <xsl:output method="xml" indent="yes"/>
...@@ -81,10 +82,12 @@ ...@@ -81,10 +82,12 @@
</xsl:template> </xsl:template>
<xsl:template match="text()"> <xsl:template match="text()">
<xsl:call-template name="replace"> <xsl:call-template name="replacetwo">
<xsl:with-param name="input" select="current()"/> <xsl:with-param name="input" select="current()"/>
<xsl:with-param name="pattern" select="'@LIBO_SHARE_FOLDER@'"/> <xsl:with-param name="pattern1" select="'@LIBO_SHARE_FOLDER@'"/>
<xsl:with-param name="replace" select="$LIBO_SHARE_FOLDER"/> <xsl:with-param name="replace1" select="$LIBO_SHARE_FOLDER"/>
<xsl:with-param name="pattern2" select="'@LIBO_SHARE_HELP_FOLDER@'"/>
<xsl:with-param name="replace2" select="$LIBO_SHARE_HELP_FOLDER"/>
</xsl:call-template> </xsl:call-template>
</xsl:template> </xsl:template>
...@@ -109,4 +112,39 @@ ...@@ -109,4 +112,39 @@
</xsl:choose> </xsl:choose>
</xsl:template> </xsl:template>
<xsl:template name="replacetwo">
<xsl:param name="input"/>
<xsl:param name="pattern1"/>
<xsl:param name="replace1"/>
<xsl:param name="pattern2"/>
<xsl:param name="replace2"/>
<xsl:choose>
<xsl:when test="contains($input, $pattern1)">
<xsl:call-template name="replace">
<xsl:with-param
name="input" select="substring-before($input, $pattern1)"/>
<xsl:with-param name="pattern" select="$pattern2"/>
<xsl:with-param name="replace" select="$replace2"/>
</xsl:call-template>
<xsl:value-of select="$replace1"/>
<xsl:call-template name="replacetwo">
<xsl:with-param
name="input" select="substring-after($input, $pattern1)"/>
<xsl:with-param name="pattern1" select="$pattern1"/>
<xsl:with-param name="replace1" select="$replace1"/>
<xsl:with-param name="pattern2" select="$pattern2"/>
<xsl:with-param name="replace2" select="$replace2"/>
</xsl:call-template>
</xsl:when>
<xsl:otherwise>
<xsl:call-template name="replace">
<xsl:with-param
name="input" select="$input"/>
<xsl:with-param name="pattern" select="$pattern2"/>
<xsl:with-param name="replace" select="$replace2"/>
</xsl:call-template>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
</xsl:transform> </xsl:transform>
solenv/gbuild/Configuration.mk
Dosyayı görüntüle @ fa2801f2
...@@ -85,6 +85,7 @@ $(call gb_Helper_abbreviate_dirs,\ ...@@ -85,6 +85,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(gb_Configuration_XSLTCOMMAND) --nonet \ $(gb_Configuration_XSLTCOMMAND) --nonet \
-o $(1) \ -o $(1) \
--stringparam LIBO_SHARE_FOLDER $(LIBO_SHARE_FOLDER) \ --stringparam LIBO_SHARE_FOLDER $(LIBO_SHARE_FOLDER) \
--stringparam LIBO_SHARE_HELP_FOLDER $(LIBO_SHARE_HELP_FOLDER) \
$(gb_XcsTarget_XSLT_SchemaTrim) \ $(gb_XcsTarget_XSLT_SchemaTrim) \
$(3)) $(3))
endef endef
...@@ -122,6 +123,7 @@ $(call gb_Helper_abbreviate_dirs,\ ...@@ -122,6 +123,7 @@ $(call gb_Helper_abbreviate_dirs,\
--stringparam xcs $(call gb_XcsTarget_for_XcuTarget,$(XCUFILE)) \ --stringparam xcs $(call gb_XcsTarget_for_XcuTarget,$(XCUFILE)) \
$(gb_Configuration__stringparam_schemaRoot) \ $(gb_Configuration__stringparam_schemaRoot) \
--stringparam LIBO_SHARE_FOLDER $(LIBO_SHARE_FOLDER) \ --stringparam LIBO_SHARE_FOLDER $(LIBO_SHARE_FOLDER) \
--stringparam LIBO_SHARE_HELP_FOLDER $(LIBO_SHARE_HELP_FOLDER) \
--path $(SRCDIR)/officecfg/registry \ --path $(SRCDIR)/officecfg/registry \
$(gb_XcuTarget_XSLT_AllLang) \ $(gb_XcuTarget_XSLT_AllLang) \
$(3)) $(3))
...@@ -158,6 +160,7 @@ $(call gb_Helper_abbreviate_dirs,\ ...@@ -158,6 +160,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(gb_Configuration__stringparam_schemaRoot) \ $(gb_Configuration__stringparam_schemaRoot) \
--stringparam module $(notdir $(subst -,/,$(basename $(notdir $(2))))) \ --stringparam module $(notdir $(subst -,/,$(basename $(notdir $(2))))) \
--stringparam LIBO_SHARE_FOLDER $(LIBO_SHARE_FOLDER) \ --stringparam LIBO_SHARE_FOLDER $(LIBO_SHARE_FOLDER) \
--stringparam LIBO_SHARE_HELP_FOLDER $(LIBO_SHARE_HELP_FOLDER) \
$(gb_XcuTarget_XSLT_AllLang) \ $(gb_XcuTarget_XSLT_AllLang) \
$(3)) $(3))
endef endef
...@@ -255,6 +258,7 @@ $(call gb_Helper_abbreviate_dirs,\ ...@@ -255,6 +258,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(gb_Configuration__stringparam_schemaRoot) \ $(gb_Configuration__stringparam_schemaRoot) \
--stringparam locale $(word 2,$(subst /, ,$(2))) \ --stringparam locale $(word 2,$(subst /, ,$(2))) \
--stringparam LIBO_SHARE_FOLDER $(LIBO_SHARE_FOLDER) \ --stringparam LIBO_SHARE_FOLDER $(LIBO_SHARE_FOLDER) \
--stringparam LIBO_SHARE_HELP_FOLDER $(LIBO_SHARE_HELP_FOLDER) \
--path $(SRCDIR)/officecfg/registry \ --path $(SRCDIR)/officecfg/registry \
$(gb_XcuTarget_XSLT_AllLang) \ $(gb_XcuTarget_XSLT_AllLang) \
$(3)) $(3))
......
solenv/gbuild/HelpTarget.mk
Dosyayı görüntüle @ fa2801f2
...@@ -656,7 +656,7 @@ endef ...@@ -656,7 +656,7 @@ endef
# gb_HelpTarget__add_file target file # gb_HelpTarget__add_file target file
define gb_HelpTarget__add_file define gb_HelpTarget__add_file
$(call gb_Package_add_file,$(call gb_HelpTarget_get_packagename,$(1)),help/$(call gb_HelpTarget__get_lang,$(1))/$(2),$(2)) $(call gb_Package_add_file,$(call gb_HelpTarget_get_packagename,$(1)),$(LIBO_SHARE_HELP_FOLDER)/$(call gb_HelpTarget__get_lang,$(1))/$(2),$(2))
endef endef
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment