Use nicer LUFA documentation links in the VSIX extension, rather than direct FourWall...

diff --git a/LUFA/StudioIntegration/XSLT/lufa_extension_transform.xslt b/LUFA/StudioIntegration/XSLT/lufa_extension_transform.xslt
index a40176a..0d57efa 100644 (file)
--- 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 -->
 
        <!-- 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"/>
                <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 cb0f581..8ab9483 100644 (file)
--- a/LUFA/StudioIntegration/lufa.xml
+++ b/LUFA/StudioIntegration/lufa.xml
@@ -18,12 +18,12 @@
                        <license caption="LUFA license" path="LUFA/License.txt"/>\r
                        <release-notes caption="LUFA Information" url="http://www.lufa-lib.org"/>\r
                        <online-help>\r
                        <license caption="LUFA license" path="LUFA/License.txt"/>\r
                        <release-notes caption="LUFA Information" url="http://www.lufa-lib.org"/>\r
                        <online-help>\r

-                               <index-page caption="LUFA Documentation" url="http://www.lufa-lib.org/documentation"/>\r
-                               <module-help-page scheme="append" baseurl="http://www.fourwalledcubicle.com/files/LUFA/Doc/"/>\r
-                               <module-guide-page scheme="append" baseurl="http://www.fourwalledcubicle.com/files/LUFA/Doc/"/>\r
+                               <index-page caption="LUFA Documentation" url="http://www.lufa-lib.org/documentation/"/>\r
+                               <module-help-page scheme="append" baseurl="http://www.lufa-lib.org/documentation/"/>\r
+                               <module-guide-page scheme="append" baseurl="http://www.lufa-lib.org/documentation/"/>\r

                        </online-help>\r
                        <offline-help>\r
                        </online-help>\r
                        <offline-help>\r

-                               <index-page caption="LUFA Documentation" path="Documentation/html/index.htm"/>\r
+                               <index-page caption="LUFA Documentation" path="Documentation/html/"/>\r

                                <module-help-page scheme="append" basepath="Documentation/html/"/>\r
                                <module-guide-page scheme="append" basepath="Documentation/html/"/>\r
                        </offline-help>\r
                                <module-help-page scheme="append" basepath="Documentation/html/"/>\r
                                <module-guide-page scheme="append" basepath="Documentation/html/"/>\r
                        </offline-help>\r

diff --git a/LUFA/StudioIntegration/makefile b/LUFA/StudioIntegration/makefile
index 262923a..0d48108 100644 (file)
--- 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."
 
        @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)/../
 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* *
 
        @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;
 
                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