From cf4575b94a3c65e6535a159fc71fc885aebc2620 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Fri, 2 Aug 2019 14:02:40 -0700
Subject: Fix the LUFA lib to use a submodule instead of just files (#6245)

* Remove LUFA files

* Update descriptions for newer version of LUFA

* Create PR6245.md

* Fix CDC(Serial) type errors

* Fix missed merge conflict for AUDIO_DTYPE_CSInterface
---
 lib/lufa/LUFA/StudioIntegration/VSIX/LUFA.dll      | Bin 785920 -> 0 bytes
 lib/lufa/LUFA/StudioIntegration/VSIX/LUFA.pkgdef   | Bin 2242 -> 0 bytes
 .../StudioIntegration/VSIX/[Content_Types].xml     |  13 -------
 .../LUFA/StudioIntegration/VSIX/asf-manifest.xml   |  18 ----------
 .../StudioIntegration/VSIX/extension.vsixmanifest  |  32 -----------------
 .../LUFA/StudioIntegration/VSIX/generate_caches.py |  38 ---------------------
 .../VSIX/lufa_asfmanifest_transform.xslt           |  36 -------------------
 .../VSIX/lufa_vsmanifest_transform.xslt            |  33 ------------------
 8 files changed, 170 deletions(-)
 delete mode 100644 lib/lufa/LUFA/StudioIntegration/VSIX/LUFA.dll
 delete mode 100644 lib/lufa/LUFA/StudioIntegration/VSIX/LUFA.pkgdef
 delete mode 100644 lib/lufa/LUFA/StudioIntegration/VSIX/[Content_Types].xml
 delete mode 100644 lib/lufa/LUFA/StudioIntegration/VSIX/asf-manifest.xml
 delete mode 100644 lib/lufa/LUFA/StudioIntegration/VSIX/extension.vsixmanifest
 delete mode 100644 lib/lufa/LUFA/StudioIntegration/VSIX/generate_caches.py
 delete mode 100644 lib/lufa/LUFA/StudioIntegration/VSIX/lufa_asfmanifest_transform.xslt
 delete mode 100644 lib/lufa/LUFA/StudioIntegration/VSIX/lufa_vsmanifest_transform.xslt

(limited to 'lib/lufa/LUFA/StudioIntegration/VSIX')

diff --git a/lib/lufa/LUFA/StudioIntegration/VSIX/LUFA.dll b/lib/lufa/LUFA/StudioIntegration/VSIX/LUFA.dll
deleted file mode 100644
index 369c78178..000000000
Binary files a/lib/lufa/LUFA/StudioIntegration/VSIX/LUFA.dll and /dev/null differ
diff --git a/lib/lufa/LUFA/StudioIntegration/VSIX/LUFA.pkgdef b/lib/lufa/LUFA/StudioIntegration/VSIX/LUFA.pkgdef
deleted file mode 100644
index b1b2f943b..000000000
Binary files a/lib/lufa/LUFA/StudioIntegration/VSIX/LUFA.pkgdef and /dev/null differ
diff --git a/lib/lufa/LUFA/StudioIntegration/VSIX/[Content_Types].xml b/lib/lufa/LUFA/StudioIntegration/VSIX/[Content_Types].xml
deleted file mode 100644
index 112d16994..000000000
--- a/lib/lufa/LUFA/StudioIntegration/VSIX/[Content_Types].xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<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
deleted file mode 100644
index bd969518a..000000000
--- a/lib/lufa/LUFA/StudioIntegration/VSIX/asf-manifest.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<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
deleted file mode 100644
index a1901cb56..000000000
--- a/lib/lufa/LUFA/StudioIntegration/VSIX/extension.vsixmanifest
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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
deleted file mode 100644
index 671bed9d5..000000000
--- a/lib/lufa/LUFA/StudioIntegration/VSIX/generate_caches.py
+++ /dev/null
@@ -1,38 +0,0 @@
-"""
-             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
deleted file mode 100644
index 00f552c9c..000000000
--- a/lib/lufa/LUFA/StudioIntegration/VSIX/lufa_asfmanifest_transform.xslt
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-             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
deleted file mode 100644
index 1198dd9dd..000000000
--- a/lib/lufa/LUFA/StudioIntegration/VSIX/lufa_vsmanifest_transform.xslt
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
-             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>
-- 
cgit v1.2.3-70-g09d2