forksand
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.

Browse Source
pull/1469/head
Dean Camera 12 years ago
parent cff8a751bb
commit ed372b031c
6 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File

1
Demos/Device/ClassDriver/KeyboardMouseMultiReport/asf.xml
Unescape View File

@ -25,7 +25,6 @@
<build type="header-file" value="Descriptors.h"/> <build type="header-file" value="Descriptors.h"/>
<build type="module-config" subtype="path" value="Config"/> <build type="module-config" subtype="path" value="Config"/>
<build type="header-file" value="Config/AppConfig.h"/>
<build type="header-file" value="Config/LUFAConfig.h"/> <build type="header-file" value="Config/LUFAConfig.h"/>
<require idref="lufa.common"/> <require idref="lufa.common"/>

1
Demos/Device/ClassDriver/VirtualSerialMouse/asf.xml
Unescape View File

@ -27,7 +27,6 @@
<build type="header-file" value="Descriptors.h"/> <build type="header-file" value="Descriptors.h"/>
<build type="module-config" subtype="path" value="Config"/> <build type="module-config" subtype="path" value="Config"/>
<build type="header-file" value="Config/AppConfig.h"/>
<build type="header-file" value="Config/LUFAConfig.h"/> <build type="header-file" value="Config/LUFAConfig.h"/>
<require idref="lufa.common"/> <require idref="lufa.common"/>

4
Demos/Host/LowLevel/VirtualSerialHost/asf.xml
Unescape View File

@ -20,9 +20,9 @@
<device-support-alias value="lufa_uc3"/> <device-support-alias value="lufa_uc3"/>
<build type="c-source" value="VirtualSerialHost.c"/> <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="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="module-config" subtype="path" value="Config"/>
<build type="header-file" value="Config/LUFAConfig.h"/> <build type="header-file" value="Config/LUFAConfig.h"/>

14
LUFA/StudioIntegration/makefile
Unescape View File

@ -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) 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) 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: clean:
@rm $(TEMP_MANIFEST_XML) $(MODULE_OUTPUT_XML) $(EXTENSION_OUTPUT_XML) @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 @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." @echo "Atmel Studio VSIX Extension file generated."
check_filenames: $(TEMP_MANIFEST_XML) check_filenames: $(MODULE_OUTPUT_XML)
@for i in `xsltproc XSLT/lufa_filelist_transform.xslt $< | grep -v "^<" | sed -e "/^$$/d"`; do \ @echo Verifying referenced filenames of ASF.xml modules...
if ( ! test -f "$(LUFA_ROOT)/$$i" ); then \ @for f in `find $(LUFA_ROOT)/../ -name "asf.xml"`; do \
echo "Source file $$i does not exist!"; \ 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; \ exit 1; \
fi; \ fi; \
done; \
done; done;
@echo Verified referenced filenames of ASF.xml modules.
.PHONY: all clean generate_xml generate_vsix check_filenames .PHONY: all clean generate_xml generate_vsix check_filenames

2
Projects/Benito/asf.xml
Unescape View File

@ -23,7 +23,7 @@
<build type="c-source" value="Benito.c"/> <build type="c-source" value="Benito.c"/>
<build type="c-source" value="Descriptors.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="header-file" value="Descriptors.h"/>
<build type="module-config" subtype="path" value="Config"/> <build type="module-config" subtype="path" value="Config"/>

4
Projects/MissileLauncher/asf.xml
Unescape View File

@ -20,9 +20,9 @@
<device-support-alias value="lufa_uc3"/> <device-support-alias value="lufa_uc3"/>
<build type="c-source" value="MissileLauncher.c"/> <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="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="module-config" subtype="path" value="Config"/>
<build type="header-file" value="Config/LUFAConfig.h"/> <build type="header-file" value="Config/LUFAConfig.h"/>

Write Preview
Loading…
Cancel
Save