Fix local help content not visible in Atmel Studio 7 (thanks to Morten Olsen).

pull/1469/head
Dean Camera 9 years ago
parent 903fa4a500
commit f2af532481

@ -13,8 +13,8 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0"> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0">
<xsl:output method="xml" omit-xml-declaration="yes"/> <xsl:output method="xml" omit-xml-declaration="yes"/>
<!-- Need to input the LUFA extension version for later use --> <!-- Need to input the LUFA help package filename for later use -->
<xsl:param name="extension-version"/> <xsl:param name="help-package-filename"/>
<!-- Recursively match and copy/process all nodes/attributes --> <!-- Recursively match and copy/process all nodes/attributes -->
<xsl:template match="node()"> <xsl:template match="node()">
@ -29,9 +29,7 @@
<xsl:copy> <xsl:copy>
<xsl:copy-of select="@class"/> <xsl:copy-of select="@class"/>
<xsl:text>lufa_help_</xsl:text> <xsl:value-of select="$help-package-filename"/>
<xsl:value-of select="$extension-version"/>
<xsl:text>.mshc</xsl:text>
</xsl:copy> </xsl:copy>
</xsl:template> </xsl:template>
@ -40,14 +38,10 @@
<xsl:copy-of select="@class"/> <xsl:copy-of select="@class"/>
<xsl:attribute name="href"> <xsl:attribute name="href">
<xsl:text>lufa_help_</xsl:text> <xsl:value-of select="$help-package-filename"/>
<xsl:value-of select="$extension-version"/>
<xsl:text>.mshc</xsl:text>
</xsl:attribute> </xsl:attribute>
<xsl:text>lufa_help_</xsl:text> <xsl:value-of select="$help-package-filename"/>
<xsl:value-of select="$extension-version"/>
<xsl:text>.mshc</xsl:text>
</xsl:copy> </xsl:copy>
</xsl:template> </xsl:template>
</xsl:stylesheet> </xsl:stylesheet>

@ -27,7 +27,7 @@ DOXYGEN_COMBINED_XML := $(LUFA_ROOT)/Documentation/xml/lufa_doc.xml
TEMP_MANIFEST_XML := manifest.xml TEMP_MANIFEST_XML := manifest.xml
EXTENSION_OUTPUT_XML := $(LUFA_ROOT)/../extension.xml EXTENSION_OUTPUT_XML := $(LUFA_ROOT)/../extension.xml
MODULE_OUTPUT_XML := $(LUFA_ROOT)/asf.xml MODULE_OUTPUT_XML := $(LUFA_ROOT)/asf.xml
MSHELP_OUTPUT_XML := $(LUFA_ROOT)/../lufa_help_$(EXT_VERSION_NUM).mshc MSHELP_OUTPUT_XML := $(LUFA_ROOT)/../lufa_help_$(subst .,_,$(EXT_VERSION_NUM)).mshc
XML_FILES := $(filter-out $(TEMP_MANIFEST_FILE), $(shell ls *.xml)) XML_FILES := $(filter-out $(TEMP_MANIFEST_FILE), $(shell ls *.xml))
VSIX_ASSETS := $(LUFA_ROOT)/DoxygenPages/Images/LUFA_thumb.png \ VSIX_ASSETS := $(LUFA_ROOT)/DoxygenPages/Images/LUFA_thumb.png \
$(LUFA_ROOT)/DoxygenPages/Images/LUFA.png \ $(LUFA_ROOT)/DoxygenPages/Images/LUFA.png \
@ -36,7 +36,8 @@ VSIX_ASSETS := $(LUFA_ROOT)/DoxygenPages/Images/LUFA_thumb.png \
VSIX/LUFA.dll \ VSIX/LUFA.dll \
VSIX/LUFA.pkgdef VSIX/LUFA.pkgdef
VSIX_GEN_PARAMS := --stringparam extension-version "$(EXT_VERSION_NUM)" \ VSIX_GEN_PARAMS := --stringparam extension-version "$(EXT_VERSION_NUM)" \
--stringparam lufa-version "$(LUFA_VERSION_NUM)" --stringparam lufa-version "$(LUFA_VERSION_NUM)" \
--stringparam help-package-filename "$(notdir $(MSHELP_OUTPUT_XML))"
MSHELP_GEN_PARAMS := --stringparam generate.toc "book toc" \ MSHELP_GEN_PARAMS := --stringparam generate.toc "book toc" \
--stringparam chunk.quietly "1" \ --stringparam chunk.quietly "1" \
--stringparam chunk.section.depth "3" \ --stringparam chunk.section.depth "3" \

Loading…
Cancel
Save