diff options
| -rw-r--r-- | LUFA/StudioIntegration/XSLT/lufa_extension_transform.xslt | 2 | ||||
| -rw-r--r-- | LUFA/StudioIntegration/lufa.xml | 8 | ||||
| -rw-r--r-- | LUFA/StudioIntegration/makefile | 6 |
3 files changed, 9 insertions, 7 deletions
diff --git a/LUFA/StudioIntegration/XSLT/lufa_extension_transform.xslt b/LUFA/StudioIntegration/XSLT/lufa_extension_transform.xslt index a40176a8a..0d57efaab 100644 --- a/LUFA/StudioIntegration/XSLT/lufa_extension_transform.xslt +++ b/LUFA/StudioIntegration/XSLT/lufa_extension_transform.xslt @@ -49,7 +49,7 @@ <!-- Update the extension online help URLs to the version of LUFA being used --> - <xsl:template match="online-help/*/@baseurl"> + <xsl:template match="online-help/*/@baseurl | online-help/index-page/@url"> <xsl:attribute name="baseurl"> <xsl:value-of select="current()"/> <xsl:value-of select="$lufa-version"/> diff --git a/LUFA/StudioIntegration/lufa.xml b/LUFA/StudioIntegration/lufa.xml index cb0f58172..8ab9483af 100644 --- a/LUFA/StudioIntegration/lufa.xml +++ b/LUFA/StudioIntegration/lufa.xml @@ -18,12 +18,12 @@ <license caption="LUFA license" path="LUFA/License.txt"/>
<release-notes caption="LUFA Information" url="http://www.lufa-lib.org"/>
<online-help>
- <index-page caption="LUFA Documentation" url="http://www.lufa-lib.org/documentation"/>
- <module-help-page scheme="append" baseurl="http://www.fourwalledcubicle.com/files/LUFA/Doc/"/>
- <module-guide-page scheme="append" baseurl="http://www.fourwalledcubicle.com/files/LUFA/Doc/"/>
+ <index-page caption="LUFA Documentation" url="http://www.lufa-lib.org/documentation/"/>
+ <module-help-page scheme="append" baseurl="http://www.lufa-lib.org/documentation/"/>
+ <module-guide-page scheme="append" baseurl="http://www.lufa-lib.org/documentation/"/>
</online-help>
<offline-help>
- <index-page caption="LUFA Documentation" path="Documentation/html/index.htm"/>
+ <index-page caption="LUFA Documentation" path="Documentation/html/"/>
<module-help-page scheme="append" basepath="Documentation/html/"/>
<module-guide-page scheme="append" basepath="Documentation/html/"/>
</offline-help>
diff --git a/LUFA/StudioIntegration/makefile b/LUFA/StudioIntegration/makefile index 262923ae9..0d481089a 100644 --- a/LUFA/StudioIntegration/makefile +++ b/LUFA/StudioIntegration/makefile @@ -46,10 +46,12 @@ generate_xml: $(TEMP_MANIFEST_XML) @xsltproc XSLT/lufa_extension_transform.xslt $< | xsltproc XSLT/lufa_indent_transform.xslt - > $(EXTENSION_OUTPUT_XML) @echo "Atmel Studio extension.xml file generated." + @rm $(TEMP_MANIFEST_XML) + generate_vsix: $(EXTENSION_OUTPUT_XML) $(MODULE_OUTPUT_XML) @echo "Creating VSIX Dependencies..." @cp "VSIX/[Content_Types].xml" $(LUFA_ROOT)/../ - @xsltproc --stringparam extension-version $(EXT_VERSION_NUM) XSLT/lufa_vsmanifest_transform.xslt VSIX/extension.vsixmanifest > $(LUFA_ROOT)/../extension.vsixmanifest + @xsltproc --stringparam extension-version "$(EXT_VERSION_NUM)" XSLT/lufa_vsmanifest_transform.xslt VSIX/extension.vsixmanifest > $(LUFA_ROOT)/../extension.vsixmanifest @echo "Generating Atmel Studio VSIX Extension file..." @cd $(LUFA_ROOT)/../ && zip LUFA_AS_Extension.vsix -q -9 -r --exclude=*StudioIntegration* * @@ -62,4 +64,4 @@ check_filenames: $(TEMP_MANIFEST_XML) fi; \ done; -.PHONY: all clean check_filenames generate_xml
\ No newline at end of file +.PHONY: all clean generate_xml generate_vsix check_filenames
\ No newline at end of file |