ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1941 from 0xc0170/fix_iar_extension 

Update progen to v0.9.x
pull/1942/head
Sam Grove 2016-06-14 23:15:45 +01:00 committed by GitHub
parent 9b5adb8cd1 ee924a835e
commit e6f31879bf
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
requirements.txt
View File

@ -4,7 +4,7 @@ pyserial
IntelHex IntelHex
mbed-ls mbed-ls
mbed-greentea mbed-greentea
project-generator>=0.8.11,<0.9.0 project-generator>=0.9.3,<0.10.0
Jinja2 Jinja2
junit-xml junit-xml
requests requests

2
setup.py
View File

@ -40,7 +40,7 @@ setup(name='mbed-tools',
url='https://github.com/mbedmicro/mbed', url='https://github.com/mbedmicro/mbed',
packages=find_packages(), packages=find_packages(),
license=LICENSE, license=LICENSE,
install_requires=["PrettyTable>=0.7.2", "PySerial>=2.7", "IntelHex>=1.3", "colorama>=0.3.3", "Jinja2>=2.7.3", "project-generator>=0.8.11,<0.9.0", "junit-xml", "requests", "pyYAML"]) install_requires=["PrettyTable>=0.7.2", "PySerial>=2.7", "IntelHex>=1.3", "colorama>=0.3.3", "Jinja2>=2.7.3", "project-generator>=0.9.3,<0.10.0", "junit-xml", "requests", "pyYAML"])
# Restore previous mbed_settings if needed # Restore previous mbed_settings if needed
if backup: if backup:

2
tools/export/iar_template.ewp.tmpl
View File

@ -402,7 +402,7 @@
</option> </option>
<option> <option>
<name>IccAllowVLA</name> <name>IccAllowVLA</name>
<state>1</state> <state>0</state>
</option> </option>
<option> <option>
<name>IccCppDialect</name> <name>IccCppDialect</name>