Merge commit '60b30c036397cb5627fa374bb930794b225daa29' as 'lib/lufa'

8 files changed, 170 insertions, 0 deletions

diff --git a/lib/lufa/LUFA/StudioIntegration/VSIX/LUFA.dll b/lib/lufa/LUFA/StudioIntegration/VSIX/LUFA.dll
new file mode 100644
index 0000000000..369c78178b
--- /dev/null
+++ b/lib/lufa/LUFA/StudioIntegration/VSIX/LUFA.dll
diff --git a/lib/lufa/LUFA/StudioIntegration/VSIX/LUFA.pkgdef b/lib/lufa/LUFA/StudioIntegration/VSIX/LUFA.pkgdef
new file mode 100644
index 0000000000..b1b2f943b8
--- /dev/null
+++ b/lib/lufa/LUFA/StudioIntegration/VSIX/LUFA.pkgdef
diff --git a/lib/lufa/LUFA/StudioIntegration/VSIX/[Content_Types].xml b/lib/lufa/LUFA/StudioIntegration/VSIX/[Content_Types].xml
new file mode 100644
index 0000000000..05ef8b6ba4
--- /dev/null
+++ b/lib/lufa/LUFA/StudioIntegration/VSIX/[Content_Types].xml
@@ -0,0 +1,13 @@
+<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">

+	<Default Extension="vsixmanifest" ContentType="text/xml"/>

+	<Default Extension="cache" ContentType="text/xml"/>

+	<Default Extension="png" ContentType="application/octet-stream"/>

+	<Default Extension="txt" ContentType="text/plain"/>

+	<Default Extension="xml" ContentType="text/xml"/>

+	<Default Extension="zip" ContentType="application/octet-stream"/>

+	<Default Extension="dll" ContentType="application/octet-stream" />

+	<Default Extension="pkgdef" ContentType="text/plain" />

+	<Default Extension="htm" ContentType="text/html" />

+	<Default Extension="msha" ContentType="text/html" />

+	<Default Extension="mshc" ContentType="application/octet-stream"/>

+</Types>

diff --git a/lib/lufa/LUFA/StudioIntegration/VSIX/asf-manifest.xml b/lib/lufa/LUFA/StudioIntegration/VSIX/asf-manifest.xml
new file mode 100644
index 0000000000..794fd689e1
--- /dev/null
+++ b/lib/lufa/LUFA/StudioIntegration/VSIX/asf-manifest.xml
@@ -0,0 +1,18 @@
+<AsfContentProvider Version="1.0.0">

+	<Identifier Id="0e160d5c-e331-48d9-850b-e0387912171b">

+		<Org>FourWalledCubicle</Org>

+		<ShortName>LUFA</ShortName>

+		<Author>Dean Camera</Author>

+		<Description/>

+		<FollowFolderStructure>True</FollowFolderStructure>

+	</Identifier>

+	<AsfContent Type="zip" Path="contents.zip">

+		<Content>

+			<Version>0</Version>

+			<HelpURL/>

+			<Locator/>

+			<DbXMLPath>content.xml.cache</DbXMLPath>

+			<Description/>

+		</Content>

+	</AsfContent>

+</AsfContentProvider>

diff --git a/lib/lufa/LUFA/StudioIntegration/VSIX/extension.vsixmanifest b/lib/lufa/LUFA/StudioIntegration/VSIX/extension.vsixmanifest
new file mode 100644
index 0000000000..f155618b73
--- /dev/null
+++ b/lib/lufa/LUFA/StudioIntegration/VSIX/extension.vsixmanifest
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>

+

+<Vsix xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="1.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2010">

+	<Identifier Id="FourWalledCubicle.LUFA.0e160d5c-e331-48d9-850b-e0387912171b">

+		<Name>LUFA Library</Name>

+		<Author>Dean Camera</Author>

+		<Version>0</Version>

+		<MoreInfoUrl>http://www.lufa-lib.org</MoreInfoUrl>

+		<Description xml:space="preserve">LUFA, the Lightweight USB Framework for AVRs.</Description>

+

+		<License>License.txt</License>

+		<Icon>LUFA_thumb.png</Icon>

+		<PreviewImage>LUFA.png</PreviewImage>

+

+		<SupportedProducts>

+			<IsolatedShell Version="7.0">AtmelStudio</IsolatedShell>

+		</SupportedProducts>

+

+		<SupportedFrameworkRuntimeEdition MinVersion="4.0" MaxVersion="4.5"/>

+		<Locale>1033</Locale>

+

+		<AllUsers>false</AllUsers>

+	</Identifier>

+

+	<References/>

+

+	<Content>

+		<VsPackage>LUFA.pkgdef</VsPackage>

+		<CustomExtension Type="MSHelp">helpcontentsetup.msha</CustomExtension>

+		<CustomExtension Type="asf-manifest">asf-manifest.xml</CustomExtension>

+	</Content>

+</Vsix>

diff --git a/lib/lufa/LUFA/StudioIntegration/VSIX/generate_caches.py b/lib/lufa/LUFA/StudioIntegration/VSIX/generate_caches.py
new file mode 100644
index 0000000000..ab787e8ec3
--- /dev/null
+++ b/lib/lufa/LUFA/StudioIntegration/VSIX/generate_caches.py
@@ -0,0 +1,38 @@
+"""

+             LUFA Library

+     Copyright (C) Dean Camera, 2017.

+

+  dean [at] fourwalledcubicle [dot] com

+           www.lufa-lib.org

+"""

+

+import sys

+sys.path.append("ProjectGenerator")

+

+

+def show_message(message):

+    print("[Project Generator] %s" % message)

+    sys.stdout.flush()

+

+

+def main(lufa_root_path):

+    try:

+        from asf_avrstudio5_interface import PythonFacade

+    except ImportError:

+        print("Fatal Error: The ASF project generator is missing.")

+        return 1

+

+    p = PythonFacade(lufa_root_path)

+

+    show_message("Checking database sanity...")

+    p.check_extension_database_sanity(lufa_root_path)

+

+    show_message("Building cache files...")

+    p.generate_extension_cache_files(lufa_root_path)

+

+    show_message("Cache files created.")

+    return 0

+

+

+if __name__ == "__main__":

+    sys.exit(main(sys.argv[1]))

diff --git a/lib/lufa/LUFA/StudioIntegration/VSIX/lufa_asfmanifest_transform.xslt b/lib/lufa/LUFA/StudioIntegration/VSIX/lufa_asfmanifest_transform.xslt
new file mode 100644
index 0000000000..00f552c9c9
--- /dev/null
+++ b/lib/lufa/LUFA/StudioIntegration/VSIX/lufa_asfmanifest_transform.xslt
@@ -0,0 +1,36 @@
+<!--
+             LUFA Library
+     Copyright (C) Dean Camera, 2017.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+-->
+
+<!-- Atmel Studio framework VSIX XML transform file -->
+
+<!-- Updates an asf-manifest.xml document to add appropriate version
+     information. -->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+	<xsl:output method="xml" omit-xml-declaration="yes"/>
+
+	<!-- Need to input the LUFA version for later use -->
+	<xsl:param name="lufa-version"/>
+
+	<!-- Recursively match and copy/process all nodes/attributes -->
+	<xsl:template match="@*|node()">
+		<xsl:copy>
+			<xsl:apply-templates select="@*|node()"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<!-- Update the LUFA version to the version passed as a parameter -->
+	<xsl:template match="Version">
+		<xsl:copy>
+			<xsl:value-of select="substring($lufa-version, 1, 2)"/>
+			<xsl:text>.</xsl:text>
+			<xsl:value-of select="substring($lufa-version, 3, 2)"/>
+			<xsl:text>.</xsl:text>
+			<xsl:value-of select="substring($lufa-version, 5, 2)"/>
+		</xsl:copy>
+	</xsl:template>
+</xsl:stylesheet>
diff --git a/lib/lufa/LUFA/StudioIntegration/VSIX/lufa_vsmanifest_transform.xslt b/lib/lufa/LUFA/StudioIntegration/VSIX/lufa_vsmanifest_transform.xslt
new file mode 100644
index 0000000000..1198dd9dd6
--- /dev/null
+++ b/lib/lufa/LUFA/StudioIntegration/VSIX/lufa_vsmanifest_transform.xslt
@@ -0,0 +1,33 @@
+<!--
+             LUFA Library
+     Copyright (C) Dean Camera, 2017.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+-->
+
+<!-- Atmel Studio framework VSIX XML transform file -->
+
+<!-- Updates the version element of a Visual Studio VSIX manifest file to the
+     value passed as a parameter to the stylesheet transform -->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:vs="http://schemas.microsoft.com/developer/vsx-schema/2010" version="1.0">
+	<xsl:output method="xml" omit-xml-declaration="yes"/>
+
+	<!-- Need to input the extension version for later use -->
+	<xsl:param name="extension-version"/>
+
+	<!-- Recursively match and copy/process all nodes/attributes -->
+	<xsl:template match="@*|node()">
+		<xsl:copy>
+			<xsl:apply-templates select="@*|node()"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<!-- Update the extension version to the version passed as a parameter -->
+	<xsl:template match="vs:Version">
+		<xsl:copy>
+			<xsl:value-of select="$extension-version"/>
+		</xsl:copy>
+	</xsl:template>
+
+</xsl:stylesheet>