Merge branch 'webkit-extension-fixes' of https://github.com/vslavik/wxWidgets

Improve WebKit2 extension loading: make the code cleaner and safer.

See https://github.com/wxWidgets/wxWidgets/pull/2075

build/bakefiles/common.bkl

@@ -897,9 +897,4 @@ $(TAB)cl /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
     <set var="VARS_DONT_ELIMINATE" append="1">top_srcdir</set>
 
 
-    <set var="webviewdll_ext_dir_define">
-        <if cond="FORMAT=='autoconf' and USE_WEBVIEW_WEBKIT2=='1'">WX_WEB_EXTENSIONS_DIRECTORY=\"$(PLUGINS_INST_DIR)/web-extensions\"</if>
-    </set>
-
-
 </makefile>

build/bakefiles/monolithic.bkl

@@ -28,7 +28,6 @@
     <dll id="monodll" template="wx_dll,wx_monolib_or_dll"
          cond="SHARED=='1' and MONOLITHIC=='1'">
         <define>WXMAKINGDLL</define>
-        <define>$(webviewdll_ext_dir_define)</define>
         <ldlibs>$(EXTRALIBS_XML)</ldlibs>
         <ldlibs>$(EXTRALIBS_HTML)</ldlibs>
         <ldlibs>$(EXTRALIBS_MEDIA)</ldlibs>
@@ -40,7 +39,6 @@
 
     <lib id="monolib" template="wx_lib,wx_monolib_or_dll"
          cond="SHARED=='0' and MONOLITHIC=='1'">
-        <define>$(webviewdll_ext_dir_define)</define>
         <if cond="FORMAT=='watcom'">
             <set var="LIB_PAGESIZE" overwrite="1">8192</set>
         </if>

build/bakefiles/multilib.bkl

@@ -184,7 +184,6 @@
          cond="SHARED=='1' and USE_GUI=='1' and USE_WEBVIEW=='1' and MONOLITHIC=='0'">
         <define>WXUSINGDLL</define>
         <define>WXMAKINGDLL_WEBVIEW</define>
-        <define>$(webviewdll_ext_dir_define)</define>
         <sources>$(WEBVIEW_SRC)</sources>
         <library>coredll</library>
         <library>basedll</library>
@@ -195,7 +194,6 @@
 
     <lib id="webviewlib" template="wx_lib"
          cond="SHARED=='0' and USE_GUI=='1' and USE_WEBVIEW=='1' and MONOLITHIC=='0'">
-        <define>$(webviewdll_ext_dir_define)</define>
         <sources>$(WEBVIEW_SRC)</sources>
         <msvc-headers>$(WEBVIEW_HDR)</msvc-headers>
         <include>$(webview_additional_include)</include>

build/cmake/lib/webview/CMakeLists.txt

@@ -26,10 +26,11 @@ endif()
 wx_add_library(wxwebview ${WEBVIEW_FILES})
 
 if(WXGTK AND wxUSE_WEBVIEW_WEBKIT2)
-    set(WX_WEB_EXTENSIONS_DIRECTORY "lib/wx/${wxMAJOR_VERSION}.${wxMINOR_VERSION}/web-extensions")
-    wx_lib_compile_definitions(wxwebview PRIVATE
-        -DWX_WEB_EXTENSIONS_DIRECTORY="${CMAKE_INSTALL_PREFIX}/${WX_WEB_EXTENSIONS_DIRECTORY}"
-        )
+    if(wxVERSION_IS_DEV)
+        set(WX_WEB_EXTENSIONS_DIRECTORY "lib/wx/${wxMAJOR_VERSION}.${wxMINOR_VERSION}.${wxRELEASE_NUMBER}/web-extensions")
+    else()
+        set(WX_WEB_EXTENSIONS_DIRECTORY "lib/wx/${wxMAJOR_VERSION}.${wxMINOR_VERSION}/web-extensions")
+    endif()
 endif()
 
 if(APPLE)