Mercurial > hg > release > icedtea-web-1.3

changeset 380:1088b2dffe49

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added midori and epiphany to be counted as testable browsers
author Jiri Vanek <jvanek@redhat.com>
date Tue, 22 May 2012 12:08:17 +0200
parents 442a5b2acc85
children 1a831549e69d
files ChangeLog Makefile.am configure.ac
diffstat 3 files changed, 24 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon May 21 18:17:43 2012 +0200
+++ b/ChangeLog	Tue May 22 12:08:17 2012 +0200
@@ -1,3 +1,9 @@
+2012-05-21  Jiri Vanek  <jvanek@redhat.com>
+
+	* Makefile.am: mzilla-filesystem linking targets now counts also with 
+	midori and epiphany. Extracted duplicated entries to variables
+	* configure.ac: added  check for midori and epiphany
+
 2012-05-21  Jiri Vanek  <jvanek@redhat.com>
 
 	Added detection of installed browsers and added targets to create
--- a/Makefile.am	Mon May 21 18:17:43 2012 +0200
+++ b/Makefile.am	Tue May 22 12:08:17 2012 +0200
@@ -46,6 +46,7 @@
 MOZILLA_LOCAL_BACKUP_FILE=${HOME}/$(PLUGIN_LINK_NAME).origU
 MOZILLA_GLOBAL_BACKUP_FILE=${HOME}/$(PLUGIN_LINK_NAME).origMG
 OPERA_GLOBAL_BACKUP_FILE=${HOME}/$(PLUGIN_LINK_NAME).origOG
+MOZILLA_FAMILY_TEST= "$(FIREFOX)" != "" -o "$(CHROMIUM)" != "" -o "$(CHROME)" != "" -o "$(MIDORI)" != "" -o "$(EPIPHANY)" != "" 
 # end of linking variables
 
 # Build directories
@@ -139,6 +140,13 @@
 EXTRA_DIST = $(top_srcdir)/netx $(top_srcdir)/plugin javaws.png javaws.desktop.in extra launcher \
  itweb-settings.desktop.in $(top_srcdir)/tests
 
+# reproducers `D`shortcuts
+DTEST_SERVER=-Dtest.server.dir=$(JNLP_TESTS_SERVER_DEPLOYDIR)
+DJAVAWS_BUILD=-Djavaws.build.bin=$(DESTDIR)$(bindir)/$(javaws)
+DBROWSERS=-Dused.browsers=$(FIREFOX):$(CHROMIUM):$(CHROME):$(OPERA):$(MIDORI):$(EPIPHANY)
+REPRODUCERS_DPARAMETERS= $(DTEST_SERVER) $(DJAVAWS_BUILD) $(DBROWSERS) 
+# end of `D`shortcuts
+
 # binary names
 javaws:= $(shell echo javaws | sed '@program_transform_name@')
 itweb_settings:= $(shell echo itweb-settings | sed '@program_transform_name@')
@@ -595,7 +603,7 @@
 	cd $(JNLP_TESTS_ENGINE_DIR) ; \
 	class_names=`cat $(REPRODUCERS_CLASS_NAMES)` ; \
 	CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):. \
-	  $(BOOT_DIR)/bin/java -Dtest.server.dir=$(JNLP_TESTS_SERVER_DEPLOYDIR) -Djavaws.build.bin=$(DESTDIR)$(bindir)/$(javaws) -Dused.browsers=$(FIREFOX):$(CHROMIUM):$(CHROME):$(OPERA) \
+	  $(BOOT_DIR)/bin/java $(REPRODUCERS_DPARAMETERS) \
 	 -Xbootclasspath:$(RUNTIME) CommandLine $$class_names \
 	  > stdout.log 2> stderr.log ; \
 	 cat stdout.log ; \
@@ -611,7 +619,7 @@
 if ENABLE_PLUGIN
 stamps/user-links.stamp: stamps/netx-dist.stamp extra-lib/about.jar stamps/plugin.stamp \ 
  launcher.build/$(javaws) stamps/netx.stamp $(DESTDIR)$(libdir)/$(BUILT_PLUGIN_LIBRARY) 
-	if [ "$(FIREFOX)" != "" -o "$(CHROMIUM)" != "" -o "$(CHROME)" != "" ]  ; then  \
+	if [ $(MOZILLA_FAMILY_TEST) ]  ; then  \
 	  if [ -e $(MOZILLA_LOCAL_PLUGINDIR)/$(PLUGIN_LINK_NAME) ] ; then \
 	    mv -f $(MOZILLA_LOCAL_PLUGINDIR)/$(PLUGIN_LINK_NAME)  $(MOZILLA_LOCAL_BACKUP_FILE) ; \
 	    echo "$(MOZILLA_LOCAL_PLUGINDIR)/$(PLUGIN_LINK_NAME) backed up as $(MOZILLA_LOCAL_BACKUP_FILE)" ; \
@@ -626,13 +634,13 @@
 	touch $@
 
 restore-user-links:
-	if [ "$(FIREFOX)" != "" -o "$(CHROMIUM)" != "" -o "$(CHROME)" != "" ]  ; then  \
+	if [ $(MOZILLA_FAMILY_TEST) ]  ; then  \
 	  if [ -e $(MOZILLA_LOCAL_BACKUP_FILE) ] ; then \
 	    mv -f  $(MOZILLA_LOCAL_BACKUP_FILE)  $(MOZILLA_LOCAL_PLUGINDIR)/$(PLUGIN_LINK_NAME) ; \
 	    echo "$(MOZILLA_LOCAL_BACKUP_FILE) restored as $(MOZILLA_LOCAL_PLUGINDIR)/$(PLUGIN_LINK_NAME)" ; \		
 	  else \
 	    rm -f $(MOZILLA_LOCAL_PLUGINDIR)/$(PLUGIN_LINK_NAME) ; \
-	    echo "$(MOZILLA_LOCAL_BACKUP_FILE) do not exists, nothing to be restored. $(MOZILLA_LOCAL_PLUGINDIR)/$(PLUGIN_LINK_NAME) removed" ; \		
+	    echo "$(MOZILLA_LOCAL_BACKUP_FILE) do not exists, nothing to be restored. $(MOZILLA_LOCAL_PLUGINDIR)/$(PLUGIN_LINK_NAME) removed" ; \
 	  fi ; \
 	fi ;
 	if [ -e stamps/user-links.stamp ] ; then \
@@ -641,7 +649,7 @@
 
 stamps/global-links.stamp: stamps/netx-dist.stamp extra-lib/about.jar stamps/plugin.stamp launcher.build/$(javaws) \
  stamps/netx.stamp $(DESTDIR)$(libdir)/$(BUILT_PLUGIN_LIBRARY)
-	if [ "$(FIREFOX)" != "" -o "$(CHROMIUM)" != "" -o "$(CHROME)" != "" ]  ; then  \
+	if [ $(MOZILLA_FAMILY_TEST) ]  ; then  \
 	    dir="$(MOZILLA_GLOBAL32_PLUGINDIR)"  ; \
 	    arch=`arch`  ; \
 	    if [ "$$arch" = "x86_64" ]  ; then \
@@ -678,7 +686,7 @@
 	touch $@
 
 restore-global-links:
-	if [ "$(FIREFOX)" != "" -o "$(CHROMIUM)" != "" -o "$(CHROME)" != "" ]  ; then  \
+	if [ $(MOZILLA_FAMILY_TEST) ]  ; then  \
 	    dir="$(MOZILLA_GLOBAL32_PLUGINDIR)"  ; \
 	    arch=`arch`  ; \
 	    if [ "$$arch" = "x86_64" ]  ; then \
@@ -835,9 +843,7 @@
 	class_names=`cat $(REPRODUCERS_CLASS_NAMES)` ; \
 	$(BOOT_DIR)/bin/java  \
 	 $(EMMA_JAVA_ARGS) \
-	 -Dtest.server.dir=$(JNLP_TESTS_SERVER_DEPLOYDIR) \
-	 -Djavaws.build.bin=$(DESTDIR)$(bindir)/$(javaws) \
-	 -Dused.browsers=$(FIREFOX):$(CHROMIUM):$(CHROME):$(OPERA) \
+	  $(REPRODUCERS_DPARAMETERS) \
 	 -Xbootclasspath:$(RUNTIME) -cp $(EMMA_JAR) emmarun  \
 	   -raw \
 	   -cp $(NETX_DIR)/lib/classes.jar \
--- a/configure.ac	Mon May 21 18:17:43 2012 +0200
+++ b/configure.ac	Tue May 22 12:08:17 2012 +0200
@@ -88,10 +88,13 @@
 #
 
 AC_CHECK_PROGS([XSLTPROC],[xsltproc],[], [])
+# browser to be linked/tested
 AC_CHECK_PROGS([FIREFOX],[firefox],[], [])
 AC_CHECK_PROGS([CHROME],[google-chrome],[], [])
 AC_CHECK_PROGS([CHROMIUM],[chromium-browser],[], [])
 AC_CHECK_PROGS([OPERA],[opera],[], [])
+AC_CHECK_PROGS([MIDORI],[midori],[], [])
+AC_CHECK_PROGS([EPIPHANY],[epiphany],[], [])
 
 AM_CONDITIONAL([WITH_XSLTPROC], [test x"$XSLTPROC" != x ])
 IT_FIND_OPTIONAL_JAR([rhino], RHINO,