Ensure the VSIX Python script aborts if the ASF project generator is missing.

diff --git a/LUFA/StudioIntegration/generate_caches.py b/LUFA/StudioIntegration/generate_caches.py
index 033ae28..1e49320 100644 (file)
--- a/LUFA/StudioIntegration/generate_caches.py
+++ b/LUFA/StudioIntegration/generate_caches.py
@@ -10,11 +10,26 @@ import sys
 import os\r
 sys.path.append("ProjectGenerator")\r
 \r
 import os\r
 sys.path.append("ProjectGenerator")\r
 \r

-try:\r
-       from asf_avrstudio5_interface import PythonFacade\r
-except ImportError:\r
-       print "The ASF project generator is missing."\r
-\r
-p = PythonFacade(os.path.abspath(__file__))\r
-p.check_extension_database_sanity(sys.argv[1])\r
-p.generate_extension_cache_files(sys.argv[1])\r
+\r
+def main():\r
+       try:\r
+               from asf_avrstudio5_interface import PythonFacade\r
+       except ImportError:\r
+               print "The ASF project generator is missing."\r
+               sys.exit()\r
+\r
+       p = PythonFacade(os.path.abspath(__file__))\r
+\r
+       print "[Project Generator] Checking database sanity..."\r
+       sys.stdout.flush()\r
+       p.check_extension_database_sanity(sys.argv[1])\r
+\r
+       print "[Project Generator] Building cache files..."\r
+       sys.stdout.flush()\r
+       p.generate_extension_cache_files(sys.argv[1])\r
+\r
+       print "[Project Generator] Cache files created."\r
+\r
+\r
+if __name__ == "__main__":\r
+    sys.exit(main())
\ No newline at end of file

diff --git a/LUFA/StudioIntegration/makefile b/LUFA/StudioIntegration/makefile
index 4f15dc4..53b61a3 100644 (file)
--- a/LUFA/StudioIntegration/makefile
+++ b/LUFA/StudioIntegration/makefile
@@ -53,7 +53,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 -9 -r --exclude=*$(notdir $(DOXYGEN_TAG_FILE_XML)) --exclude=*StudioIntegration* --exclude=*Maintenance* 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