diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2013-01-11 22:43:17 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2013-01-11 22:43:17 +0000 |
| commit | ed372b031c75fdc206844b3e9b01ce837193ac80 (patch) | |
| tree | 82c555b479feb70d9a6b758bcdff8fc9a239db67 | |
| parent | cff8a751bb4b6174bfc226dee72bec9cb9363122 (diff) | |
| download | lufa-ed372b031c75fdc206844b3e9b01ce837193ac80.tar.gz lufa-ed372b031c75fdc206844b3e9b01ce837193ac80.tar.bz2 lufa-ed372b031c75fdc206844b3e9b01ce837193ac80.zip | |
Alter VSIX build script to verify all referenced filenames in all modules and projects, rather than just the core modules. Fix discovered errors in the project XML files.
| -rw-r--r-- | Demos/Device/ClassDriver/KeyboardMouseMultiReport/asf.xml | 1 | ||||
| -rw-r--r-- | Demos/Device/ClassDriver/VirtualSerialMouse/asf.xml | 1 | ||||
| -rw-r--r-- | Demos/Host/LowLevel/VirtualSerialHost/asf.xml | 4 | ||||
| -rw-r--r-- | LUFA/StudioIntegration/makefile | 18 | ||||
| -rw-r--r-- | Projects/Benito/asf.xml | 2 | ||||
| -rw-r--r-- | Projects/MissileLauncher/asf.xml | 4 |
6 files changed, 16 insertions, 14 deletions
diff --git a/Demos/Device/ClassDriver/KeyboardMouseMultiReport/asf.xml b/Demos/Device/ClassDriver/KeyboardMouseMultiReport/asf.xml index 57fea7ee3..62276cb44 100644 --- a/Demos/Device/ClassDriver/KeyboardMouseMultiReport/asf.xml +++ b/Demos/Device/ClassDriver/KeyboardMouseMultiReport/asf.xml @@ -25,7 +25,6 @@ <build type="header-file" value="Descriptors.h"/>
<build type="module-config" subtype="path" value="Config"/>
- <build type="header-file" value="Config/AppConfig.h"/>
<build type="header-file" value="Config/LUFAConfig.h"/>
<require idref="lufa.common"/>
diff --git a/Demos/Device/ClassDriver/VirtualSerialMouse/asf.xml b/Demos/Device/ClassDriver/VirtualSerialMouse/asf.xml index 3010145cd..458611325 100644 --- a/Demos/Device/ClassDriver/VirtualSerialMouse/asf.xml +++ b/Demos/Device/ClassDriver/VirtualSerialMouse/asf.xml @@ -27,7 +27,6 @@ <build type="header-file" value="Descriptors.h"/>
<build type="module-config" subtype="path" value="Config"/>
- <build type="header-file" value="Config/AppConfig.h"/>
<build type="header-file" value="Config/LUFAConfig.h"/>
<require idref="lufa.common"/>
diff --git a/Demos/Host/LowLevel/VirtualSerialHost/asf.xml b/Demos/Host/LowLevel/VirtualSerialHost/asf.xml index 8a43be128..1c5f78f81 100644 --- a/Demos/Host/LowLevel/VirtualSerialHost/asf.xml +++ b/Demos/Host/LowLevel/VirtualSerialHost/asf.xml @@ -20,9 +20,9 @@ <device-support-alias value="lufa_uc3"/>
<build type="c-source" value="VirtualSerialHost.c"/>
- <build type="c-source" value="ConfigDescriptors.c"/>
+ <build type="c-source" value="ConfigDescriptor.c"/>
<build type="header-file" value="VirtualSerialHost.h"/>
- <build type="header-file" value="ConfigDescriptors.h"/>
+ <build type="header-file" value="ConfigDescriptor.h"/>
<build type="module-config" subtype="path" value="Config"/>
<build type="header-file" value="Config/LUFAConfig.h"/>
diff --git a/LUFA/StudioIntegration/makefile b/LUFA/StudioIntegration/makefile index 49f3c35e3..c0fd278af 100644 --- a/LUFA/StudioIntegration/makefile +++ b/LUFA/StudioIntegration/makefile @@ -18,7 +18,7 @@ XML_FILES := $(filter-out $(TEMP_MANIFEST_FILE), $(shell ls *.xml)) LUFA_VERSION_NUM := $(shell grep LUFA_VERSION_STRING $(LUFA_ROOT)/Version.h | cut -d'"' -f2) EXT_VERSION_NUM := $(shell date +"%y.%m.%d").$(LUFA_VERSION_NUM) -all: check_filenames generate_xml generate_vsix +all: generate_xml check_filenames generate_vsix clean: @rm $(TEMP_MANIFEST_XML) $(MODULE_OUTPUT_XML) $(EXTENSION_OUTPUT_XML) @@ -69,12 +69,16 @@ generate_vsix: $(EXTENSION_OUTPUT_XML) $(MODULE_OUTPUT_XML) @cd $(LUFA_ROOT)/../ && zip LUFA.vsix -q contents.zip exampleProjects.xml content.xml.cache License.txt Preview.png PreviewThumb.png "[Content_Types].xml" extension.vsixmanifest asf-manifest.xml extension.xml @echo "Atmel Studio VSIX Extension file generated." -check_filenames: $(TEMP_MANIFEST_XML) - @for i in `xsltproc XSLT/lufa_filelist_transform.xslt $< | grep -v "^<" | sed -e "/^$$/d"`; do \ - if ( ! test -f "$(LUFA_ROOT)/$$i" ); then \ - echo "Source file $$i does not exist!"; \ - exit 1; \ - fi; \ +check_filenames: $(MODULE_OUTPUT_XML) + @echo Verifying referenced filenames of ASF.xml modules... + @for f in `find $(LUFA_ROOT)/../ -name "asf.xml"`; do \ + for i in `xsltproc XSLT/lufa_filelist_transform.xslt $$f | grep -v "^<" | sed -e "/^$$/d"`; do \ + if ( ! test -f "`dirname $$f`/$$i" ); then \ + echo "Source file $$i referenced in $$f does not exist!"; \ + exit 1; \ + fi; \ + done; \ done; + @echo Verified referenced filenames of ASF.xml modules. .PHONY: all clean generate_xml generate_vsix check_filenames diff --git a/Projects/Benito/asf.xml b/Projects/Benito/asf.xml index c639a51c7..b913fb5ef 100644 --- a/Projects/Benito/asf.xml +++ b/Projects/Benito/asf.xml @@ -23,7 +23,7 @@ <build type="c-source" value="Benito.c"/>
<build type="c-source" value="Descriptors.c"/>
- <build type="header-file" value="Bentio.h"/>
+ <build type="header-file" value="Benito.h"/>
<build type="header-file" value="Descriptors.h"/>
<build type="module-config" subtype="path" value="Config"/>
diff --git a/Projects/MissileLauncher/asf.xml b/Projects/MissileLauncher/asf.xml index 38732c182..52d96e5bd 100644 --- a/Projects/MissileLauncher/asf.xml +++ b/Projects/MissileLauncher/asf.xml @@ -20,9 +20,9 @@ <device-support-alias value="lufa_uc3"/>
<build type="c-source" value="MissileLauncher.c"/>
- <build type="c-source" value="ConfigDescriptors.c"/>
+ <build type="c-source" value="ConfigDescriptor.c"/>
<build type="header-file" value="MissileLauncher.h"/>
- <build type="header-file" value="ConfigDescriptors.h"/>
+ <build type="header-file" value="ConfigDescriptor.h"/>
<build type="module-config" subtype="path" value="Config"/>
<build type="header-file" value="Config/LUFAConfig.h"/>
|