Split yasm and vsyasm

packages/v/vsyasm/xmake.lua

@@ -0,0 +1,23 @@
+package("vsyasm")
+    set_kind("binary")
+    set_homepage("https://yasm.tortall.net/")
+    set_description("Modular BSD reimplementation of NASM - for use with VS2010+")
+    set_license("BSD-2-Clause")
+
+    if os.arch() == "x64" then
+        add_urls("https://github.com/yasm/yasm/releases/download/v$(version)/vsyasm-$(version)-win64.zip",
+                    "http://www.tortall.net/projects/yasm/releases/vsyasm-$(version)-win64.zip")
+        add_versions("1.3.0", "6d991ca77e3827aade0091c87c89cb4c9fa6ad097afcea95ea736482bae707e2")
+    else
+        add_urls("https://github.com/yasm/yasm/releases/download/v$(version)/vsyasm-$(version)-win32.zip",
+                    "http://www.tortall.net/projects/yasm/releases/vsyasm-$(version)-win32.zip")
+        add_versions("1.3.0", "ff4585e2a03e7015b0b1d406d4231267c2d3733968ffc6fc633e586c85c16da5")
+    end
+
+    on_install("@windows", "@mingw", "@msys", function (package)
+        os.cp("*", package:installdir("bin"))
+    end)
+
+    on_test(function (package)
+        os.vrun("vsyasm --version")
+    end)

packages/y/yasm/xmake.lua

@@ -2,16 +2,17 @@ package("yasm")
     set_kind("binary")
     set_homepage("https://yasm.tortall.net/")
     set_description("Modular BSD reimplementation of NASM.")
+    set_license("BSD-2-Clause")
 
     if is_host("windows") then
         if os.arch() == "x64" then
-            add_urls("https://github.com/yasm/yasm/releases/download/v$(version)/vsyasm-$(version)-win64.zip",
-                     "http://www.tortall.net/projects/yasm/releases/vsyasm-$(version)-win64.zip")
-            add_versions("1.3.0", "6d991ca77e3827aade0091c87c89cb4c9fa6ad097afcea95ea736482bae707e2")
+            add_urls("https://github.com/yasm/yasm/releases/download/v1.3.0/yasm-$(version)-win64.exe"
+                     "http://www.tortall.net/projects/yasm/releases/yasm-$(version)-win64.exe")
+            add_versions("1.3.0", "d160b1d97266f3f28a71b4420a0ad2cd088a7977c2dd3b25af155652d8d8d91f")
         else
-            add_urls("https://github.com/yasm/yasm/releases/download/v$(version)/vsyasm-$(version)-win32.zip",
-                     "http://www.tortall.net/projects/yasm/releases/vsyasm-$(version)-win32.zip")
-            add_versions("1.3.0", "ff4585e2a03e7015b0b1d406d4231267c2d3733968ffc6fc633e586c85c16da5")
+            add_urls("https://github.com/yasm/yasm/releases/download/v1.3.0/yasm-$(version)-win32.exe"
+                     "http://www.tortall.net/projects/yasm/releases/yasm-$(version)-win32.exe")
+            add_versions("1.3.0", "db8ef9348ae858354cee4cc2f99e0f36de8a47a121de4cfeea5a16d45dd5ac1b")
         end
     else
         add_urls("https://www.tortall.net/projects/yasm/releases/yasm-$(version).tar.gz",
@@ -20,8 +21,7 @@ package("yasm")
     end
 
     on_install("@windows", "@mingw", "@msys", function (package)
-        os.cp("vsyasm.exe", "yasm.exe")
-        os.cp("*", package:installdir("bin"))
+        os.mv("*.exe", package:installdir("bin", "yasm.exe"))
     end)
 
     on_install("@linux", "@macosx", function (package)