Clean up VSIX generation scripts.

diff --git a/LUFA/StudioIntegration/ProjectGenerator/placeholder.txt b/LUFA/StudioIntegration/ProjectGenerator/placeholder.txt
index 381e193..e89b040 100644 (file)
--- a/LUFA/StudioIntegration/ProjectGenerator/placeholder.txt
+++ b/LUFA/StudioIntegration/ProjectGenerator/placeholder.txt
@@ -1 +1 @@
-This module requires the ASF Project Generator to be extracted into this directory (i.e. with the Python scripts in the current folder). The project generator can be extracted from the release versions of Atmel Studio's ASF extension.
\ No newline at end of file
+Copy the ASF Project Generator into this directory (i.e. with the Python scripts in the current folder). The project generator can be extracted from the release versions of Atmel Studio's ASF extension.
\ No newline at end of file

diff --git a/LUFA/StudioIntegration/makefile b/LUFA/StudioIntegration/makefile
index f665922..4f15dc4 100644 (file)
--- a/LUFA/StudioIntegration/makefile
+++ b/LUFA/StudioIntegration/makefile
@@ -48,12 +48,10 @@ generate_xml: $(TEMP_MANIFEST_XML)
 
        @rm $(TEMP_MANIFEST_XML)
 
 
        @rm $(TEMP_MANIFEST_XML)
 

-generate_caches: $(EXTENSION_OUTPUT_XML)
+generate_vsix: $(EXTENSION_OUTPUT_XML) $(MODULE_OUTPUT_XML)

        @echo "Generating ASF cache files..."
        @python generate_caches.py $(LUFA_ROOT)/../
        @echo "Generating ASF cache files..."
        @python generate_caches.py $(LUFA_ROOT)/../

-       @echo "ASF cache files generated."

 
 

-generate_vsix: $(EXTENSION_OUTPUT_XML) $(MODULE_OUTPUT_XML) generate_caches

        @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
 
        @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
 


@@ -76,4 +74,4 @@ check_filenames: $(TEMP_MANIFEST_XML)
                fi; \
        done;
 
                fi; \
        done;
 

-.PHONY: all clean generate_xml check_filenames generate_caches generate_vsix
\ No newline at end of file
+.PHONY: all clean generate_xml check_filenames generate_vsix
\ No newline at end of file

diff --git a/Maintenance/makefile b/Maintenance/makefile
index 3751f18..04d15d2 100644 (file)
--- a/Maintenance/makefile
+++ b/Maintenance/makefile
@@ -76,7 +76,6 @@ check-documentation-placeholders:
 # Validate the working branch - compile all documentation, demos/projects/examples and run build tests
 validate-branch:
        $(MAKE) -C $(patsubst %/,%,$(LUFA_ROOT)) doxygen
 # Validate the working branch - compile all documentation, demos/projects/examples and run build tests
 validate-branch:
        $(MAKE) -C $(patsubst %/,%,$(LUFA_ROOT)) doxygen

-       $(MAKE) -C $(patsubst %/,%,$(LUFA_ROOT))/LUFA/StudioIntegration all

        $(MAKE) -C $(patsubst %/,%,$(LUFA_ROOT)) all DEBUG_LEVEL=0
        $(MAKE) -C $(patsubst %/,%,$(LUFA_ROOT))/BuildTests all
 
        $(MAKE) -C $(patsubst %/,%,$(LUFA_ROOT)) all DEBUG_LEVEL=0
        $(MAKE) -C $(patsubst %/,%,$(LUFA_ROOT))/BuildTests all