modify wdk sign rule

2 files changed, 6 insertions, 13 deletions

diff --git a/xmake/rules/wdk/sign/sign.lua b/xmake/rules/wdk/sign/sign.lua
index 395b9e768..2d522a7b1 100644
--- a/xmake/rules/wdk/sign/sign.lua
+++ b/xmake/rules/wdk/sign/sign.lua
@@ -123,9 +123,6 @@ function _sign_test(target, filepath)
                 end
             }
         }
-
-        -- TODO enable test signing
-        -- bcdedit.exe /set TESTSIGNING [ON|OFF]
     end
 
     -- do sign
@@ -156,16 +153,10 @@ end
 -- do sign
 function main(target, filepath, mode)
 
-    -- sign is disabled?
-    local enabled = target:values("wdk.sign.enabled")
-    if enabled == false then
-        return 
-    end
-
     -- do sign
     if mode == "test" then
         _sign_test(target, filepath)
-    else 
+    elseif mode == "release" then
         _sign_release(target, filepath)
     end
 end
diff --git a/xmake/rules/wdk/sign/xmake.lua b/xmake/rules/wdk/sign/xmake.lua
index 1004577e1..93028e2cb 100644
--- a/xmake/rules/wdk/sign/xmake.lua
+++ b/xmake/rules/wdk/sign/xmake.lua
@@ -25,8 +25,7 @@
 -- define rule: sign
 --
 -- values:
---   - wdk.sign.enabled:   true/false (default: true)
---   - wdk.sign.mode:      test/release (default: test)
+--   - wdk.sign.mode:      nosign/test/release (default: nosign)
 --   - wdk.sign.company:   tboox.org (for release signing)
 --   - wdk.sign.certfile:  signcert.cer (for release signing)
 --   - wdk.sign.timestamp: http://timestamp.verisign.com/scripts/timstamp.dll
@@ -79,7 +78,10 @@ rule("wdk.sign")
         end
 
         -- get sign mode
-        local signmode = target:values("wdk.sign.mode") or "test"
+        local signmode = target:values("wdk.sign.mode") 
+        if not signmode then
+            return 
+        end
 
         -- add clean files
         target:data_add("wdk.cleanfiles", {tempfile, dependfile})