Update for (in-progress) Atmel Studio 7 support, via new integration DLL and help...

diff --git a/LUFA/StudioIntegration/HV1/helpcontentsetup.msha b/LUFA/StudioIntegration/HV1/helpcontentsetup.msha
index cb1c4b9..28d6829 100644 (file)
--- a/LUFA/StudioIntegration/HV1/helpcontentsetup.msha
+++ b/LUFA/StudioIntegration/HV1/helpcontentsetup.msha
@@ -19,7 +19,7 @@
                </div>
                <div class="package-list">
                        <div class="package">
                </div>
                <div class="package-list">
                        <div class="package">

-                               <span class="name">LUFA</span>
+                               <span class="name">lufa_studio_help.mshc</span>

                                <a class="current-link" href="lufa_studio_help.mshc">lufa_studio_help.mshc</a>
                        </div>
                </div>
                                <a class="current-link" href="lufa_studio_help.mshc">lufa_studio_help.mshc</a>
                        </div>
                </div>

diff --git a/LUFA/StudioIntegration/HV1/lufa_helpcontentsetup_transform.xslt b/LUFA/StudioIntegration/HV1/lufa_helpcontentsetup_transform.xslt
index b43354f..e109988 100644 (file)
--- a/LUFA/StudioIntegration/HV1/lufa_helpcontentsetup_transform.xslt
+++ b/LUFA/StudioIntegration/HV1/lufa_helpcontentsetup_transform.xslt
@@ -25,6 +25,16 @@
        </xsl:template>
 
        <!-- Update the LUFA help package file name -->
        </xsl:template>
 
        <!-- Update the LUFA help package file name -->

+       <xsl:template match="xhtml:div[@class='package']/xhtml:span">
+               <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:copy>
+       </xsl:template>
+

        <xsl:template match="xhtml:div[@class='package']/xhtml:a">
                <xsl:copy>
                        <xsl:copy-of select="@class"/>
        <xsl:template match="xhtml:div[@class='package']/xhtml:a">
                <xsl:copy>
                        <xsl:copy-of select="@class"/>

diff --git a/LUFA/StudioIntegration/VSIX/LUFA.dll b/LUFA/StudioIntegration/VSIX/LUFA.dll
index 26ba83d..cc4b8ed 100644 (file)
Binary files a/LUFA/StudioIntegration/VSIX/LUFA.dll and b/LUFA/StudioIntegration/VSIX/LUFA.dll differ

diff --git a/LUFA/StudioIntegration/VSIX/extension.vsixmanifest b/LUFA/StudioIntegration/VSIX/extension.vsixmanifest
index cfb82ed..f155618 100644 (file)
--- a/LUFA/StudioIntegration/VSIX/extension.vsixmanifest
+++ b/LUFA/StudioIntegration/VSIX/extension.vsixmanifest
@@ -13,8 +13,6 @@
                <PreviewImage>LUFA.png</PreviewImage>\r
 \r
                <SupportedProducts>\r
                <PreviewImage>LUFA.png</PreviewImage>\r
 \r
                <SupportedProducts>\r

-                       <IsolatedShell Version="6.1">AtmelStudio</IsolatedShell>\r
-                       <IsolatedShell Version="6.2">AtmelStudio</IsolatedShell>\r

                        <IsolatedShell Version="7.0">AtmelStudio</IsolatedShell>\r
                </SupportedProducts>\r
 \r
                        <IsolatedShell Version="7.0">AtmelStudio</IsolatedShell>\r
                </SupportedProducts>\r
 \r