From f3a8263842ca30f10eff56353c1e78c1f9436f95 Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Sun, 14 Apr 2013 10:23:59 +0000
Subject: Restructure Atmel Studio integration files and transforms.

---
 .../VSIX/lufa_asfmanifest_transform.xslt           | 36 ++++++++++++
 .../VSIX/lufa_vsmanifest_transform.xslt            | 33 +++++++++++
 .../XDK/lufa_extension_transform.xslt              | 68 ++++++++++++++++++++++
 .../XDK/lufa_filelist_transform.xslt               | 35 +++++++++++
 .../XDK/lufa_indent_transform.xslt                 | 23 ++++++++
 .../XDK/lufa_module_transform.xslt                 | 60 +++++++++++++++++++
 .../XSLT/lufa_asfmanifest_transform.xslt           | 36 ------------
 .../XSLT/lufa_extension_transform.xslt             | 68 ----------------------
 .../XSLT/lufa_filelist_transform.xslt              | 35 -----------
 .../XSLT/lufa_indent_transform.xslt                | 23 --------
 .../XSLT/lufa_module_transform.xslt                | 60 -------------------
 .../XSLT/lufa_vsmanifest_transform.xslt            | 33 -----------
 LUFA/StudioIntegration/makefile                    | 10 ++--
 13 files changed, 260 insertions(+), 260 deletions(-)
 create mode 100644 LUFA/StudioIntegration/VSIX/lufa_asfmanifest_transform.xslt
 create mode 100644 LUFA/StudioIntegration/VSIX/lufa_vsmanifest_transform.xslt
 create mode 100644 LUFA/StudioIntegration/XDK/lufa_extension_transform.xslt
 create mode 100644 LUFA/StudioIntegration/XDK/lufa_filelist_transform.xslt
 create mode 100644 LUFA/StudioIntegration/XDK/lufa_indent_transform.xslt
 create mode 100644 LUFA/StudioIntegration/XDK/lufa_module_transform.xslt
 delete mode 100644 LUFA/StudioIntegration/XSLT/lufa_asfmanifest_transform.xslt
 delete mode 100644 LUFA/StudioIntegration/XSLT/lufa_extension_transform.xslt
 delete mode 100644 LUFA/StudioIntegration/XSLT/lufa_filelist_transform.xslt
 delete mode 100644 LUFA/StudioIntegration/XSLT/lufa_indent_transform.xslt
 delete mode 100644 LUFA/StudioIntegration/XSLT/lufa_module_transform.xslt
 delete mode 100644 LUFA/StudioIntegration/XSLT/lufa_vsmanifest_transform.xslt

diff --git a/LUFA/StudioIntegration/VSIX/lufa_asfmanifest_transform.xslt b/LUFA/StudioIntegration/VSIX/lufa_asfmanifest_transform.xslt
new file mode 100644
index 000000000..8fc98412f
--- /dev/null
+++ b/LUFA/StudioIntegration/VSIX/lufa_asfmanifest_transform.xslt
@@ -0,0 +1,36 @@
+<!--
+             LUFA Library
+     Copyright (C) Dean Camera, 2013.
+
+  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/LUFA/StudioIntegration/VSIX/lufa_vsmanifest_transform.xslt b/LUFA/StudioIntegration/VSIX/lufa_vsmanifest_transform.xslt
new file mode 100644
index 000000000..db12d9ea2
--- /dev/null
+++ b/LUFA/StudioIntegration/VSIX/lufa_vsmanifest_transform.xslt
@@ -0,0 +1,33 @@
+<!--
+             LUFA Library
+     Copyright (C) Dean Camera, 2013.
+
+  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>
diff --git a/LUFA/StudioIntegration/XDK/lufa_extension_transform.xslt b/LUFA/StudioIntegration/XDK/lufa_extension_transform.xslt
new file mode 100644
index 000000000..f50f8a4dd
--- /dev/null
+++ b/LUFA/StudioIntegration/XDK/lufa_extension_transform.xslt
@@ -0,0 +1,68 @@
+<!--
+             LUFA Library
+     Copyright (C) Dean Camera, 2013.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+-->
+
+<!-- Atmel Studio framework Extension XML transform file -->
+
+<!-- Creates an extension.xml document from a given manifest list of XML files,
+     and adds appropriate documentation base URI entries and version
+     information. -->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+	<xsl:output method="xml" omit-xml-declaration="yes"/>
+
+	<!-- Store the LUFA version mentioned in the root node for later use -->
+	<xsl:param name="lufa-version" select="lufa-manifest/@version"/>
+
+	<!-- Read manifest list and then process all FDK nodes in the referenced
+	     document -->
+	<xsl:template match="lufa-manifest">
+		<xsl:comment>This file has been automatically generated from the LUFA Atmel Studio integration XML files.</xsl:comment>
+
+		<extension-container xmlversion="2.0">
+			<xsl:for-each select="xml-source">
+				<xsl:apply-templates select="document(@filename)/lufa/extension-container/*"/>
+			</xsl:for-each>
+		</extension-container>
+	</xsl:template>
+
+	<!-- 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 of LUFA being used -->
+	<xsl:template match="extension/@version">
+		<xsl:attribute name="version">
+			<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:attribute>
+	</xsl:template>
+
+	<!-- Update the extension online help URLs to the version of LUFA being
+	     used -->
+	<xsl:template match="online-help/*/@baseurl">
+		<xsl:attribute name="baseurl">
+			<xsl:value-of select="current()"/>
+			<xsl:value-of select="$lufa-version"/>
+			<xsl:text>/html/</xsl:text>
+		</xsl:attribute>
+	</xsl:template>
+
+	<xsl:template match="online-help/index-page/@url">
+		<xsl:attribute name="url">
+			<xsl:value-of select="current()"/>
+			<xsl:value-of select="$lufa-version"/>
+			<xsl:text>/html/</xsl:text>
+		</xsl:attribute>
+	</xsl:template>
+
+</xsl:stylesheet>
diff --git a/LUFA/StudioIntegration/XDK/lufa_filelist_transform.xslt b/LUFA/StudioIntegration/XDK/lufa_filelist_transform.xslt
new file mode 100644
index 000000000..9affc9f67
--- /dev/null
+++ b/LUFA/StudioIntegration/XDK/lufa_filelist_transform.xslt
@@ -0,0 +1,35 @@
+<!--
+             LUFA Library
+     Copyright (C) Dean Camera, 2013.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+-->
+
+<!-- Atmel Studio framework Module XML transform file -->
+
+<!-- Outputs a flat file list of all source files referenced in all modules of
+     the input manifest XML file, so that they can be checked for existence. -->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+	<xsl:output method="xml" omit-xml-declaration="yes"/>
+
+	<!-- Read manifest list, add a comment to indicate the source filename
+	     and then process all ASF nodes in the referenced document -->
+	<xsl:template match="lufa-manifest">
+		<xsl:for-each select="xml-source">
+			<xsl:comment>Sourced from <xsl:value-of select="@filename"/></xsl:comment>
+			<xsl:apply-templates select="document(@filename)/lufa/asf/*"/>
+		</xsl:for-each>
+	</xsl:template>
+
+	<!-- Recursively match and process all nodes/attributes -->
+	<xsl:template match="@*|node()">
+		<xsl:apply-templates select="@*|node()"/>
+	</xsl:template>
+
+	<!-- Match source file nodes, output filename -->
+	<xsl:template match="build[@type='c-source']|build[@type='header-file']|build[@type='distribute']">
+		<xsl:value-of select="@value"/>
+		<xsl:text>&#xA;</xsl:text>
+	</xsl:template>
+</xsl:stylesheet>
diff --git a/LUFA/StudioIntegration/XDK/lufa_indent_transform.xslt b/LUFA/StudioIntegration/XDK/lufa_indent_transform.xslt
new file mode 100644
index 000000000..166f42571
--- /dev/null
+++ b/LUFA/StudioIntegration/XDK/lufa_indent_transform.xslt
@@ -0,0 +1,23 @@
+<!--
+             LUFA Library
+     Copyright (C) Dean Camera, 2013.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+-->
+
+<!-- Atmel Studio framework XML transform file -->
+
+<!-- Indents a given XML document to match the node hierarchy. -->
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+	<xsl:output method="xml" omit-xml-declaration="yes" indent="yes"/>
+
+	<!-- Remove all white-space on all elements so that they can be indented -->
+	<xsl:strip-space elements="*"/>
+
+	<!-- Match the root node and copy, so that the output will be a correctly
+	     indented version of the input document -->
+	<xsl:template match="/">
+		<xsl:copy-of select="."/>
+	</xsl:template>
+</xsl:stylesheet>
diff --git a/LUFA/StudioIntegration/XDK/lufa_module_transform.xslt b/LUFA/StudioIntegration/XDK/lufa_module_transform.xslt
new file mode 100644
index 000000000..9146202a4
--- /dev/null
+++ b/LUFA/StudioIntegration/XDK/lufa_module_transform.xslt
@@ -0,0 +1,60 @@
+<!--
+             LUFA Library
+     Copyright (C) Dean Camera, 2013.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+-->
+
+<!-- Atmel Studio framework Module XML transform file -->
+
+<!-- Creates an asf.xml module document from a given manifest list of XML files,
+     and adds appropriate documentation links by cross-referencing the Doxygen
+     tag output file to map Doxygen group names to generated filenames. -->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+	<xsl:output method="xml" omit-xml-declaration="yes"/>
+
+	<!-- Store the LUFA Doxygen tag filename mentioned in the root node for later use -->
+	<xsl:param name="lufa-doxygen-tagfile" select="lufa-manifest/@tagfile"/>
+
+	<!-- Store the LUFA Doxygen documentation filename mentioned in the root node for later use -->
+	<xsl:param name="lufa-doxygen-docfile" select="lufa-manifest/@docfile"/>
+
+	<!-- Read manifest list, add a comment to indicate the source filename
+	     and then copy/process all ASF nodes in the referenced document -->
+	<xsl:template match="lufa-manifest">
+		<xsl:comment>This file has been automatically generated from the LUFA Atmel Studio integration XML files.</xsl:comment>
+
+		<asf xmlversion="1.0">
+			<xsl:for-each select="xml-source">
+				<xsl:comment>Sourced from <xsl:value-of select="@filename"/></xsl:comment>
+				<xsl:apply-templates select="document(@filename)/lufa/asf/*"/>
+			</xsl:for-each>
+		</asf>
+	</xsl:template>
+
+	<!-- Recursively match and copy/process all nodes/attributes -->
+	<xsl:template match="@*|node()">
+		<xsl:copy>
+			<xsl:apply-templates select="@*|node()"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<!-- For Doxygen entry point nodes we need to convert them into help link
+	     nodes instead and add descriptions, so that they show up as links in
+	     Studio correctly -->
+	<xsl:template match="build[@type='doxygen-entry-point']">
+		<build type="online-help" subtype="module-help-page-append">
+		 	<xsl:attribute name="value">
+		 		<!-- Extract filename of the HTML file that contains the documentation for this module from the Doxgen tag file -->
+			    <xsl:value-of select="document($lufa-doxygen-tagfile)/tagfile/compound[name=current()/@value]/filename"/>
+  			</xsl:attribute>
+  		</build>
+
+		<info type="description" value="summary">
+		 	<!-- Extract brief description of the module from the Doxygen combined XML documentation file -->
+			<xsl:value-of select="document($lufa-doxygen-docfile)/doxygen/compounddef[compoundname=current()/@value]/briefdescription/para"/>
+		</info>
+	</xsl:template>
+
+</xsl:stylesheet>
diff --git a/LUFA/StudioIntegration/XSLT/lufa_asfmanifest_transform.xslt b/LUFA/StudioIntegration/XSLT/lufa_asfmanifest_transform.xslt
deleted file mode 100644
index 8fc98412f..000000000
--- a/LUFA/StudioIntegration/XSLT/lufa_asfmanifest_transform.xslt
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-             LUFA Library
-     Copyright (C) Dean Camera, 2013.
-
-  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/LUFA/StudioIntegration/XSLT/lufa_extension_transform.xslt b/LUFA/StudioIntegration/XSLT/lufa_extension_transform.xslt
deleted file mode 100644
index f50f8a4dd..000000000
--- a/LUFA/StudioIntegration/XSLT/lufa_extension_transform.xslt
+++ /dev/null
@@ -1,68 +0,0 @@
-<!--
-             LUFA Library
-     Copyright (C) Dean Camera, 2013.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
--->
-
-<!-- Atmel Studio framework Extension XML transform file -->
-
-<!-- Creates an extension.xml document from a given manifest list of XML files,
-     and adds appropriate documentation base URI entries and version
-     information. -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-	<xsl:output method="xml" omit-xml-declaration="yes"/>
-
-	<!-- Store the LUFA version mentioned in the root node for later use -->
-	<xsl:param name="lufa-version" select="lufa-manifest/@version"/>
-
-	<!-- Read manifest list and then process all FDK nodes in the referenced
-	     document -->
-	<xsl:template match="lufa-manifest">
-		<xsl:comment>This file has been automatically generated from the LUFA Atmel Studio integration XML files.</xsl:comment>
-
-		<extension-container xmlversion="2.0">
-			<xsl:for-each select="xml-source">
-				<xsl:apply-templates select="document(@filename)/lufa/extension-container/*"/>
-			</xsl:for-each>
-		</extension-container>
-	</xsl:template>
-
-	<!-- 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 of LUFA being used -->
-	<xsl:template match="extension/@version">
-		<xsl:attribute name="version">
-			<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:attribute>
-	</xsl:template>
-
-	<!-- Update the extension online help URLs to the version of LUFA being
-	     used -->
-	<xsl:template match="online-help/*/@baseurl">
-		<xsl:attribute name="baseurl">
-			<xsl:value-of select="current()"/>
-			<xsl:value-of select="$lufa-version"/>
-			<xsl:text>/html/</xsl:text>
-		</xsl:attribute>
-	</xsl:template>
-
-	<xsl:template match="online-help/index-page/@url">
-		<xsl:attribute name="url">
-			<xsl:value-of select="current()"/>
-			<xsl:value-of select="$lufa-version"/>
-			<xsl:text>/html/</xsl:text>
-		</xsl:attribute>
-	</xsl:template>
-
-</xsl:stylesheet>
diff --git a/LUFA/StudioIntegration/XSLT/lufa_filelist_transform.xslt b/LUFA/StudioIntegration/XSLT/lufa_filelist_transform.xslt
deleted file mode 100644
index 9affc9f67..000000000
--- a/LUFA/StudioIntegration/XSLT/lufa_filelist_transform.xslt
+++ /dev/null
@@ -1,35 +0,0 @@
-<!--
-             LUFA Library
-     Copyright (C) Dean Camera, 2013.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
--->
-
-<!-- Atmel Studio framework Module XML transform file -->
-
-<!-- Outputs a flat file list of all source files referenced in all modules of
-     the input manifest XML file, so that they can be checked for existence. -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-	<xsl:output method="xml" omit-xml-declaration="yes"/>
-
-	<!-- Read manifest list, add a comment to indicate the source filename
-	     and then process all ASF nodes in the referenced document -->
-	<xsl:template match="lufa-manifest">
-		<xsl:for-each select="xml-source">
-			<xsl:comment>Sourced from <xsl:value-of select="@filename"/></xsl:comment>
-			<xsl:apply-templates select="document(@filename)/lufa/asf/*"/>
-		</xsl:for-each>
-	</xsl:template>
-
-	<!-- Recursively match and process all nodes/attributes -->
-	<xsl:template match="@*|node()">
-		<xsl:apply-templates select="@*|node()"/>
-	</xsl:template>
-
-	<!-- Match source file nodes, output filename -->
-	<xsl:template match="build[@type='c-source']|build[@type='header-file']|build[@type='distribute']">
-		<xsl:value-of select="@value"/>
-		<xsl:text>&#xA;</xsl:text>
-	</xsl:template>
-</xsl:stylesheet>
diff --git a/LUFA/StudioIntegration/XSLT/lufa_indent_transform.xslt b/LUFA/StudioIntegration/XSLT/lufa_indent_transform.xslt
deleted file mode 100644
index 166f42571..000000000
--- a/LUFA/StudioIntegration/XSLT/lufa_indent_transform.xslt
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-             LUFA Library
-     Copyright (C) Dean Camera, 2013.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
--->
-
-<!-- Atmel Studio framework XML transform file -->
-
-<!-- Indents a given XML document to match the node hierarchy. -->
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-	<xsl:output method="xml" omit-xml-declaration="yes" indent="yes"/>
-
-	<!-- Remove all white-space on all elements so that they can be indented -->
-	<xsl:strip-space elements="*"/>
-
-	<!-- Match the root node and copy, so that the output will be a correctly
-	     indented version of the input document -->
-	<xsl:template match="/">
-		<xsl:copy-of select="."/>
-	</xsl:template>
-</xsl:stylesheet>
diff --git a/LUFA/StudioIntegration/XSLT/lufa_module_transform.xslt b/LUFA/StudioIntegration/XSLT/lufa_module_transform.xslt
deleted file mode 100644
index 9146202a4..000000000
--- a/LUFA/StudioIntegration/XSLT/lufa_module_transform.xslt
+++ /dev/null
@@ -1,60 +0,0 @@
-<!--
-             LUFA Library
-     Copyright (C) Dean Camera, 2013.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
--->
-
-<!-- Atmel Studio framework Module XML transform file -->
-
-<!-- Creates an asf.xml module document from a given manifest list of XML files,
-     and adds appropriate documentation links by cross-referencing the Doxygen
-     tag output file to map Doxygen group names to generated filenames. -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-	<xsl:output method="xml" omit-xml-declaration="yes"/>
-
-	<!-- Store the LUFA Doxygen tag filename mentioned in the root node for later use -->
-	<xsl:param name="lufa-doxygen-tagfile" select="lufa-manifest/@tagfile"/>
-
-	<!-- Store the LUFA Doxygen documentation filename mentioned in the root node for later use -->
-	<xsl:param name="lufa-doxygen-docfile" select="lufa-manifest/@docfile"/>
-
-	<!-- Read manifest list, add a comment to indicate the source filename
-	     and then copy/process all ASF nodes in the referenced document -->
-	<xsl:template match="lufa-manifest">
-		<xsl:comment>This file has been automatically generated from the LUFA Atmel Studio integration XML files.</xsl:comment>
-
-		<asf xmlversion="1.0">
-			<xsl:for-each select="xml-source">
-				<xsl:comment>Sourced from <xsl:value-of select="@filename"/></xsl:comment>
-				<xsl:apply-templates select="document(@filename)/lufa/asf/*"/>
-			</xsl:for-each>
-		</asf>
-	</xsl:template>
-
-	<!-- Recursively match and copy/process all nodes/attributes -->
-	<xsl:template match="@*|node()">
-		<xsl:copy>
-			<xsl:apply-templates select="@*|node()"/>
-		</xsl:copy>
-	</xsl:template>
-
-	<!-- For Doxygen entry point nodes we need to convert them into help link
-	     nodes instead and add descriptions, so that they show up as links in
-	     Studio correctly -->
-	<xsl:template match="build[@type='doxygen-entry-point']">
-		<build type="online-help" subtype="module-help-page-append">
-		 	<xsl:attribute name="value">
-		 		<!-- Extract filename of the HTML file that contains the documentation for this module from the Doxgen tag file -->
-			    <xsl:value-of select="document($lufa-doxygen-tagfile)/tagfile/compound[name=current()/@value]/filename"/>
-  			</xsl:attribute>
-  		</build>
-
-		<info type="description" value="summary">
-		 	<!-- Extract brief description of the module from the Doxygen combined XML documentation file -->
-			<xsl:value-of select="document($lufa-doxygen-docfile)/doxygen/compounddef[compoundname=current()/@value]/briefdescription/para"/>
-		</info>
-	</xsl:template>
-
-</xsl:stylesheet>
diff --git a/LUFA/StudioIntegration/XSLT/lufa_vsmanifest_transform.xslt b/LUFA/StudioIntegration/XSLT/lufa_vsmanifest_transform.xslt
deleted file mode 100644
index db12d9ea2..000000000
--- a/LUFA/StudioIntegration/XSLT/lufa_vsmanifest_transform.xslt
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
-             LUFA Library
-     Copyright (C) Dean Camera, 2013.
-
-  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>
diff --git a/LUFA/StudioIntegration/makefile b/LUFA/StudioIntegration/makefile
index fe9f68166..87adfc2af 100644
--- a/LUFA/StudioIntegration/makefile
+++ b/LUFA/StudioIntegration/makefile
@@ -52,11 +52,11 @@ $(TEMP_MANIFEST_XML): $(DOXYGEN_TAG_FILE_XML) $(DOXYGEN_COMBINED_XML)
 
 generate_xml: $(TEMP_MANIFEST_XML)
 	@echo "Processing asf.xml file..."
-	@xsltproc XSLT/lufa_module_transform.xslt $< | xsltproc XSLT/lufa_indent_transform.xslt - > $(MODULE_OUTPUT_XML)
+	@xsltproc XDK/lufa_module_transform.xslt $< | xsltproc XDK/lufa_indent_transform.xslt - > $(MODULE_OUTPUT_XML)
 	@echo "Atmel Studio asf.xml file generated."
 
 	@echo "Processing extension.xml file..."
-	@xsltproc XSLT/lufa_extension_transform.xslt $< | xsltproc XSLT/lufa_indent_transform.xslt - > $(EXTENSION_OUTPUT_XML)
+	@xsltproc XDK/lufa_extension_transform.xslt $< | xsltproc XDK/lufa_indent_transform.xslt - > $(EXTENSION_OUTPUT_XML)
 	@echo "Atmel Studio extension.xml file generated."
 
 	@rm $(TEMP_MANIFEST_XML)
@@ -81,8 +81,8 @@ generate_vsix: $(EXTENSION_OUTPUT_XML) $(MODULE_OUTPUT_XML)
 	@cp "VSIX/[Content_Types].xml" $(LUFA_ROOT)/../
 	@cp "Blob/LUFA.dll" $(LUFA_ROOT)/../
 	@cp "Blob/LUFA.pkgdef" $(LUFA_ROOT)/../
-	@xsltproc --stringparam extension-version "$(EXT_VERSION_NUM)" XSLT/lufa_vsmanifest_transform.xslt VSIX/extension.vsixmanifest > $(LUFA_ROOT)/../extension.vsixmanifest
-	@xsltproc --stringparam lufa-version "$(LUFA_VERSION_NUM)" XSLT/lufa_asfmanifest_transform.xslt VSIX/asf-manifest.xml > $(LUFA_ROOT)/../asf-manifest.xml
+	@xsltproc --stringparam extension-version "$(EXT_VERSION_NUM)" VSIX/lufa_vsmanifest_transform.xslt VSIX/extension.vsixmanifest > $(LUFA_ROOT)/../extension.vsixmanifest
+	@xsltproc --stringparam lufa-version "$(LUFA_VERSION_NUM)" VSIX/lufa_asfmanifest_transform.xslt VSIX/asf-manifest.xml > $(LUFA_ROOT)/../asf-manifest.xml
 
 	@echo "Generating Atmel Studio VSIX Extension file..."
 	@cd $(LUFA_ROOT)/../ && zip $(EXT_VSIX_NAME) -q -9 contents.zip exampleProjects.xml content.xml.cache License.txt Preview.png PreviewThumb.png "[Content_Types].xml" extension.vsixmanifest asf-manifest.xml extension.xml LUFA.dll LUFA.pkgdef
@@ -93,7 +93,7 @@ check_filenames: $(MODULE_OUTPUT_XML)
 	@for f in `find $(LUFA_ROOT)/../ -name "asf.xml"`; do \
 		echo "Checking $$f..."; \
 		asf_file_dir=`dirname $$f`; \
-		xsltproc XSLT/lufa_filelist_transform.xslt $$f | sed -e "/^$$/d" | while read -r i; do \
+		xsltproc XDK/lufa_filelist_transform.xslt $$f | sed -e "/^$$/d" | while read -r i; do \
 			if ( ! test -f "$$asf_file_dir/$$i" ); then \
 				echo "Source file \"$$i\" referenced in $$f does not exist!"; \
 				exit 1; \
-- 
cgit v1.2.3