Merge pull request #509 from OpportunityLiu/dev

Improve string.serialize; add unit test

1 files changed, 12 insertions, 13 deletions

diff --git a/xmake/core/base/deprecated.lua b/xmake/core/base/deprecated.lua
index b37851f20..467bc2964 100644
--- a/xmake/core/base/deprecated.lua
+++ b/xmake/core/base/deprecated.lua
@@ -21,12 +21,6 @@
 -- define module
 local deprecated = deprecated or {}
 
--- load modules
-local utils     = require("base/utils")
-local table     = require("base/table")
-local string    = require("base/string")
-local option    = require("base/option")
-
 -- add deprecated entry
 function deprecated.add(newformat, oldformat, ...)
 
@@ -44,6 +38,10 @@ end
 -- dump all deprecated entries
 function deprecated.dump()
 
+    -- lazy load modules to avoid loop
+    local utils     = require("base/utils")
+    local option    = require("base/option")
+
     -- dump one or more ..
     local index = 0
     deprecated._ENTRIES = deprecated._ENTRIES or {}
@@ -53,17 +51,18 @@ function deprecated.dump()
         if index == 0 then
             print("")
         end
-        if new then
-            utils.cprint("${bright color.warning}deprecated: ${clear}please uses %s instead of %s", new, old)
-        else
-            utils.cprint("${bright color.warning}deprecated: ${clear}please remove %s", old)
-        end
 
         -- show more?
-        if not option.get("verbose") then
-            utils.cprint("${bright color.warning}deprecated: ${clear}add -v for getting more ..")
+        if not option.get("verbose") and index > 0 then
+            utils.cprint("${bright color.warning}deprecated:${clear} add -v for getting more ..")
             break
         end
+
+        if new then
+            utils.cprint("${bright color.warning}deprecated:${clear} please uses %s instead of %s", new, old)
+        else
+            utils.cprint("${bright color.warning}deprecated:${clear} please remove %s", old)
+        end
         index = index + 1
     end
 end