/hg/release/icedtea-web-1.2: 2 new changesets

[doko at icedtea.classpath.org]

changeset c20a74b4136c in /hg/release/icedtea-web-1.2
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.2?cmd=changeset;node=c20a74b4136c
author: doko at ubuntu.com
date: Mon Feb 27 22:03:15 2012 +0100

	Define mime descriptions for 1.7, when built with Java7

	2012-02-27 Matthias Klose <doko at ubuntu.com>

	 * acinclude.m4 (IT_FIND_JAVA): Set VERSION_DEFS.
	        * Makefile.am ($(PLUGIN_DIR)/%.o): Pass $(VERSION_DEFS)
	        * IcedTeaNPPlugin.cc (PLUGIN_MIME_DESC): Define in terms of
	HAVE_JAVA7.


changeset 07717ba83e5f in /hg/release/icedtea-web-1.2
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.2?cmd=changeset;node=07717ba83e5f
author: doko at ubuntu.com
date: Mon Feb 27 22:04:05 2012 +0100

	Use the mozilla-plugin pkgconfig module if the libxul module is not
	available

	2012-02-27 Matthias Klose <doko at ubuntu.com>

	 * acinclude.m4 (IT_CHECK_PLUGIN_DEPENDENCIES): Use the
	mozilla-plugin pkgconfig module if the libxul module is not
	available.


diffstat:

 ChangeLog                           |  12 ++++++++++++
 Makefile.am                         |   2 +-
 acinclude.m4                        |   8 ++++++++
 plugin/icedteanp/IcedTeaNPPlugin.cc |  18 ++++++++++++++++--
 4 files changed, 37 insertions(+), 3 deletions(-)

diffs (98 lines):

diff -r a25e0ec36020 -r 07717ba83e5f ChangeLog
--- a/ChangeLog	Mon Feb 27 14:47:39 2012 -0500
+++ b/ChangeLog	Mon Feb 27 22:04:05 2012 +0100
@@ -1,3 +1,15 @@
+2012-02-27  Matthias Klose  <doko at ubuntu.com>
+
+	* acinclude.m4 (IT_CHECK_PLUGIN_DEPENDENCIES): Use the mozilla-plugin
+	 pkgconfig module if the libxul module is not available.
+
+2012-02-27  Matthias Klose  <doko at ubuntu.com>
+
+	* acinclude.m4 (IT_FIND_JAVA): Set VERSION_DEFS.
+	* Makefile.am ($(PLUGIN_DIR)/%.o): Pass $(VERSION_DEFS)
+	* IcedTeaNPPlugin.cc (PLUGIN_MIME_DESC): Define in terms
+	of HAVE_JAVA7.
+
 2012-02-27  Thomas Meyer <thomas at m3y3r.de>
 			Deepak Bhole <dbhole at redhat.com>
 
diff -r a25e0ec36020 -r 07717ba83e5f Makefile.am
--- a/Makefile.am	Mon Feb 27 14:47:39 2012 -0500
+++ b/Makefile.am	Mon Feb 27 22:04:05 2012 +0100
@@ -213,7 +213,7 @@
 	mkdir -p $(PLUGIN_DIR) && \
 	cd $(PLUGIN_DIR) && \
 	$(CXX) $(CXXFLAGS) \
-	   $(DEFS) \
+	   $(DEFS) $(VERSION_DEFS) \
 	  -DJDK_UPDATE_VERSION="\"$(JDK_UPDATE_VERSION)\"" \
 	  -DPLUGIN_NAME="\"IcedTea-Web Plugin\"" \
 	  -DPLUGIN_VERSION="\"$(PLUGIN_VERSION)\"" \
diff -r a25e0ec36020 -r 07717ba83e5f acinclude.m4
--- a/acinclude.m4	Mon Feb 27 14:47:39 2012 -0500
+++ b/acinclude.m4	Mon Feb 27 22:04:05 2012 +0100
@@ -396,6 +396,9 @@
     if pkg-config --modversion libxul >/dev/null 2>&1
     then
       xulrunner_cv_collapsed_version=`pkg-config --modversion libxul | awk -F. '{power=6; v=0; for (i=1; i <= NF; i++) {v += $i * 10 ^ power; power -=2}; print v}'`
+    elif pkg-config --modversion mozilla-plugin >/dev/null 2>&1
+    then
+      xulrunner_cv_collapsed_version=`pkg-config --modversion mozilla-plugin | awk -F. '{power=6; v=0; for (i=1; i <= NF; i++) {v += $i * 10 ^ power; power -=2}; print v}'`
     else
       AC_MSG_FAILURE([cannot determine xulrunner version])
     fi])
@@ -673,6 +676,11 @@
   fi
   AC_MSG_RESULT(${JAVA})
   AC_SUBST(JAVA)
+  JAVA_VERSION=`$JAVA -version 2>&1 | sed -n '1s/@<:@^"@:>@*"\(.*\)"$/\1/p'`
+  case "${JAVA_VERSION}" in
+    1.7*) VERSION_DEFS='-DHAVE_JAVA7';;
+  esac
+  AC_SUBST(VERSION_DEFS)
 ])
 
 AC_DEFUN_ONCE([IT_FIND_KEYTOOL],
diff -r a25e0ec36020 -r 07717ba83e5f plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc	Mon Feb 27 14:47:39 2012 -0500
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc	Mon Feb 27 22:04:05 2012 +0100
@@ -90,6 +90,18 @@
 #define PLUGIN_FULL_NAME PLUGIN_NAME " (using " PLUGIN_VERSION ")"
 #define PLUGIN_DESC "The <a href=\"" PACKAGE_URL "\">" PLUGIN_NAME "</a> executes Java applets."
 
+#ifdef HAVE_JAVA7
+ #define JPI_VERSION "1.7.0_" JDK_UPDATE_VERSION
+ #define PLUGIN_APPLET_MIME_DESC7 \
+  "application/x-java-applet;version=1.7:class,jar:IcedTea;"
+ #define PLUGIN_BEAN_MIME_DESC7 \
+  "application/x-java-bean;version=1.7:class,jar:IcedTea;"
+#else
+ #define JPI_VERSION "1.6.0_" JDK_UPDATE_VERSION
+ #define PLUGIN_APPLET_MIME_DESC7
+ #define PLUGIN_BEAN_MIME_DESC7
+#endif
+
 #define PLUGIN_MIME_DESC                                               \
   "application/x-java-vm:class,jar:IcedTea;"                           \
   "application/x-java-applet:class,jar:IcedTea;"                       \
@@ -107,7 +119,8 @@
   "application/x-java-applet;version=1.4.2:class,jar:IcedTea;"         \
   "application/x-java-applet;version=1.5:class,jar:IcedTea;"           \
   "application/x-java-applet;version=1.6:class,jar:IcedTea;"           \
-  "application/x-java-applet;jpi-version=1.6.0_" JDK_UPDATE_VERSION ":class,jar:IcedTea;"  \
+  PLUGIN_APPLET_MIME_DESC7 \
+  "application/x-java-applet;jpi-version=" JPI_VERSION ":class,jar:IcedTea;"  \
   "application/x-java-bean:class,jar:IcedTea;"                         \
   "application/x-java-bean;version=1.1:class,jar:IcedTea;"             \
   "application/x-java-bean;version=1.1.1:class,jar:IcedTea;"           \
@@ -123,7 +136,8 @@
   "application/x-java-bean;version=1.4.2:class,jar:IcedTea;"           \
   "application/x-java-bean;version=1.5:class,jar:IcedTea;"             \
   "application/x-java-bean;version=1.6:class,jar:IcedTea;"             \
-  "application/x-java-bean;jpi-version=1.6.0_" JDK_UPDATE_VERSION ":class,jar:IcedTea;"    \
+  PLUGIN_BEAN_MIME_DESC7 \
+  "application/x-java-bean;jpi-version=" JPI_VERSION ":class,jar:IcedTea;"    \
   "application/x-java-vm-npruntime::IcedTea;"
 
 #define PLUGIN_URL NS_INLINE_PLUGIN_CONTRACTID_PREFIX NS_JVM_MIME_TYPE