BaseTools: not specified value of MAX_CONCURRENT_THREAD_NUMBER

when MAX_CONCURRENT_THREAD_NUMBER is not specified, tool will
automatically detect number of processor threads.

Fixes: https://bugzilla.tianocore.org/show_bug.cgi?id=775
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

diff --git a/BaseTools/Conf/target.template b/BaseTools/Conf/target.template
index 787fc64fb1f23eda753ac8ff8d952aff08595c7f..e5c31fe5a00246a09574d35d9205bdff8fa75acd 100644 (file)
--- a/BaseTools/Conf/target.template
+++ b/BaseTools/Conf/target.template
@@ -1,5 +1,5 @@
 #\r
 #\r

-#  Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -59,10 +59,14 @@ TOOL_CHAIN_CONF       = Conf/tools_def.txt
 #                                             used for the build.  The list uses space character separation.\r
 TOOL_CHAIN_TAG        = MYTOOLS\r
 \r
 #                                             used for the build.  The list uses space character separation.\r
 TOOL_CHAIN_TAG        = MYTOOLS\r
 \r

-# MAX_CONCURRENT_THREAD_NUMBER  NUMBER  Optional  The number of concurrent threads. Recommend to set this\r
-#                                                 value to one more than the number of your compurter\r
-#                                                 cores or CPUs. Less than 2 means disable multithread build.\r
-MAX_CONCURRENT_THREAD_NUMBER = 1\r
+# MAX_CONCURRENT_THREAD_NUMBER  NUMBER  Optional  The number of concurrent threads. If not specified or set\r
+#                                                 to zero, tool automatically detect number of processor\r
+#                                                 threads. Recommend to set this value to one less than the\r
+#                                                 number of your computer cores or CPUs. When value set to 1,\r
+#                                                 means disable multi-thread build, value set to more than 1,\r
+#                                                 means user specify the thread number to build. Not specify\r
+#                                                 the default value in this file.\r
+# MAX_CONCURRENT_THREAD_NUMBER = 1\r

 \r
 \r
 # BUILD_RULE_CONF  Filename Optional  Specify the file name to use for the build rules that are followed\r
 \r
 \r
 # BUILD_RULE_CONF  Filename Optional  Specify the file name to use for the build rules that are followed\r

diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py
index 24f9962c9d94ed03a4b9aec7ea58ce22c8f1cc27..14a2ceb4bc64dff3be542580fa1a4a29b7266b28 100644 (file)
--- a/BaseTools/Source/Python/build/build.py
+++ b/BaseTools/Source/Python/build/build.py
@@ -2323,7 +2323,8 @@ def MyOptionParser():
         help="Using this name of SKU ID to build the platform, overriding SKUID_IDENTIFIER in DSC file.")\r
 \r
     Parser.add_option("-n", action="callback", type="int", dest="ThreadNumber", callback=SingleCheckCallback,\r
         help="Using this name of SKU ID to build the platform, overriding SKUID_IDENTIFIER in DSC file.")\r
 \r
     Parser.add_option("-n", action="callback", type="int", dest="ThreadNumber", callback=SingleCheckCallback,\r

-        help="Build the platform using multi-threaded compiler. The value overrides target.txt's MAX_CONCURRENT_THREAD_NUMBER. Less than 2 will disable multi-thread builds.")\r
+        help="Build the platform using multi-threaded compiler. The value overrides target.txt's MAX_CONCURRENT_THREAD_NUMBER. When value is set to 0, tool automatically detect number of "\\r
+             "processor threads, set value to 1 means disable multi-thread build, and set value to more than 1 means user specify the threads number to build.")\r

 \r
     Parser.add_option("-f", "--fdf", action="callback", type="string", dest="FdfFile", callback=SingleCheckCallback,\r
         help="The name of the FDF file to use, which overrides the setting in the DSC file.")\r
 \r
     Parser.add_option("-f", "--fdf", action="callback", type="string", dest="FdfFile", callback=SingleCheckCallback,\r
         help="The name of the FDF file to use, which overrides the setting in the DSC file.")\r