[ptxdist] [PATCH] wpewebkit: add WebDriver config switch

[ptxdist] [PATCH] wpewebkit: add WebDriver config switch

[Bastian Krause]

Prior to this commit, WebDriver was always built, but not installed. Now
it is only built *and* installed if the corresponding option is enabled.

Signed-off-by: Bastian Krause <bst@pengutronix.de>
---
 rules/wpewebkit.in   | 7 +++++++
 rules/wpewebkit.make | 6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/rules/wpewebkit.in b/rules/wpewebkit.in
index 084874067..8c1f6c50e 100644
--- a/rules/wpewebkit.in
+++ b/rules/wpewebkit.in
@@ -98,4 +98,11 @@ config WPEWEBKIT_ENABLE_LOGGING
 	  Enable this option if you want to get some more logging information. For more
 	  information check https://trac.webkit.org/wiki/WebKitGTK/Debugging.
 
+config WPEWEBKIT_WEBDRIVER
+	bool
+	prompt "WebDriver support"
+	help
+	  WebDriver is a standalone server that implements the W3C WebDriver standard
+	  for automated testing.
+
 endif
diff --git a/rules/wpewebkit.make b/rules/wpewebkit.make
index 26d2c0e08..d1a7fa120 100644
--- a/rules/wpewebkit.make
+++ b/rules/wpewebkit.make
@@ -43,7 +43,7 @@ WPEWEBKIT_CONF_OPT	:= \
 	-DENABLE_GTKDOC=OFF\
 	-DENABLE_MEDIA_SOURCE=ON \
 	-DENABLE_VIDEO=$(call ptx/onoff,PTXCONF_WPEWEBKIT_VIDEO) \
-	-DENABLE_WEBDRIVER=ON \
+	-DENABLE_WEBDRIVER=$(call ptx/onoff,PTXCONF_WPEWEBKIT_WEBDRIVER) \
 	-DENABLE_WEB_AUDIO=$(call ptx/onoff,PTXCONF_WPEWEBKIT_AUDIO) \ \
 	-DENABLE_WEB_CRYPTO=ON \
 	-DENABLE_WPE_QT_API=$(call ptx/onoff,PTXCONF_WPEWEBKIT_QT) \
@@ -102,6 +102,10 @@ ifdef PTXCONF_WPEWEBKIT_QT
 	@$(call install_tree, wpewebkit, 0, 0, -, /usr/lib/qt5/qml/org/wpewebkit)
 endif
 
+ifdef PTXCONF_WPEWEBKIT_WEBDRIVER
+	@$(call install_copy, wpewebkit, 0, 0, 0755, -, /usr/bin/WPEWebDriver)
+endif
+
 	@$(call install_finish, wpewebkit)
 
 	@$(call touch)
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] wpewebkit: add WebDriver config switch

[Michael Olbrich]

Thanks, applied as 95d9fa18f2ff89acb3f47f171fbf09c7ca3365bd.

Michael

[sent from post-receive hook]

On Thu, 07 Oct 2021 12:18:35 +0200, Bastian Krause <bst@pengutronix.de> wrote:
> Prior to this commit, WebDriver was always built, but not installed. Now
> it is only built *and* installed if the corresponding option is enabled.
> 
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> Message-Id: <20210831164623.11889-1-bst@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/wpewebkit.in b/rules/wpewebkit.in
> index 084874067aba..8c1f6c50ed34 100644
> --- a/rules/wpewebkit.in
> +++ b/rules/wpewebkit.in
> @@ -98,4 +98,11 @@ config WPEWEBKIT_ENABLE_LOGGING
>  	  Enable this option if you want to get some more logging information. For more
>  	  information check https://trac.webkit.org/wiki/WebKitGTK/Debugging.
>  
> +config WPEWEBKIT_WEBDRIVER
> +	bool
> +	prompt "WebDriver support"
> +	help
> +	  WebDriver is a standalone server that implements the W3C WebDriver standard
> +	  for automated testing.
> +
>  endif
> diff --git a/rules/wpewebkit.make b/rules/wpewebkit.make
> index 26d2c0e086fb..d1a7fa120742 100644
> --- a/rules/wpewebkit.make
> +++ b/rules/wpewebkit.make
> @@ -43,7 +43,7 @@ WPEWEBKIT_CONF_OPT	:= \
>  	-DENABLE_GTKDOC=OFF\
>  	-DENABLE_MEDIA_SOURCE=ON \
>  	-DENABLE_VIDEO=$(call ptx/onoff,PTXCONF_WPEWEBKIT_VIDEO) \
> -	-DENABLE_WEBDRIVER=ON \
> +	-DENABLE_WEBDRIVER=$(call ptx/onoff,PTXCONF_WPEWEBKIT_WEBDRIVER) \
>  	-DENABLE_WEB_AUDIO=$(call ptx/onoff,PTXCONF_WPEWEBKIT_AUDIO) \ \
>  	-DENABLE_WEB_CRYPTO=ON \
>  	-DENABLE_WPE_QT_API=$(call ptx/onoff,PTXCONF_WPEWEBKIT_QT) \
> @@ -102,6 +102,10 @@ ifdef PTXCONF_WPEWEBKIT_QT
>  	@$(call install_tree, wpewebkit, 0, 0, -, /usr/lib/qt5/qml/org/wpewebkit)
>  endif
>  
> +ifdef PTXCONF_WPEWEBKIT_WEBDRIVER
> +	@$(call install_copy, wpewebkit, 0, 0, 0755, -, /usr/bin/WPEWebDriver)
> +endif
> +
>  	@$(call install_finish, wpewebkit)
>  
>  	@$(call touch)

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de