Sync BaseTool trunk (version r2460) into EDKII BaseTools. The change mainly includes:

1. Support use expression as DSC file PCD value.
  2. Update FDF parser to fix bug to get complete macro value.
  3. Fix bug to replace SET statement macro and evaluate SET statement PCD value in FDF file.
  4. Fix a bug for MACRO defined in conditional block cannot be processed correctly

Signed-off-by: lgao4
Reviewed-by: gikidy


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12827 6f19259b-4bc3-4df7-8a09-765794883524

BaseTools/Source/Python/UPT/Library/Misc.py

@@ -875,7 +875,7 @@ def ProcessEdkComment(LineList):
                 for Index in xrange(StartPos, EndPos+1):
                     LineList[Index] = ''
                 FindEdkBlockComment = False
-        elif Line.find("//") != -1:
+        elif Line.find("//") != -1 and not Line.startswith("#"):
             #
             # handling cpp style comment
             #