aboutsummaryrefslogtreecommitdiffstats
path: root/LUFA
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2015-10-25 15:50:14 +1100
committerDean Camera <dean@fourwalledcubicle.com>2015-10-25 15:50:14 +1100
commitf2af532481e70596871207b86d447487b8701a38 (patch)
tree5dbd49bbfd30767071e93ee3ee179141c1575fc3 /LUFA
parent903fa4a500278286742950fd177d1784e4d85310 (diff)
downloadlufa-f2af532481e70596871207b86d447487b8701a38.tar.gz
lufa-f2af532481e70596871207b86d447487b8701a38.tar.bz2
lufa-f2af532481e70596871207b86d447487b8701a38.zip
Fix local help content not visible in Atmel Studio 7 (thanks to Morten Olsen).
Diffstat (limited to 'LUFA')
-rw-r--r--LUFA/StudioIntegration/HV1/lufa_helpcontentsetup_transform.xslt16
-rw-r--r--LUFA/StudioIntegration/makefile5
2 files changed, 8 insertions, 13 deletions
diff --git a/LUFA/StudioIntegration/HV1/lufa_helpcontentsetup_transform.xslt b/LUFA/StudioIntegration/HV1/lufa_helpcontentsetup_transform.xslt
index 8422fe294..959d9215b 100644
--- a/LUFA/StudioIntegration/HV1/lufa_helpcontentsetup_transform.xslt
+++ b/LUFA/StudioIntegration/HV1/lufa_helpcontentsetup_transform.xslt
@@ -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:output method="xml" omit-xml-declaration="yes"/>
- <!-- Need to input the LUFA extension version for later use -->
- <xsl:param name="extension-version"/>
+ <!-- Need to input the LUFA help package filename for later use -->
+ <xsl:param name="help-package-filename"/>
<!-- Recursively match and copy/process all nodes/attributes -->
<xsl:template match="node()">
@@ -29,9 +29,7 @@
<xsl:copy>
<xsl:copy-of select="@class"/>
- <xsl:text>lufa_help_</xsl:text>
- <xsl:value-of select="$extension-version"/>
- <xsl:text>.mshc</xsl:text>
+ <xsl:value-of select="$help-package-filename"/>
</xsl:copy>
</xsl:template>
@@ -40,14 +38,10 @@
<xsl:copy-of select="@class"/>
<xsl:attribute name="href">
- <xsl:text>lufa_help_</xsl:text>
- <xsl:value-of select="$extension-version"/>
- <xsl:text>.mshc</xsl:text>
+ <xsl:value-of select="$help-package-filename"/>
</xsl:attribute>
- <xsl:text>lufa_help_</xsl:text>
- <xsl:value-of select="$extension-version"/>
- <xsl:text>.mshc</xsl:text>
+ <xsl:value-of select="$help-package-filename"/>
</xsl:copy>
</xsl:template>
</xsl:stylesheet>
diff --git a/LUFA/StudioIntegration/makefile b/LUFA/StudioIntegration/makefile
index 170c53778..97813f1a8 100644
--- a/LUFA/StudioIntegration/makefile
+++ b/LUFA/StudioIntegration/makefile
@@ -27,7 +27,7 @@ DOXYGEN_COMBINED_XML := $(LUFA_ROOT)/Documentation/xml/lufa_doc.xml
TEMP_MANIFEST_XML := manifest.xml
EXTENSION_OUTPUT_XML := $(LUFA_ROOT)/../extension.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))
VSIX_ASSETS := $(LUFA_ROOT)/DoxygenPages/Images/LUFA_thumb.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.pkgdef
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" \
--stringparam chunk.quietly "1" \
--stringparam chunk.section.depth "3" \