Extract CEF into a sub-folder to contain it more conveniently

patrikjuvonen · patrikjuvonen · commit fd7220dc8d28 · 2021-09-23T21:33:19.000+03:00
Also gets rid of an old TODO from install_cef.lua.
diff --git a/Client/ceflauncher_DLL/CCefApp.h b/Client/ceflauncher_DLL/CCefApp.h
@@ -7,7 +7,7 @@
  *  PURPOSE:     CefApp implementation
  *
  *****************************************************************************/
-#include <cef3/include/cef_app.h>
+#include <cef3/cef/include/cef_app.h>
 #include <string>
 #include <sstream>
 #include "V8Helpers.h"
diff --git a/Client/ceflauncher_DLL/Main.cpp b/Client/ceflauncher_DLL/Main.cpp
@@ -11,7 +11,7 @@
 #include <Windows.h>
 #include "CCefApp.h"
 #include <string>
-#include <cef3/include/cef_sandbox_win.h>
+#include <cef3/cef/include/cef_sandbox_win.h>
 
 //#define CEF_ENABLE_SANDBOX
 #ifdef CEF_ENABLE_SANDBOX
diff --git a/Client/ceflauncher_DLL/V8Helpers.h b/Client/ceflauncher_DLL/V8Helpers.h
@@ -8,7 +8,7 @@
  *
  *****************************************************************************/
 #include <string>
-#include <cef3/include/cef_app.h>
+#include <cef3/cef/include/cef_app.h>
 typedef void (*JavascriptCallback)(CefRefPtr<CefFrame> frame, const CefV8ValueList& arguments);
 
 namespace V8Helpers
diff --git a/Client/ceflauncher_DLL/premake5.lua b/Client/ceflauncher_DLL/premake5.lua
@@ -4,8 +4,8 @@ project "CEFLauncher DLL"
 	targetname "CEFLauncher_DLL"
 	targetdir(buildpath("mta/cef"))
 
-	includedirs { "../../vendor/cef3" }
-	libdirs { "../../vendor/cef3/Release" }
+	includedirs { "../../vendor/cef3/cef" }
+	libdirs { "../../vendor/cef3/cef/Release" }
 
 	defines { "UNICODE", "PSAPI_VERSION=1" }
 
diff --git a/Client/cefweb/CAjaxResourceHandler.h b/Client/cefweb/CAjaxResourceHandler.h
@@ -11,7 +11,7 @@
 #pragma once
 
 #include <core/CAjaxResourceHandlerInterface.h>
-#include <cef3/include/cef_resource_handler.h>
+#include <cef3/cef/include/cef_resource_handler.h>
 #include <SString.h>
 
 class CWebView;
diff --git a/Client/cefweb/CWebApp.cpp b/Client/cefweb/CWebApp.cpp
@@ -9,8 +9,8 @@
 #include "StdInc.h"
 #include "CWebApp.h"
 
-#include <cef3/include/wrapper/cef_stream_resource_handler.h>
-#include <cef3/include/cef_parser.h>
+#include <cef3/cef/include/wrapper/cef_stream_resource_handler.h>
+#include <cef3/cef/include/cef_parser.h>
 #include "CAjaxResourceHandler.h"
 
 CefRefPtr<CefResourceHandler> CWebApp::HandleError(const SString& strError, unsigned int uiError)
diff --git a/Client/cefweb/CWebApp.h b/Client/cefweb/CWebApp.h
@@ -7,8 +7,8 @@
  *
  *****************************************************************************/
 #pragma once
-#include <cef3/include/cef_app.h>
-#include <cef3/include/cef_scheme.h>
+#include <cef3/cef/include/cef_app.h>
+#include <cef3/cef/include/cef_scheme.h>
 
 class CWebApp : public CefApp, public CefSchemeHandlerFactory
 {
diff --git a/Client/cefweb/CWebCore.cpp b/Client/cefweb/CWebCore.cpp
@@ -11,10 +11,10 @@
 #include "CWebCore.h"
 #include "CWebView.h"
 #include "CWebsiteRequests.h"
-#include <cef3/include/cef_app.h>
-#include <cef3/include/cef_browser.h>
-#include <cef3/include/cef_sandbox_win.h>
-#include <cef3/include/cef_parser.h>
+#include <cef3/cef/include/cef_app.h>
+#include <cef3/cef/include/cef_browser.h>
+#include <cef3/cef/include/cef_sandbox_win.h>
+#include <cef3/cef/include/cef_parser.h>
 #include "WebBrowserHelpers.h"
 #include "CWebApp.h"
 
diff --git a/Client/cefweb/CWebCore.h b/Client/cefweb/CWebCore.h
@@ -16,7 +16,7 @@
 #include <unordered_set>
 #include <future>
 #include <core/CWebCoreInterface.h>
-#include <cef3/include/cef_app.h>
+#include <cef3/cef/include/cef_app.h>
 #define MTA_BROWSERDATA_PATH "mta/cef/browserdata.xml"
 #define BROWSER_LIST_UPDATE_INTERVAL (24*60*60)
 #define BROWSER_UPDATE_URL "http://cef.multitheftauto.com/get.php"
diff --git a/Client/cefweb/CWebView.cpp b/Client/cefweb/CWebView.cpp
@@ -10,8 +10,8 @@
 #include "StdInc.h"
 #include "CWebView.h"
 #include "CAjaxResourceHandler.h"
-#include <cef3/include/cef_parser.h>
-#include <cef3/include/cef_task.h>
+#include <cef3/cef/include/cef_parser.h>
+#include <cef3/cef/include/cef_task.h>
 #include "CWebDevTools.h"
 
 CWebView::CWebView(bool bIsLocal, CWebBrowserItem* pWebBrowserRenderItem, bool bTransparent)
diff --git a/Client/cefweb/CWebView.h b/Client/cefweb/CWebView.h
@@ -14,13 +14,13 @@
 #undef GetFirstChild
 #include <core/CWebViewInterface.h>
 #include <core/CWebBrowserEventsInterface.h>
-#include <cef3/include/cef_app.h>
-#include <cef3/include/cef_browser.h>
-#include <cef3/include/cef_client.h>
-#include <cef3/include/cef_render_handler.h>
-#include <cef3/include/cef_life_span_handler.h>
-#include <cef3/include/cef_context_menu_handler.h>
-#include <cef3/include/cef_resource_request_handler.h>
+#include <cef3/cef/include/cef_app.h>
+#include <cef3/cef/include/cef_browser.h>
+#include <cef3/cef/include/cef_client.h>
+#include <cef3/cef/include/cef_render_handler.h>
+#include <cef3/cef/include/cef_life_span_handler.h>
+#include <cef3/cef/include/cef_context_menu_handler.h>
+#include <cef3/cef/include/cef_resource_request_handler.h>
 #include <SString.h>
 #include <mmdeviceapi.h>
 #include <audiopolicy.h>
diff --git a/Client/cefweb/WebBrowserHelpers.h b/Client/cefweb/WebBrowserHelpers.h
@@ -8,7 +8,7 @@
  *
  *****************************************************************************/
 #pragma once
-#include <cef3/include/cef_v8.h>
+#include <cef3/cef/include/cef_v8.h>
 #include <SString.h>
 
 bool isKeyDown(WPARAM wParam)
diff --git a/Client/cefweb/premake5.lua b/Client/cefweb/premake5.lua
@@ -14,12 +14,12 @@ project "Client Webbrowser"
 			"../../Shared/sdk",
 			".",
 			"../sdk",
-			"../../vendor/cef3",
+			"../../vendor/cef3/cef",
 			"../../vendor/sparsehash/src/"
 		}
 
 	libdirs {
-		"../../vendor/cef3/Release"
+		"../../vendor/cef3/cef/Release"
 	}
 
 
diff --git a/utils/buildactions/install_cef.lua b/utils/buildactions/install_cef.lua
@@ -3,7 +3,8 @@ require 'utils'
 premake.modules.install_cef = {}
 
 -- Config variables
-local CEF_PATH = "vendor/cef3/"
+local CEF_PATH = "vendor/cef3/cef/"
+local CEF_TEMP_PATH = "vendor/cef3/"
 local CEF_URL_PREFIX = "https://cef-builds.spotifycdn.com/cef_binary_"
 local CEF_URL_SUFFIX = "_windows32_minimal.tar.bz2"
 
@@ -69,7 +70,7 @@ newaction {
 			CEF_HASH = ""
 		elseif upgrade then
 			print("Checking opensource.spotify.com for an update...")
-			resource, result_str, result_code = http.get("https://cef-builds.spotifycdn.com/index.json")
+			local resource, result_str, result_code = http.get("https://cef-builds.spotifycdn.com/index.json")
 			if result_str ~= "OK" or result_code ~= 200 then
 				errormsg(("Could not get page with status code %s: "):format(response_code), result_str)
 				return
@@ -106,8 +107,12 @@ newaction {
 			return
 		end
 
+		if not os.isdir(CEF_PATH) then
+			os.mkdir(CEF_PATH)
+		end
+
 		-- Check file hash
-		local archive_path = CEF_PATH.."temp.tar.bz2"
+		local archive_path = CEF_TEMP_PATH.."temp.tar.bz2"
 		if os.isfile(archive_path) and os.sha256_file(archive_path) == CEF_HASH then
 			print("CEF consistency checks succeeded")
 			return
@@ -147,13 +152,8 @@ newaction {
 		end
 
 		-- Delete old CEF files
-		-- TODO: It might be better to download the files into a new folder and delete this folder at once
-		os.rmdir(CEF_PATH.."cmake")
-		os.rmdir(CEF_PATH.."include")
-		os.rmdir(CEF_PATH.."libcef_dll")
-		os.rmdir(CEF_PATH.."Release")
-		os.rmdir(CEF_PATH.."Resources")
-		os.remove_wildcard(CEF_PATH.."*.txt")
+		os.rmdir(CEF_PATH)
+		os.mkdir(CEF_PATH)
 
 		-- Extract first bz2 and then tar
 		os.extract_archive(archive_path, CEF_PATH, true) -- Extract .tar.bz2 to .tar
diff --git a/vendor/cef3/.gitignore b/vendor/cef3/.gitignore
@@ -1,8 +1,3 @@
 *.tar.bz2
 
-cmake/
-include/
-libcef_dll/
-Release/
-Resources/
-*.txt
+cef/
diff --git a/vendor/cef3/premake5.lua b/vendor/cef3/premake5.lua
@@ -3,20 +3,20 @@ project "CEF"
 	language "C++"
 	kind "StaticLib"
 
-	includedirs { "." }
+	includedirs { "cef" }
 	-- Check this: https://bitbucket.org/chromiumembedded/cef/src/48908c919591afadac3383effbc5f21a2d40f637/cmake/cef_variables.cmake.in?at=master&fileviewer=file-view-default
 	defines { "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FILE_OFFSET_BITS=64",
 		"_WINDOWS", "UNICODE", "_UNICODE", "WINVER=0x0602", "_WIN32_WINNT=0x602", "NOMINMAX", "WIN32_LEAN_AND_MEAN",  "_HAS_EXCEPTIONS=0",
 		"PSAPI_VERSION=1", "WRAPPING_CEF_SHARED" }
 
 	files {
 		"premake5.lua",
-		"libcef_dll/**.cc",
+		"cef/libcef_dll/**.cc",
 		"**.h",
 	}
 
 	local path = buildpath(".")
-	local cef_path = "%{wks.location}/../Vendor/cef3/"
+	local cef_path = "%{wks.location}/../Vendor/cef3/cef/"
 	postbuildcommands {
 		"{COPY} \""..cef_path.."Release/*\" \""..path.."mta\"",
 		"{COPY} \""..cef_path.."Resources/icudtl.dat\" \""..path.."mta\"",

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* PURPOSE: CefApp implementation`
`8`	`8`	`*`
`9`	`9`	`*****************************************************************************/`
`10`		`-#include <cef3/include/cef_app.h>`
	`10`	`+#include <cef3/cef/include/cef_app.h>`
`11`	`11`	`#include <string>`
`12`	`12`	`#include <sstream>`
`13`	`13`	`#include "V8Helpers.h"`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*****************************************************************************/`
`10`	`10`	`#include <string>`
`11`		`-#include <cef3/include/cef_app.h>`
	`11`	`+#include <cef3/cef/include/cef_app.h>`
`12`	`12`	`typedef void (*JavascriptCallback)(CefRefPtr<CefFrame> frame, const CefV8ValueList& arguments);`
`13`	`13`
`14`	`14`	`namespace V8Helpers`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@`
`7`	`7`	`*`
`8`	`8`	`*****************************************************************************/`
`9`	`9`	`#pragma once`
`10`		`-#include <cef3/include/cef_app.h>`
`11`		`-#include <cef3/include/cef_scheme.h>`
	`10`	`+#include <cef3/cef/include/cef_app.h>`
	`11`	`+#include <cef3/cef/include/cef_scheme.h>`
`12`	`12`
`13`	`13`	`class CWebApp : public CefApp, public CefSchemeHandlerFactory`
`14`	`14`	`{`