Fix install_cef on Windows and replace MD5.exe by Windows util

Author: jushar

utils/MD5.exe

@@ -27,12 +27,12 @@ newaction {
 		correct_checksum = correct_checksum:gsub("[%s%c]", "")
 
 		-- Check md5
-		local archive_path = CEF_PATH.."temp.tar.bz2"
+		local archive_path = CEF_PATH.."temp.tar.bz2"
 		if os.md5_file(archive_path) == correct_checksum then
 			print("CEF is already up-to-date")
 			return
 		end
-
+
 		-- Download CEF
 		print("Downloading CEF...")
 		http.download(CEF_URL, archive_path)
@@ -49,9 +49,10 @@ newaction {
 		-- Extract first bz2 and then tar
 		os.extract_archive(archive_path, CEF_PATH, true) -- Extract .tar.bz2 to .tar
 		os.extract_archive(CEF_PATH.."temp.tar", CEF_PATH, true) -- Extract .tar
-		os.executef("{MOVE} %scef_binary*/* %s", CEF_PATH, CEF_PATH)
-		os.remove_wildcard(CEF_PATH.."cef_binary*")
-
+		
+		-- Move all files from cef_binary*/* to ./
+		os.expanddir_wildcard(CEF_PATH.."cef_binary*", CEF_PATH)
+		
 		-- Delete .tar archive, but keep .tar.bz2 for checksumming
 		os.remove(CEF_PATH.."temp.tar")
 	end

utils/buildactions/install_cef.lua

@@ -62,11 +62,21 @@ function os.remove_wildcard(path)
 			os.rmdir(path)
 		end
 	end
+end
+
+function os.expanddir_wildcard(from, to)
+	local dir = os.matchdirs(from)[1]
+	if not dir then return end
+	
+	-- TODO: Optimize this
+	os.copydir(dir, to)
+	os.rmdir(dir)
 end
 
 function os.md5_file(path)
 	if os.get() == "windows" then
-		return os.outputof(string.format("call \"utils\\MD5.exe\" \"%s\"", path))
+		local s = os.outputof(string.format("CertUtil -hashfile \"%s\" MD5", path))
+		return (s:match("\n(.*)\n(.*)") or ""):gsub(" ", "")
 	else
 		return os.outputof(string.format("md5sum \"%s\" | awk '{ print $1 }'", path))
 	end