From bbffe94a9d425128aa4f403d285a1a848e00b4a5 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Wed, 9 Jan 2013 20:42:14 +0000 Subject: Ensure the VSIX Python script aborts if the ASF project generator is missing. --- LUFA/StudioIntegration/generate_caches.py | 31 +++++++++++++++++++++++-------- LUFA/StudioIntegration/makefile | 2 +- 2 files changed, 24 insertions(+), 9 deletions(-) (limited to 'LUFA') diff --git a/LUFA/StudioIntegration/generate_caches.py b/LUFA/StudioIntegration/generate_caches.py index 033ae28dd..1e49320ae 100644 --- a/LUFA/StudioIntegration/generate_caches.py +++ b/LUFA/StudioIntegration/generate_caches.py @@ -10,11 +10,26 @@ import sys import os sys.path.append("ProjectGenerator") -try: - from asf_avrstudio5_interface import PythonFacade -except ImportError: - print "The ASF project generator is missing." - -p = PythonFacade(os.path.abspath(__file__)) -p.check_extension_database_sanity(sys.argv[1]) -p.generate_extension_cache_files(sys.argv[1]) + +def main(): + try: + from asf_avrstudio5_interface import PythonFacade + except ImportError: + print "The ASF project generator is missing." + sys.exit() + + p = PythonFacade(os.path.abspath(__file__)) + + print "[Project Generator] Checking database sanity..." + sys.stdout.flush() + p.check_extension_database_sanity(sys.argv[1]) + + print "[Project Generator] Building cache files..." + sys.stdout.flush() + p.generate_extension_cache_files(sys.argv[1]) + + print "[Project Generator] Cache files created." + + +if __name__ == "__main__": + sys.exit(main()) \ No newline at end of file diff --git a/LUFA/StudioIntegration/makefile b/LUFA/StudioIntegration/makefile index 4f15dc48a..53b61a396 100644 --- 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..." - @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 -- cgit v1.2.3