aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2013-01-10 20:14:38 +0000
committerDean Camera <dean@fourwalledcubicle.com>2013-01-10 20:14:38 +0000
commitbdd74a5ed92e74657c18f37648b6e031d040f47a (patch)
tree4c7b7a2b9f3a637884e50230025900403f739d13
parent5b5957f9ea99e036a22d687bbb3bb8b7fbe73599 (diff)
downloadlufa-bdd74a5ed92e74657c18f37648b6e031d040f47a.tar.gz
lufa-bdd74a5ed92e74657c18f37648b6e031d040f47a.tar.bz2
lufa-bdd74a5ed92e74657c18f37648b6e031d040f47a.zip
Fix invalid module IDs and update VSIX packing script to ensure the database cache files are always updated.
-rw-r--r--LUFA/StudioIntegration/makefile4
-rw-r--r--LUFA/makefile2
-rw-r--r--Projects/MIDIToneGenerator/asf.xml2
-rw-r--r--Projects/MediaController/asf.xml6
-rw-r--r--Projects/MissileLauncher/asf.xml6
-rw-r--r--Projects/RelayBoard/asf.xml2
6 files changed, 12 insertions, 10 deletions
diff --git a/LUFA/StudioIntegration/makefile b/LUFA/StudioIntegration/makefile
index 4f15dc48a..feec88a88 100644
--- a/LUFA/StudioIntegration/makefile
+++ b/LUFA/StudioIntegration/makefile
@@ -50,6 +50,8 @@ generate_xml: $(TEMP_MANIFEST_XML)
generate_vsix: $(EXTENSION_OUTPUT_XML) $(MODULE_OUTPUT_XML)
@echo "Generating ASF cache files..."
+ @rm -f $(LUFA_ROOT)/../content.xml.cache
+ @rm -f $(LUFA_ROOT)/../ExampleProjects.xml
@python generate_caches.py $(LUFA_ROOT)/../
@echo "Archiving Content..."
@@ -74,4 +76,4 @@ check_filenames: $(TEMP_MANIFEST_XML)
fi; \
done;
-.PHONY: all clean generate_xml check_filenames generate_vsix \ No newline at end of file
+.PHONY: all clean generate_xml generate_vsix check_filenames
diff --git a/LUFA/makefile b/LUFA/makefile
index 7fe59a20e..5461111ae 100644
--- a/LUFA/makefile
+++ b/LUFA/makefile
@@ -50,4 +50,4 @@ else
include Build/lufa_doxygen.mk
endif
-.PHONY: all export_tar version clean \ No newline at end of file
+.PHONY: all export_tar version clean
diff --git a/Projects/MIDIToneGenerator/asf.xml b/Projects/MIDIToneGenerator/asf.xml
index b69bb9459..dc8a602fb 100644
--- a/Projects/MIDIToneGenerator/asf.xml
+++ b/Projects/MIDIToneGenerator/asf.xml
@@ -31,6 +31,6 @@
<require idref="lufa.common"/>
<require idref="lufa.platform"/>
<require idref="lufa.drivers.usb"/>
- <require idref="lufa.drivers.leds"/>
+ <require idref="lufa.drivers.board.leds"/>
</module>
</asf>
diff --git a/Projects/MediaController/asf.xml b/Projects/MediaController/asf.xml
index 853d25261..45989f973 100644
--- a/Projects/MediaController/asf.xml
+++ b/Projects/MediaController/asf.xml
@@ -30,8 +30,8 @@
<require idref="lufa.common"/>
<require idref="lufa.platform"/>
<require idref="lufa.drivers.usb"/>
- <require idref="lufa.drivers.leds"/>
- <require idref="lufa.drivers.buttons"/>
- <require idref="lufa.drivers.joystick"/>
+ <require idref="lufa.drivers.board.leds"/>
+ <require idref="lufa.drivers.board.buttons"/>
+ <require idref="lufa.drivers.board.joystick"/>
</module>
</asf>
diff --git a/Projects/MissileLauncher/asf.xml b/Projects/MissileLauncher/asf.xml
index 166ebb32d..88527e519 100644
--- a/Projects/MissileLauncher/asf.xml
+++ b/Projects/MissileLauncher/asf.xml
@@ -30,8 +30,8 @@
<require idref="lufa.common"/>
<require idref="lufa.platform"/>
<require idref="lufa.drivers.usb"/>
- <require idref="lufa.drivers.buttons"/>
- <require idref="lufa.drivers.joystick"/>
- <require idref="lufa.drivers.leds"/>
+ <require idref="lufa.drivers.board.buttons"/>
+ <require idref="lufa.drivers.board.joystick"/>
+ <require idref="lufa.drivers.board.leds"/>
</module>
</asf>
diff --git a/Projects/RelayBoard/asf.xml b/Projects/RelayBoard/asf.xml
index 481628fec..7b9ae4200 100644
--- a/Projects/RelayBoard/asf.xml
+++ b/Projects/RelayBoard/asf.xml
@@ -30,6 +30,6 @@
<require idref="lufa.common"/>
<require idref="lufa.platform"/>
<require idref="lufa.drivers.usb"/>
- <require idref="lufa.drivers.leds"/>
+ <require idref="lufa.drivers.board.leds"/>
</module>
</asf>