From 18bf641777d1f4baf5eb63f552b63685958f02f4 Mon Sep 17 00:00:00 2001
From: Edward Welbourne <edward.welbourne@qt.io>
Date: Fri, 12 Feb 2021 16:40:33 +0100
Subject: Use newlines more consistently in generate compile-test code

The generated code contained many repeated blank lines.
Most main()s were preceded by one, but not all.
Only include blank lines for actual empty entries in lists, where
configure.json specified them, plus one before main if anything else
precedes it.

Change-Id: I6e6c34940e08712a1aa848a3c9ad1b0fb5806d77
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 util/cmake/configurejson2cmake.py | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

(limited to 'util')

diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py
index 13ccfa85f6..a5d44b4195 100755
--- a/util/cmake/configurejson2cmake.py
+++ b/util/cmake/configurejson2cmake.py
@@ -608,24 +608,24 @@ def write_compile_test(
         return
 
     def resolve_head(detail):
-        head = detail.get("head", "")
+        head = detail.get("head")
         if isinstance(head, list):
             head = "\n".join(head)
-        return head
+        return head + '\n' if head else ''
 
     head = ""
     if inherit_details:
         head += resolve_head(inherit_details)
     head += resolve_head(details)
 
-    sourceCode = head + "\n"
+    sourceCode = head
 
     def resolve_include(detail, keyword):
         include = detail.get(keyword, "")
         if isinstance(include, list):
-            include = "#include <" + ">\n#include <".join(include) + ">"
+            include = "#include <" + ">\n#include <".join(include) + ">\n"
         elif include:
-            include = f"#include <{include}>"
+            include = f"#include <{include}>\n"
         return include
 
     include = ""
@@ -640,37 +640,39 @@ def write_compile_test(
             include += resolve_include(inherit_details, "include")
         include += resolve_include(details, "include")
 
-    sourceCode += include + "\n"
+    sourceCode += include
 
     def resolve_tail(detail):
-        tail = detail.get("tail", "")
+        tail = detail.get("tail")
         if isinstance(tail, list):
             tail = "\n".join(tail)
-        return tail
+        return tail + '\n' if tail else ''
 
     tail = ""
     if inherit_details:
         tail += resolve_tail(inherit_details)
     tail += resolve_tail(details)
 
-    sourceCode += tail + "\n"
+    sourceCode += tail
 
+    if sourceCode: # blank line before main
+        sourceCode += '\n'
     sourceCode += "int main(void)\n"
     sourceCode += "{\n"
     sourceCode += "    /* BEGIN TEST: */\n"
 
     def resolve_main(detail):
-        main = detail.get("main", "")
+        main = detail.get("main")
         if isinstance(main, list):
             main = "\n".join(main)
-        return main
+        return main + '\n' if main else ''
 
     main = ""
     if inherit_details:
         main += resolve_main(inherit_details)
     main += resolve_main(details)
 
-    sourceCode += main + "\n"
+    sourceCode += main
 
     sourceCode += "    /* END TEST: */\n"
     sourceCode += "    return 0;\n"
-- 
cgit v1.2.3