Mercurial > hg > icedtea7

changeset 2878:68a76bb89920

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PR3114: Don't assume system mime.types supports text/x-java-source 2016-07-27 Andrew John Hughes <gnu.andrew@member.fsf.org> PR3114: Don't assume system mime.types supports text/x-java-source * Makefile.am: (check-mimetype): Make second test depend on JAVA_SOURCE_SUPPORTED conditional, not MIME_TYPES_FILE_FOUND. * NEWS: Updated. * acinclude.m4: (IT_CHECK_FOR_MIME_TYPES): Check if the system mime types file supports text/x-java-source.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Thu, 28 Jul 2016 03:09:17 +0100
parents 9f713d6ccf2a
children 2fbb359cc3c7
files ChangeLog Makefile.am NEWS acinclude.m4
diffstat 4 files changed, 25 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Jul 27 05:41:48 2016 +0100
+++ b/ChangeLog	Thu Jul 28 03:09:17 2016 +0100
@@ -1,3 +1,16 @@
+2016-07-27  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	PR3114: Don't assume system mime.types
+	supports text/x-java-source
+	* Makefile.am:
+	(check-mimetype): Make second test depend
+	on JAVA_SOURCE_SUPPORTED conditional,
+	not MIME_TYPES_FILE_FOUND.
+	* NEWS: Updated.
+	* acinclude.m4:
+	(IT_CHECK_FOR_MIME_TYPES): Check if the
+	system mime types file supports text/x-java-source.
+
 2016-03-04  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	PR3111: Provide option to disable SystemTap tests
--- a/Makefile.am	Wed Jul 27 05:41:48 2016 +0100
+++ b/Makefile.am	Thu Jul 28 03:09:17 2016 +0100
@@ -2948,7 +2948,7 @@
 	    exit -1; \
 	  fi ; \
 	fi
-if MIME_TYPES_FILE_FOUND
+if JAVA_SOURCE_SUPPORTED
 	if [ -e $(BUILD_SDK_DIR)/bin/java ] ; then \
 	  expected="text/x-java-source" ; \
 	  java=$$($(BUILD_SDK_DIR)/bin/java -cp $(MIME_TYPE_CHECK_BUILD_DIR) RH1195203 \
--- a/NEWS	Wed Jul 27 05:41:48 2016 +0100
+++ b/NEWS	Thu Jul 28 03:09:17 2016 +0100
@@ -49,6 +49,7 @@
   - PR3091: SystemTap is heavily confused by multiple JDKs
   - PR3103: Handle case in clean-fonts where linux.fontconfig.Gentoo.properties.old has not been created
   - PR3111: Provide option to disable SystemTap tests
+  - PR3114: Don't assume system mime.types supports text/x-java-source
 * AArch64 port
   - S8148328: aarch64: redundant lsr instructions in stub code.
   - S8148783: aarch64: SEGV running SpecJBB2013
--- a/acinclude.m4	Wed Jul 27 05:41:48 2016 +0100
+++ b/acinclude.m4	Thu Jul 28 03:09:17 2016 +0100
@@ -3397,11 +3397,20 @@
      mime_types_file_found=no
   fi
   AC_MSG_RESULT([$mime_types_file_found])
-  if test "x${mime_types_file_found}" = "xno"; then
+  if test "x${mime_types_file_found}" = "xyes"; then
+    AC_MSG_CHECKING([if ${MIME_TYPES_FILE} has text/x-java-source])
+    if grep '^text/x-java-source' ${MIME_TYPES_FILE} >&AS_MESSAGE_LOG_FD ; then
+      java_source_supported=yes
+    else
+      java_source_supported=no
+    fi
+    AC_MSG_RESULT([$java_source_supported])
+  else
     AC_MSG_WARN([No system MIME types file found.])
   fi
   AC_SUBST([MIME_TYPES_FILE])
   AM_CONDITIONAL(MIME_TYPES_FILE_FOUND, test "x${mime_types_file_found}" = "xyes")
+  AM_CONDITIONAL(JAVA_SOURCE_SUPPORTED, test "x${java_source_supported}" = "xyes")    
 ])
 
 AC_DEFUN_ONCE([IT_DISABLE_SYSTEMTAP_TESTS],