X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/5b5957f9ea99e036a22d687bbb3bb8b7fbe73599..4753528b9eb136863d49b5ad5e66c55e78a4b81b:/LUFA/StudioIntegration/makefile

diff --git a/LUFA/StudioIntegration/makefile b/LUFA/StudioIntegration/makefile
index 4f15dc48a..9dee43797 100644
--- a/LUFA/StudioIntegration/makefile
+++ b/LUFA/StudioIntegration/makefile
@@ -18,13 +18,13 @@ 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)
+	@rm -f $(TEMP_MANIFEST_XML) $(MODULE_OUTPUT_XML) $(EXTENSION_OUTPUT_XML)
 
 $(DOXYGEN_TAG_FILE_XML):
-	make -C ../ doxygen
+	$(MAKE) -C ../ doxygen
 
 $(TEMP_MANIFEST_XML): $(DOXYGEN_TAG_FILE_XML)
 	@echo "Generating Manifest XML..."
@@ -50,10 +50,12 @@ 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..."
-	@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
@@ -64,14 +66,21 @@ 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..."
-	@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: $(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!"; \
-		fi; \
+check_filenames: $(MODULE_OUTPUT_XML)
+	@echo Verifying referenced filenames of ASF.xml modules...
+	@for f in `find $(LUFA_ROOT)/../ -name "asf.xml"`; do \
+		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; \
+		done || exit 1; \
 	done;
+	@echo Verified referenced filenames of ASF.xml modules.
 
-.PHONY: all clean generate_xml check_filenames generate_vsix
\ No newline at end of file
+.PHONY: all clean generate_xml generate_vsix check_filenames