From f2c241548010df18dcacf18979d80f40b31cd864 Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Sat, 12 Jan 2013 22:23:58 +0000
Subject: Move out dummy board module and add strong-references to it in each
 project, so that the correct project caption is generated inside Atmel
 Studio.

---
 LUFA/CodeTemplates/DeviceTemplate/asf.xml     | 1 +
 LUFA/CodeTemplates/HostTemplate/asf.xml       | 1 +
 LUFA/StudioIntegration/lufa_common.xml        | 6 ------
 LUFA/StudioIntegration/lufa_drivers_board.xml | 6 ++++++
 4 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'LUFA')

diff --git a/LUFA/CodeTemplates/DeviceTemplate/asf.xml b/LUFA/CodeTemplates/DeviceTemplate/asf.xml
index 7689888df..0cceef9f0 100644
--- a/LUFA/CodeTemplates/DeviceTemplate/asf.xml
+++ b/LUFA/CodeTemplates/DeviceTemplate/asf.xml
@@ -1,6 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="USB Device Template" id="lufa.templates.device.project">
 		<require idref="lufa.templates.device"/>
+		<require idref="lufa.boards.dummy"/>
 		<generator value="as5_8_template"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/LUFA/CodeTemplates/HostTemplate/asf.xml b/LUFA/CodeTemplates/HostTemplate/asf.xml
index d6069f445..0c20c4b12 100644
--- a/LUFA/CodeTemplates/HostTemplate/asf.xml
+++ b/LUFA/CodeTemplates/HostTemplate/asf.xml
@@ -1,6 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="USB Host Template" id="lufa.templates.host.project">
 		<require idref="lufa.templates.host"/>
+		<require idref="lufa.boards.dummy"/>
 		<generator value="as5_8_template"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/LUFA/StudioIntegration/lufa_common.xml b/LUFA/StudioIntegration/lufa_common.xml
index d882ae82a..9e17b188b 100644
--- a/LUFA/StudioIntegration/lufa_common.xml
+++ b/LUFA/StudioIntegration/lufa_common.xml
@@ -29,12 +29,6 @@
 			<build type="header-file" value="Common/BoardTypes.h"/>
 			<build type="header-file" value="Common/CompilerSpecific.h"/>
 			<build type="header-file" value="Common/Endianness.h"/>
-
-			<require idref="lufa.common.dummyboard"/>
 		</module>
-
-		<board id="lufa.common.dummyboard" vendor="LUFA" caption="NONE">
-			<device-support value="avr"/>
-		</board>
 	</asf>
 </lufa>
diff --git a/LUFA/StudioIntegration/lufa_drivers_board.xml b/LUFA/StudioIntegration/lufa_drivers_board.xml
index 339cefec8..89b915183 100644
--- a/LUFA/StudioIntegration/lufa_drivers_board.xml
+++ b/LUFA/StudioIntegration/lufa_drivers_board.xml
@@ -10,6 +10,12 @@
 
 <lufa>
 	<asf>
+		<board id="lufa.boards.dummy" vendor="LUFA" caption="LUFA">
+			<device-support value="avr"/>
+
+			<require idref="lufa.drivers.board"/>
+		</board>
+
 		<module type="driver" id="lufa.drivers.board.leds" caption="LUFA Board LED Driver">
 			<device-support-alias value="lufa_avr8"/>
 			<device-support-alias value="lufa_xmega"/>
-- 
cgit v1.2.3