From 08f74957a405cb26daeb9ce8d85b7495c13ee9c1 Mon Sep 17 00:00:00 2001 From: Joris Aerts Date: Wed, 18 Sep 2013 09:48:56 -0700 Subject: [PATCH] Add missing --c99 flag to uVision LPC11U24 and LPC1347 projects Fix indentation in other templates --- .../export/uvision4_kl25z.uvproj.tmpl | 39 ++++++++-------- .../export/uvision4_lpc1114.uvproj.tmpl | 22 ++++----- .../export/uvision4_lpc11u24.uvproj.tmpl | 30 ++++++++----- .../export/uvision4_lpc1347.uvproj.tmpl | 30 ++++++++----- .../export/uvision4_lpc1768.uvproj.tmpl | 45 +++++++++---------- .../export/uvision4_lpc4088.uvproj.tmpl | 45 +++++++++---------- .../export/uvision4_lpc812.uvproj.tmpl | 39 ++++++++-------- 7 files changed, 129 insertions(+), 121 deletions(-) diff --git a/workspace_tools/export/uvision4_kl25z.uvproj.tmpl b/workspace_tools/export/uvision4_kl25z.uvproj.tmpl index 7ed0ff70ad..90964b490e 100644 --- a/workspace_tools/export/uvision4_kl25z.uvproj.tmpl +++ b/workspace_tools/export/uvision4_kl25z.uvproj.tmpl @@ -382,7 +382,7 @@ {% for file in object_files %} - {{file}} + {{file}} {% endfor %} @@ -394,25 +394,24 @@ src - {% for file in source_files %} - - {{file.name}} - {{file.type}} - {{file.path}} - {%if file.type == "1" %} - - - - - --c99 - - - - - {% endif %} - - {% endfor %} - + {% for file in source_files %} + + {{file.name}} + {{file.type}} + {{file.path}} + {%if file.type == "1" %} + + + + + --c99 + + + + + {% endif %} + + {% endfor %} diff --git a/workspace_tools/export/uvision4_lpc1114.uvproj.tmpl b/workspace_tools/export/uvision4_lpc1114.uvproj.tmpl index eb95fa5c1f..713c9299f3 100644 --- a/workspace_tools/export/uvision4_lpc1114.uvproj.tmpl +++ b/workspace_tools/export/uvision4_lpc1114.uvproj.tmpl @@ -383,9 +383,9 @@ - {% for file in object_files %} + {% for file in object_files %} {{file}} - {% endfor %} + {% endfor %} @@ -396,24 +396,24 @@ src - {% for file in source_files %} + {% for file in source_files %} {{file.name}} {{file.type}} {{file.path}} {%if file.type == "1" %} - - - - --c99 - - - + + + + --c99 + + + {% endif %} - {% endfor %} + {% endfor %} diff --git a/workspace_tools/export/uvision4_lpc11u24.uvproj.tmpl b/workspace_tools/export/uvision4_lpc11u24.uvproj.tmpl index b139402c83..26468dd776 100644 --- a/workspace_tools/export/uvision4_lpc11u24.uvproj.tmpl +++ b/workspace_tools/export/uvision4_lpc11u24.uvproj.tmpl @@ -378,7 +378,7 @@ {% for file in object_files %} - {{file}} + {{file}} {% endfor %} @@ -390,14 +390,24 @@ src - {% for file in source_files %} - - {{file.name}} - {{file.type}} - {{file.path}} - - {% endfor %} - + {% for file in source_files %} + + {{file.name}} + {{file.type}} + {{file.path}} + {%if file.type == "1" %} + + + + + --c99 + + + + + {% endif %} + + {% endfor %} @@ -405,5 +415,3 @@ - - diff --git a/workspace_tools/export/uvision4_lpc1347.uvproj.tmpl b/workspace_tools/export/uvision4_lpc1347.uvproj.tmpl index caee2b356d..19792091d3 100644 --- a/workspace_tools/export/uvision4_lpc1347.uvproj.tmpl +++ b/workspace_tools/export/uvision4_lpc1347.uvproj.tmpl @@ -379,7 +379,7 @@ {% for file in object_files %} - {{file}} + {{file}} {% endfor %} @@ -391,14 +391,24 @@ src - {% for file in source_files %} - - {{file.name}} - {{file.type}} - {{file.path}} - - {% endfor %} - + {% for file in source_files %} + + {{file.name}} + {{file.type}} + {{file.path}} + {%if file.type == "1" %} + + + + + --c99 + + + + + {% endif %} + + {% endfor %} @@ -406,5 +416,3 @@ - - diff --git a/workspace_tools/export/uvision4_lpc1768.uvproj.tmpl b/workspace_tools/export/uvision4_lpc1768.uvproj.tmpl index 3acacadf38..4d038b9e39 100644 --- a/workspace_tools/export/uvision4_lpc1768.uvproj.tmpl +++ b/workspace_tools/export/uvision4_lpc1768.uvproj.tmpl @@ -380,11 +380,9 @@ - - {% for file in object_files %} - {{file}} - {% endfor %} - + {% for file in object_files %} + {{file}} + {% endfor %} @@ -395,24 +393,24 @@ src - {% for file in source_files %} - - {{file.name}} - {{file.type}} - {{file.path}} - {%if file.type == "1" %} - - - - - --c99 - - - - - {% endif %} - - {% endfor %} + {% for file in source_files %} + + {{file.name}} + {{file.type}} + {{file.path}} + {%if file.type == "1" %} + + + + + --c99 + + + + + {% endif %} + + {% endfor %} @@ -420,4 +418,3 @@ - diff --git a/workspace_tools/export/uvision4_lpc4088.uvproj.tmpl b/workspace_tools/export/uvision4_lpc4088.uvproj.tmpl index c33a436bf8..4a405b44a0 100644 --- a/workspace_tools/export/uvision4_lpc4088.uvproj.tmpl +++ b/workspace_tools/export/uvision4_lpc4088.uvproj.tmpl @@ -382,11 +382,9 @@ - - {% for file in object_files %} - {{file}} - {% endfor %} - + {% for file in object_files %} + {{file}} + {% endfor %} @@ -397,24 +395,24 @@ src - {% for file in source_files %} - - {{file.name}} - {{file.type}} - {{file.path}} - {%if file.type == "1" %} - - - - - --c99 - - - - - {% endif %} - - {% endfor %} + {% for file in source_files %} + + {{file.name}} + {{file.type}} + {{file.path}} + {%if file.type == "1" %} + + + + + --c99 + + + + + {% endif %} + + {% endfor %} @@ -422,4 +420,3 @@ - diff --git a/workspace_tools/export/uvision4_lpc812.uvproj.tmpl b/workspace_tools/export/uvision4_lpc812.uvproj.tmpl index a1fd19fee1..33389ca8ff 100644 --- a/workspace_tools/export/uvision4_lpc812.uvproj.tmpl +++ b/workspace_tools/export/uvision4_lpc812.uvproj.tmpl @@ -384,7 +384,7 @@ {% for file in object_files %} - {{file}} + {{file}} {% endfor %} @@ -396,25 +396,24 @@ src - {% for file in source_files %} - - {{file.name}} - {{file.type}} - {{file.path}} - {%if file.type == "1" %} - - - - - --c99 - - - - - {% endif %} - - {% endfor %} - + {% for file in source_files %} + + {{file.name}} + {{file.type}} + {{file.path}} + {%if file.type == "1" %} + + + + + --c99 + + + + + {% endif %} + + {% endfor %}