X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/ebd059d0eb07055d3d949f53ba284e23eac23bc6..eefbf632d6bdfdee942d3334fea6e7a96e092dde:/LUFA/StudioIntegration/makefile?ds=sidebyside

diff --git a/LUFA/StudioIntegration/makefile b/LUFA/StudioIntegration/makefile
index 8c0595f65..58f429576 100644
--- a/LUFA/StudioIntegration/makefile
+++ b/LUFA/StudioIntegration/makefile
@@ -22,8 +22,8 @@ ifneq ($(LUFA_VERSION_NUM),000000)
   EXT_VERSION_NUM    := $(shell date +"%y.%m.%d").$(LUFA_VERSION_NUM)
   EXT_VSIX_NAME      := LUFA-RELEASE-$(LUFA_VERSION_NUM).vsix
 else
-  EXT_VERSION_NUM    := 0.$(shell date +"%y%m%d-%H%M%S")
-  EXT_VSIX_NAME      := LUFA-TESTING-$(shell date +"%y.%m.%d.%H.%M.%S").vsix
+  EXT_VERSION_NUM    := 0.$(shell date +"%y%m%d.%H%M%S")
+  EXT_VSIX_NAME      := LUFA-TESTING-$(shell date +"%y.%m.%d-%H.%M.%S").vsix
 
   $(warning No LUFA version set - assuming a test version should be created.)
 endif
@@ -34,7 +34,7 @@ clean:
 	@rm -f $(TEMP_MANIFEST_XML) $(MODULE_OUTPUT_XML) $(EXTENSION_OUTPUT_XML) $(DOXYGEN_TAG_FILE_XML) $(DOXYGEN_COMBINED_XML)
 
 $(DOXYGEN_TAG_FILE_XML):
-	$(MAKE) -C ../ doxygen DOXYGEN_OVERRIDE_PARAMS="GENERATE_TAGFILE=Documentation/lufa_doc_tags.xml GENERATE_XML=yes"
+	$(MAKE) -C ../ doxygen DOXYGEN_OVERRIDE_PARAMS="GENERATE_TAGFILE=Documentation/lufa_doc_tags.xml GENERATE_HTML=no GENERATE_XML=yes"
 
 $(DOXYGEN_COMBINED_XML): $(DOXYGEN_TAG_FILE_XML)
 	@xsltproc $(dir $@)/combine.xslt $(dir $@)/index.xml > $(DOXYGEN_COMBINED_XML)
@@ -52,11 +52,11 @@ $(TEMP_MANIFEST_XML): $(DOXYGEN_TAG_FILE_XML) $(DOXYGEN_COMBINED_XML)
 
 generate_xml: $(TEMP_MANIFEST_XML)
 	@echo "Processing asf.xml file..."
-	@xsltproc XSLT/lufa_module_transform.xslt $< | xsltproc XSLT/lufa_indent_transform.xslt - > $(MODULE_OUTPUT_XML)
+	@xsltproc XDK/lufa_module_transform.xslt $< | xsltproc XDK/lufa_indent_transform.xslt - > $(MODULE_OUTPUT_XML)
 	@echo "Atmel Studio asf.xml file generated."
 
 	@echo "Processing extension.xml file..."
-	@xsltproc XSLT/lufa_extension_transform.xslt $< | xsltproc XSLT/lufa_indent_transform.xslt - > $(EXTENSION_OUTPUT_XML)
+	@xsltproc XDK/lufa_extension_transform.xslt $< | xsltproc XDK/lufa_indent_transform.xslt - > $(EXTENSION_OUTPUT_XML)
 	@echo "Atmel Studio extension.xml file generated."
 
 	@rm $(TEMP_MANIFEST_XML)
@@ -68,7 +68,7 @@ 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)/../
+	@python VSIX/generate_caches.py $(LUFA_ROOT)/../
 
 	@echo "Archiving Content..."
 	@rm -f contents.zip
@@ -79,11 +79,18 @@ generate_vsix: $(EXTENSION_OUTPUT_XML) $(MODULE_OUTPUT_XML)
 	@cp $(LUFA_ROOT)/DoxygenPages/Images/LUFA.png $(LUFA_ROOT)/../Preview.png
 	@cp $(LUFA_ROOT)/License.txt $(LUFA_ROOT)/../
 	@cp "VSIX/[Content_Types].xml" $(LUFA_ROOT)/../
-	@xsltproc --stringparam extension-version "$(EXT_VERSION_NUM)" XSLT/lufa_vsmanifest_transform.xslt VSIX/extension.vsixmanifest > $(LUFA_ROOT)/../extension.vsixmanifest
-	@xsltproc --stringparam lufa-version "$(LUFA_VERSION_NUM)" XSLT/lufa_asfmanifest_transform.xslt VSIX/asf-manifest.xml > $(LUFA_ROOT)/../asf-manifest.xml
+	@cp "VSIX/ASFExplorer.png" $(LUFA_ROOT)/../
+	@cp "VSIX/ASFWizard.png" $(LUFA_ROOT)/../
+	@cp "VSIX/NewExampleWizard.png" $(LUFA_ROOT)/../
+	@cp "VSIX/GettingStarted.htm" $(LUFA_ROOT)/../
+	@cp "Blob/Atmel.Studio.Services.Interfaces.dll" $(LUFA_ROOT)/../
+	@cp "Blob/LUFA.dll" $(LUFA_ROOT)/../
+	@cp "Blob/LUFA.pkgdef" $(LUFA_ROOT)/../
+	@xsltproc --stringparam extension-version "$(EXT_VERSION_NUM)" VSIX/lufa_vsmanifest_transform.xslt VSIX/extension.vsixmanifest > $(LUFA_ROOT)/../extension.vsixmanifest
+	@xsltproc --stringparam lufa-version "$(LUFA_VERSION_NUM)" VSIX/lufa_asfmanifest_transform.xslt VSIX/asf-manifest.xml > $(LUFA_ROOT)/../asf-manifest.xml
 
 	@echo "Generating Atmel Studio VSIX Extension file..."
-	@cd $(LUFA_ROOT)/../ && zip $(EXT_VSIX_NAME) -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
+	@cd $(LUFA_ROOT)/../ && zip $(EXT_VSIX_NAME) -q -9 contents.zip exampleProjects.xml content.xml.cache License.txt Preview.png PreviewThumb.png "[Content_Types].xml" ASFExplorer.png ASFWizard.png NewExampleWizard.png GettingStarted.htm extension.vsixmanifest asf-manifest.xml extension.xml LUFA.dll LUFA.pkgdef Atmel.Studio.Services.Interfaces.dll
 	@echo "Atmel Studio VSIX Extension file generated."
 
 check_filenames: $(MODULE_OUTPUT_XML)
@@ -91,7 +98,7 @@ check_filenames: $(MODULE_OUTPUT_XML)
 	@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 \
+		xsltproc XDK/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; \