aboutsummaryrefslogtreecommitdiffstats
path: root/LUFA/StudioIntegration
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2015-10-02 11:50:02 +1000
committerDean Camera <dean@fourwalledcubicle.com>2015-10-02 11:50:02 +1000
commit2fa6cbdb108a55a074c32990ffaa73755a17ae3a (patch)
tree04f56199bd78b5398d9e974cc21bb6ecd8288eff /LUFA/StudioIntegration
parent815a29c7b259ea66d02a037105a5284a69f4e1dd (diff)
downloadlufa-2fa6cbdb108a55a074c32990ffaa73755a17ae3a.tar.gz
lufa-2fa6cbdb108a55a074c32990ffaa73755a17ae3a.tar.bz2
lufa-2fa6cbdb108a55a074c32990ffaa73755a17ae3a.zip
Update for (in-progress) Atmel Studio 7 support, via new integration DLL and help content fixes.
Diffstat (limited to 'LUFA/StudioIntegration')
-rw-r--r--LUFA/StudioIntegration/HV1/helpcontentsetup.msha2
-rw-r--r--LUFA/StudioIntegration/HV1/lufa_helpcontentsetup_transform.xslt10
-rw-r--r--LUFA/StudioIntegration/VSIX/LUFA.dllbin745472 -> 749056 bytes
-rw-r--r--LUFA/StudioIntegration/VSIX/extension.vsixmanifest2
4 files changed, 11 insertions, 3 deletions
diff --git a/LUFA/StudioIntegration/HV1/helpcontentsetup.msha b/LUFA/StudioIntegration/HV1/helpcontentsetup.msha
index cb1c4b9eb..28d6829ab 100644
--- a/LUFA/StudioIntegration/HV1/helpcontentsetup.msha
+++ b/LUFA/StudioIntegration/HV1/helpcontentsetup.msha
@@ -19,7 +19,7 @@
</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>
diff --git a/LUFA/StudioIntegration/HV1/lufa_helpcontentsetup_transform.xslt b/LUFA/StudioIntegration/HV1/lufa_helpcontentsetup_transform.xslt
index b43354f8d..e1099887e 100644
--- 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 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"/>
diff --git a/LUFA/StudioIntegration/VSIX/LUFA.dll b/LUFA/StudioIntegration/VSIX/LUFA.dll
index 26ba83d1b..cc4b8ed5c 100644
--- a/LUFA/StudioIntegration/VSIX/LUFA.dll
+++ b/LUFA/StudioIntegration/VSIX/LUFA.dll
Binary files differ
diff --git a/LUFA/StudioIntegration/VSIX/extension.vsixmanifest b/LUFA/StudioIntegration/VSIX/extension.vsixmanifest
index cfb82ed12..f155618b7 100644
--- a/LUFA/StudioIntegration/VSIX/extension.vsixmanifest
+++ b/LUFA/StudioIntegration/VSIX/extension.vsixmanifest
@@ -13,8 +13,6 @@
<PreviewImage>LUFA.png</PreviewImage>
<SupportedProducts>
- <IsolatedShell Version="6.1">AtmelStudio</IsolatedShell>
- <IsolatedShell Version="6.2">AtmelStudio</IsolatedShell>
<IsolatedShell Version="7.0">AtmelStudio</IsolatedShell>
</SupportedProducts>