Add APIs to the incomplete Mass Storage bootloader.

[pub/USBasp.git] / LUFA / StudioIntegration / makefile

diff --git a/LUFA/StudioIntegration/makefile b/LUFA/StudioIntegration/makefile
index c0fd278..9dee437 100644 (file)
--- a/LUFA/StudioIntegration/makefile
+++ b/LUFA/StudioIntegration/makefile
@@ -21,10 +21,10 @@ EXT_VERSION_NUM      := $(shell date +"%y.%m.%d").$(LUFA_VERSION_NUM)
 all: generate_xml check_filenames generate_vsix
 
 clean:
 all: generate_xml check_filenames generate_vsix
 
 clean:

-       @rm $(TEMP_MANIFEST_XML) $(MODULE_OUTPUT_XML) $(EXTENSION_OUTPUT_XML)
+       @rm -f $(TEMP_MANIFEST_XML) $(MODULE_OUTPUT_XML) $(EXTENSION_OUTPUT_XML)

 
 $(DOXYGEN_TAG_FILE_XML):
 
 $(DOXYGEN_TAG_FILE_XML):

-       make -C ../ doxygen
+       $(MAKE) -C ../ doxygen

 
 $(TEMP_MANIFEST_XML): $(DOXYGEN_TAG_FILE_XML)
        @echo "Generating Manifest XML..."
 
 $(TEMP_MANIFEST_XML): $(DOXYGEN_TAG_FILE_XML)
        @echo "Generating Manifest XML..."


@@ -55,7 +55,7 @@ generate_vsix: $(EXTENSION_OUTPUT_XML) $(MODULE_OUTPUT_XML)
        @python generate_caches.py $(LUFA_ROOT)/../
 
        @echo "Archiving Content..."
        @python generate_caches.py $(LUFA_ROOT)/../
 
        @echo "Archiving Content..."

-       @cd $(LUFA_ROOT)/../ && zip contents.zip -q -9 -r --exclude=*$(notdir $(DOXYGEN_TAG_FILE_XML)) --exclude=*StudioIntegration* LUFA Bootloaders Demos Projects extension.xml README.txt
+       @cd $(LUFA_ROOT)/../ && zip contents.zip -q -0 -r --exclude=*Documentation* --exclude=*StudioIntegration* LUFA Bootloaders Demos Projects extension.xml README.txt

 
        @echo "Creating VSIX Dependencies..."
        @cp $(LUFA_ROOT)/DoxygenPages/Images/LUFA_thumb.png $(LUFA_ROOT)/../PreviewThumb.png
 
        @echo "Creating VSIX Dependencies..."
        @cp $(LUFA_ROOT)/DoxygenPages/Images/LUFA_thumb.png $(LUFA_ROOT)/../PreviewThumb.png


@@ -66,18 +66,20 @@ generate_vsix: $(EXTENSION_OUTPUT_XML) $(MODULE_OUTPUT_XML)
        @xsltproc --stringparam lufa-version "$(LUFA_VERSION_NUM)" XSLT/lufa_asfmanifest_transform.xslt VSIX/asf-manifest.xml > $(LUFA_ROOT)/../asf-manifest.xml
 
        @echo "Generating Atmel Studio VSIX Extension file..."
        @xsltproc --stringparam lufa-version "$(LUFA_VERSION_NUM)" XSLT/lufa_asfmanifest_transform.xslt VSIX/asf-manifest.xml > $(LUFA_ROOT)/../asf-manifest.xml
 
        @echo "Generating Atmel Studio VSIX Extension file..."

-       @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-$(LUFA_VERSION_NUM).vsix -q -9 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: $(MODULE_OUTPUT_XML)
        @echo Verifying referenced filenames of ASF.xml modules...
        @for f in `find $(LUFA_ROOT)/../ -name "asf.xml"`; do \
        @echo "Atmel Studio VSIX Extension file generated."
 
 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!"; \
+               echo "Checking $$f..."; \
+               asf_file_dir=`dirname $$f`; \
+               xsltproc XSLT/lufa_filelist_transform.xslt $$f | sed -e "/^$$/d" | while read -r i; do \
+                       if ( ! test -f "$$asf_file_dir/$$i" ); then \
+                               echo "Source file \"$$i\" referenced in $$f does not exist!"; \

                                exit 1; \
                        fi; \
                                exit 1; \
                        fi; \

-               done; \
+               done || exit 1; \

        done;
        @echo Verified referenced filenames of ASF.xml modules.
 
        done;
        @echo Verified referenced filenames of ASF.xml modules.