Fix invalid module IDs and update VSIX packing script to ensure the database cache...

diff --git a/LUFA/StudioIntegration/makefile b/LUFA/StudioIntegration/makefile
index 4f15dc4..feec88a 100644 (file)
--- 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..."
 
 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..."
        @python generate_caches.py $(LUFA_ROOT)/../
 
        @echo "Archiving Content..."


@@ -74,4 +76,4 @@ check_filenames: $(TEMP_MANIFEST_XML)
                fi; \
        done;
 
                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 7fe59a2..5461111 100644 (file)
--- a/LUFA/makefile
+++ b/LUFA/makefile
@@ -50,4 +50,4 @@ else
   include Build/lufa_doxygen.mk
 endif
 
   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 b69bb94..dc8a602 100644 (file)
--- a/Projects/MIDIToneGenerator/asf.xml
+++ b/Projects/MIDIToneGenerator/asf.xml
@@ -31,6 +31,6 @@
                <require idref="lufa.common"/>\r
                <require idref="lufa.platform"/>\r
                <require idref="lufa.drivers.usb"/>\r
                <require idref="lufa.common"/>\r
                <require idref="lufa.platform"/>\r
                <require idref="lufa.drivers.usb"/>\r

-               <require idref="lufa.drivers.leds"/>\r
+               <require idref="lufa.drivers.board.leds"/>\r

        </module>\r
 </asf>\r
        </module>\r
 </asf>\r

diff --git a/Projects/MediaController/asf.xml b/Projects/MediaController/asf.xml
index 853d252..45989f9 100644 (file)
--- a/Projects/MediaController/asf.xml
+++ b/Projects/MediaController/asf.xml
@@ -30,8 +30,8 @@
                <require idref="lufa.common"/>\r
                <require idref="lufa.platform"/>\r
                <require idref="lufa.drivers.usb"/>\r
                <require idref="lufa.common"/>\r
                <require idref="lufa.platform"/>\r
                <require idref="lufa.drivers.usb"/>\r

-               <require idref="lufa.drivers.leds"/>\r
-               <require idref="lufa.drivers.buttons"/>\r
-               <require idref="lufa.drivers.joystick"/>\r
+               <require idref="lufa.drivers.board.leds"/>\r
+               <require idref="lufa.drivers.board.buttons"/>\r
+               <require idref="lufa.drivers.board.joystick"/>\r

        </module>\r
 </asf>\r
        </module>\r
 </asf>\r

diff --git a/Projects/MissileLauncher/asf.xml b/Projects/MissileLauncher/asf.xml
index 166ebb3..88527e5 100644 (file)
--- a/Projects/MissileLauncher/asf.xml
+++ b/Projects/MissileLauncher/asf.xml
@@ -30,8 +30,8 @@
                <require idref="lufa.common"/>\r
                <require idref="lufa.platform"/>\r
                <require idref="lufa.drivers.usb"/>\r
                <require idref="lufa.common"/>\r
                <require idref="lufa.platform"/>\r
                <require idref="lufa.drivers.usb"/>\r

-               <require idref="lufa.drivers.buttons"/>\r
-               <require idref="lufa.drivers.joystick"/>\r
-               <require idref="lufa.drivers.leds"/>\r
+               <require idref="lufa.drivers.board.buttons"/>\r
+               <require idref="lufa.drivers.board.joystick"/>\r
+               <require idref="lufa.drivers.board.leds"/>\r

        </module>\r
 </asf>\r
        </module>\r
 </asf>\r

diff --git a/Projects/RelayBoard/asf.xml b/Projects/RelayBoard/asf.xml
index 481628f..7b9ae42 100644 (file)
--- a/Projects/RelayBoard/asf.xml
+++ b/Projects/RelayBoard/asf.xml
@@ -30,6 +30,6 @@
                <require idref="lufa.common"/>\r
                <require idref="lufa.platform"/>\r
                <require idref="lufa.drivers.usb"/>\r
                <require idref="lufa.common"/>\r
                <require idref="lufa.platform"/>\r
                <require idref="lufa.drivers.usb"/>\r

-               <require idref="lufa.drivers.leds"/>\r
+               <require idref="lufa.drivers.board.leds"/>\r

        </module>\r
 </asf>\r
        </module>\r
 </asf>\r