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

pull/1469/head
Dean Camera 12 years ago
parent eac6205747
commit bbffe94a9d

@ -10,11 +10,26 @@ import sys
import os import os
sys.path.append("ProjectGenerator") sys.path.append("ProjectGenerator")
try:
def main():
try:
from asf_avrstudio5_interface import PythonFacade from asf_avrstudio5_interface import PythonFacade
except ImportError: except ImportError:
print "The ASF project generator is missing." 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."
p = PythonFacade(os.path.abspath(__file__)) if __name__ == "__main__":
p.check_extension_database_sanity(sys.argv[1]) sys.exit(main())
p.generate_extension_cache_files(sys.argv[1])

@ -53,7 +53,7 @@ generate_vsix: $(EXTENSION_OUTPUT_XML) $(MODULE_OUTPUT_XML)
@python generate_caches.py $(LUFA_ROOT)/../ @python generate_caches.py $(LUFA_ROOT)/../
@echo "Archiving Content..." @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..." @echo "Creating VSIX Dependencies..."
@cp $(LUFA_ROOT)/DoxygenPages/Images/LUFA_thumb.png $(LUFA_ROOT)/../PreviewThumb.png @cp $(LUFA_ROOT)/DoxygenPages/Images/LUFA_thumb.png $(LUFA_ROOT)/../PreviewThumb.png

Loading…
Cancel
Save