From e54bec3feb08b09de64945f72885c8c37258de60 Mon Sep 17 00:00:00 2001
From: Philip Chimento
Date: Wed, 12 Apr 2017 15:24:48 -0700
Subject: build: Remove Webhelper
Webhelper is now in its own repository:
https://github.com/endlessm/webhelper
https://phabricator.endlessm.com/T16203
---
.gitignore | 10 -
Makefile.am | 101 +-----
configure.ac | 41 +--
docs/reference/webhelper/Makefile.am.inc | 31 --
docs/reference/webhelper/eos.css | 46 ---
jasmine.json | 10 +-
test/Makefile.am.inc | 18 +-
test/smoke-tests/webhelper/webview.js | 160 ---------
test/smoke-tests/webhelper/webview2.js | 147 --------
test/webhelper/testLocal.js | 59 ----
test/webhelper/testTranslate.js | 102 ------
test/webhelper/testTranslate2.js | 214 -----------
test/webhelper/testUpdateFontSize.js | 97 -----
test/webhelper/testWebActions.js | 141 --------
test/webhelper/testWebActions2.js | 121 -------
webhelper/lib/wh2private.c | 36 --
webhelper/lib/wh2private.h | 20 --
webhelper/webextensions/wh2extension.c | 588 -------------------------------
webhelper/webextensions/wh2jscutil.c | 65 ----
webhelper/webextensions/wh2jscutil.h | 25 --
webhelper/webhelper.js | 290 ---------------
webhelper/webhelper2.js | 529 ---------------------------
webhelper/webhelper_private/config.js.in | 1 -
23 files changed, 6 insertions(+), 2846 deletions(-)
delete mode 100644 docs/reference/webhelper/Makefile.am.inc
delete mode 100644 docs/reference/webhelper/eos.css
delete mode 100644 test/smoke-tests/webhelper/webview.js
delete mode 100644 test/smoke-tests/webhelper/webview2.js
delete mode 100644 test/webhelper/testLocal.js
delete mode 100644 test/webhelper/testTranslate.js
delete mode 100644 test/webhelper/testTranslate2.js
delete mode 100644 test/webhelper/testUpdateFontSize.js
delete mode 100644 test/webhelper/testWebActions.js
delete mode 100644 test/webhelper/testWebActions2.js
delete mode 100644 webhelper/lib/wh2private.c
delete mode 100644 webhelper/lib/wh2private.h
delete mode 100644 webhelper/webextensions/wh2extension.c
delete mode 100644 webhelper/webextensions/wh2jscutil.c
delete mode 100644 webhelper/webextensions/wh2jscutil.h
delete mode 100644 webhelper/webhelper.js
delete mode 100644 webhelper/webhelper2.js
delete mode 100644 webhelper/webhelper_private/config.js.in
diff --git a/.gitignore b/.gitignore
index 274e0ae..6847fc3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,14 +6,11 @@ test/smoke-tests/hello
test/smoke-tests/images/credits.gresource
Endless-0.gir
Endless-0.typelib
-WebHelper2Private-1.0.gir
-WebHelper2Private-1.0.typelib
endless/eosresource.c
endless/eosresource-private.h
endless/eosversion.h
tools/eos-application-manifest/eos-application-manifest
tools/eos-json-extractor/eos-json-extractor
-webhelper/webhelper_private/config.js
*.py[cod]
@@ -129,10 +126,3 @@ run_coverage.coverage
# Editor stuff
*~
*.swp
-
-# NaturalDocs project files
-/docs/reference/webhelper/Data/
-/docs/reference/webhelper/Languages.txt
-/docs/reference/webhelper/Menu.txt
-/docs/reference/webhelper/Topics.txt
-/docs/reference/webhelper/html/
diff --git a/Makefile.am b/Makefile.am
index 1491997..9e30ce8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,8 +29,6 @@ AM_CFLAGS = @STRICT_CFLAGS@
AM_DISTCHECK_CONFIGURE_FLAGS = \
--enable-gtk-doc \
--enable-gir-doc \
- --enable-js-doc \
- --enable-webhelper \
$(NULL)
if EOS_ENABLE_COVERAGE
AM_DISTCHECK_CONFIGURE_FLAGS += --enable-coverage --with-coverage-dir=@EOS_COVERAGE_DIR@
@@ -51,36 +49,12 @@ dist-hook::
else
dist-hook::
@echo "***"
- @echo "*** You must configure with --enable-gtk-doc, --enable-gir-doc, and"
- @echo "*** --enable-js-doc to run make dist or make distcheck."
+ @echo "*** You must configure with --enable-gtk-doc and --enable-gir-doc"
+ @echo "*** to run make dist or make distcheck."
@echo "***"
@false
endif
-# # # SUBSTITUTED FILES # # #
-# These files need to be filled in with make variables
-
-subst = $(SED) \
- -e 's,%libexecdir%,$(libexecdir),g' \
- $(NULL)
-
-subst_files =
-if ENABLE_WEBHELPER
-subst_files += \
- webhelper/webhelper_private/config.js \
- $(NULL)
-endif ENABLE_WEBHELPER
-
-$(subst_files): %: %.in Makefile
- $(AM_V_GEN)$(MKDIR_P) $(@D) && \
- rm -f $@ $@.tmp && \
- $(subst) $< > $@.tmp && \
- chmod a-w $@.tmp && \
- mv $@.tmp $@
-
-CLEANFILES += $(subst_files)
-EXTRA_DIST += $(patsubst %,%.in,$(subst_files))
-
# # # LIBRARY # # #
# Main Open Endless SDK library
@@ -97,52 +71,6 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = @EOS_SDK_API_NAME@.pc
DISTCLEANFILES += @EOS_SDK_API_NAME@.pc
-# # # WEBHELPER LIBRARY # # #
-
-if ENABLE_WEBHELPER
-
-webhelper_sources = \
- webhelper/webhelper.js \
- webhelper/webhelper2.js \
- $(NULL)
-
-gjsmodulesdir = $(datadir)/gjs-1.0
-webhelperdir = $(gjsmodulesdir)
-webhelper_privatedir = $(webhelperdir)/webhelper_private
-dist_webhelper_DATA = \
- $(webhelper_sources) \
- $(NULL)
-dist_webhelper_private_DATA = \
- webhelper/webhelper_private/config.js \
- $(NULL)
-
-EOS_JS_COVERAGE_FILES += $(webhelper_sources)
-
-## Workaround for https://bugs.webkit.org/show_bug.cgi?id=116672
-## When that is solved, we can eliminate this private library and go back to
-## using pure Javascript in WebHelper.
-lib_LTLIBRARIES += libwebhelper2private.la
-libwebhelper2private_la_SOURCES = \
- webhelper/lib/wh2private.c \
- webhelper/lib/wh2private.h \
- $(NULL)
-libwebhelper2private_la_CPPFLAGS = @WEBHELPER2_PRIVATE_CFLAGS@
-libwebhelper2private_la_LIBADD = @WEBHELPER2_PRIVATE_LIBS@
-libwebhelper2private_la_LDFLAGS = -avoid-version
-
-webhelper2extensionsdir = $(libexecdir)/webhelper2
-webhelper2extensions_LTLIBRARIES = wh2extension.la
-wh2extension_la_SOURCES = \
- webhelper/webextensions/wh2extension.c \
- webhelper/webextensions/wh2jscutil.c \
- webhelper/webextensions/wh2jscutil.h \
- $(NULL)
-wh2extension_la_CPPFLAGS = @WEBHELPER2_EXTENSION_CFLAGS@
-wh2extension_la_LIBADD = @WEBHELPER2_EXTENSION_LIBS@
-wh2extension_la_LDFLAGS = -module -avoid-version -no-undefined
-
-endif ENABLE_WEBHELPER
-
# # # INTROSPECTION FILES # # #
-include $(INTROSPECTION_MAKEFILE)
@@ -169,20 +97,6 @@ Endless_@EOS_SDK_API_VERSION@_gir_FILES = $(introspection_sources)
Endless_@EOS_SDK_API_VERSION@_gir_EXPORT_PACKAGES = @EOS_SDK_API_NAME@
INTROSPECTION_GIRS += Endless-@EOS_SDK_API_VERSION@.gir
-if ENABLE_WEBHELPER
-
-WebHelper2Private-1.0.gir: libwebhelper2private.la
-WebHelper2Private_1_0_gir_INCLUDES = GObject-2.0 GLib-2.0 WebKit2-4.0
-WebHelper2Private_1_0_gir_SCANNERFLAGS = \
- --identifier-prefix=Wh2 \
- --symbol-prefix=wh2 \
- $(NULL)
-WebHelper2Private_1_0_gir_LIBS = libwebhelper2private.la
-WebHelper2Private_1_0_gir_FILES = $(libwebhelper2private_la_SOURCES)
-INTROSPECTION_GIRS += WebHelper2Private-1.0.gir
-
-endif ENABLE_WEBHELPER
-
girdir = $(datadir)/gir-1.0
gir_DATA = $(INTROSPECTION_GIRS)
@@ -365,12 +279,6 @@ nobase_dist_licenses_DATA = licenses/creativecommons/C/CC-BY-2.0.html \
licenses/includes/zero.css \
$(NULL)
-# # # PURE JAVASCRIPT MODULE DOCUMENTATION # # #
-
-if ENABLE_WEBHELPER
-include $(top_srcdir)/docs/reference/webhelper/Makefile.am.inc
-endif ENABLE_WEBHELPER
-
# # # GJS OVERRIDES # # #
include $(top_srcdir)/overrides/Makefile.am.inc
@@ -400,9 +308,4 @@ AM_JS_LOG_FLAGS += @EOS_JS_COVERAGE_LOG_FLAGS@
AM_CFLAGS += @EOS_C_COVERAGE_CFLAGS@
AM_LDFLAGS = @EOS_C_COVERAGE_LDFLAGS@
-if ENABLE_WEBHELPER
-libwebhelper2private_la_LDFLAGS += @EOS_C_COVERAGE_LDFLAGS@
-wh2extension_la_LDFLAGS += @EOS_C_COVERAGE_LDFLAGS@
-endif ENABLE_WEBHELPER
-
clean-local:: clean-coverage
diff --git a/configure.ac b/configure.ac
index 77389a9..7001a30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,7 +81,6 @@ GOBJECT_REQUIREMENT="gobject-2.0"
GIO_REQUIREMENT="gio-2.0"
GTK_REQUIREMENT="gtk+-3.0 >= 3.20"
JSON_GLIB_REQUIREMENT="json-glib-1.0 >= 0.12"
-WEBKIT2_REQUIREMENT="webkit2gtk-4.0"
EOSMETRICS_REQUIREMENT="eosmetrics-0"
# These go into the pkg-config file as Requires: and Requires.private:
# (Generally, use Requires.private: instead of Requires:)
@@ -122,8 +121,6 @@ AC_PATH_PROG([GIRDOCTOOL], [g-ir-doc-tool], [notfound])
AC_ARG_VAR([GIRDOCTOOL], [Path to g-ir-doc-tool])
AC_PATH_PROG([YELPBUILD], [yelp-build], [notfound])
AC_ARG_VAR([YELPBUILD], [Path to yelp-build])
-AC_PATH_PROG([NATURALDOCS], [naturaldocs], [notfound])
-AC_ARG_VAR([NATURALDOCS], [Path to naturaldocs])
GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0`
AC_SUBST(GLIB_COMPILE_RESOURCES)
@@ -180,12 +177,6 @@ AS_IF([test "x$enable_metrics" != "xno"], [
AC_DEFINE([USE_METRICS])
EOS_REQUIRED_MODULES_PRIVATE="$EOS_REQUIRED_MODULES_PRIVATE $EOSMETRICS_REQUIREMENT"])
-# --disable-webhelper: Don't build WebHelper. Use this if you just want a quick
-# Endless SDK without the webkit dependency.
-AC_ARG_ENABLE([webhelper], [AS_HELP_STRING([--disable-webhelper],
- [WebHelper requires WebKit dependency @<:@default=yes@:>@])])
-AM_CONDITIONAL([ENABLE_WEBHELPER], [test "x$enable_webhelper" != "xno"])
-
# --enable-gir-doc: Build GIR documentation for Javascript. Done automatically
# during 'make distcheck'.
AC_ARG_ENABLE([gir-doc],
@@ -198,22 +189,12 @@ AS_IF([test "x$enable_gir_doc" = "xyes"], [
[AC_MSG_ERROR([yelp-build must be installed for --enable-gir-doc])])])
AM_CONDITIONAL([ENABLE_GIR_DOC], [test "x$enable_gir_doc" = "xyes"])
-# --enable-js-doc: Build pure Javascript module documentation.
-AC_ARG_ENABLE([js-doc],
- [AS_HELP_STRING([--enable-js-doc],
- [Build documentation for pure Javascript modules @<:@default=no@:>@])])
-AS_IF([test "x$enable_js_doc" = "xyes"], [
- AS_IF([test "x$NATURALDOCS" = "xnotfound"],
- [AC_MSG_ERROR([NaturalDocs must be installed for --enable-js-doc])])])
-AM_CONDITIONAL([ENABLE_JS_DOC], [test "x$enable_js_doc" = "xyes"])
-
-# For 'make dist' or 'make distcheck', all three of --enable-gtk-doc,
-# --enable-gir-doc, and --enable-js-doc are required
+# For 'make dist' or 'make distcheck', both of --enable-gtk-doc and
+# --enable-gir-doc are required
AC_MSG_CHECKING([whether this configuration allows building distributions])
can_make_dist=yes
AM_COND_IF([ENABLE_GTK_DOC], [], [can_make_dist=no])
AM_COND_IF([ENABLE_GIR_DOC], [], [can_make_dist=no])
-AM_COND_IF([ENABLE_JS_DOC], [], [can_make_dist=no])
AM_CONDITIONAL([CAN_MAKE_DIST], [test "x$can_make_dist" = "xyes"])
AC_MSG_RESULT([$can_make_dist])
@@ -233,21 +214,6 @@ PKG_CHECK_MODULES([EOS_SDK], [
$EOS_REQUIRED_MODULES
$EOS_REQUIRED_MODULES_PRIVATE])
-AS_IF([test "x$enable_webhelper" != "xno"], [
- PKG_CHECK_MODULES([WEBHELPER2_EXTENSION], [
- $GLIB_REQUIREMENT
- $GOBJECT_REQUIREMENT
- $WEBKIT2_REQUIREMENT])
- PKG_CHECK_MODULES([WEBHELPER2_PRIVATE], [
- $GLIB_REQUIREMENT
- $WEBKIT2_REQUIREMENT])
-
- # Check installed GIRs for webhelper JS module
- EOS_CHECK_GJS_GIR([GLib], [2.0])
- EOS_CHECK_GJS_GIR([WebKit], [3.0])
- EOS_CHECK_GJS_GIR([WebKit2], [4.0])
-])
-
# Code coverage reports support
EOS_COVERAGE_REPORT([c js])
@@ -266,9 +232,6 @@ AC_CONFIG_FILES([
tools/eos-json-extractor/eos-json-extractor
])
AC_CONFIG_HEADERS([config.h]) dnl Header with system-dependent #defines
-# Make docs/reference/webhelper/eos.css available in the build tree as well as
-# the source tree
-AC_CONFIG_LINKS([docs/reference/webhelper/eos.css:docs/reference/webhelper/eos.css])
# Do the output
AC_OUTPUT
diff --git a/docs/reference/webhelper/Makefile.am.inc b/docs/reference/webhelper/Makefile.am.inc
deleted file mode 100644
index 55caccf..0000000
--- a/docs/reference/webhelper/Makefile.am.inc
+++ /dev/null
@@ -1,31 +0,0 @@
-if ENABLE_JS_DOC
-
-build_naturaldocs_verbose = $(build_naturaldocs_verbose_@AM_V@)
-build_naturaldocs_verbose_ = $(build_naturaldocs_verbose_@AM_DEFAULT_V@)
-build_naturaldocs_verbose_0 = @echo ' DOC Building WebHelper docs';
-
-docs/reference/webhelper/doc-build.stamp: webhelper/webhelper.js docs/reference/webhelper/eos.css
- $(build_naturaldocs_verbose)$(MKDIR_P) $(@D)/html && \
- naturaldocs -i $( \
-
\
-\
-Regular link to a Web site
\
-\
-I want \
-stars!
\
-\
-This is text that will be italicized: Hello, \
-world!
\
-\
-