Mercurial > hg > release > icedtea-web-1.1
changeset 283:08b063e5536b
Define mime descriptions for 1.7, when built with Java7
2012-02-27 Matthias Klose <doko@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.
| author | doko@ubuntu.com |
|---|---|
| date | Mon, 27 Feb 2012 22:05:46 +0100 |
| parents | 0e782b6b2cbb |
| children | 3c0f13d17deb |
| files | ChangeLog Makefile.am acinclude.m4 plugin/icedteanp/IcedTeaNPPlugin.cc |
| diffstat | 4 files changed, 29 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Feb 27 14:47:39 2012 -0500 +++ b/ChangeLog Mon Feb 27 22:05:46 2012 +0100 @@ -1,3 +1,10 @@ +2012-02-27 Matthias Klose <doko@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@m3y3r.de> Deepak Bhole <dbhole@redhat.com>
--- a/Makefile.am Mon Feb 27 14:47:39 2012 -0500 +++ b/Makefile.am Mon Feb 27 22:05:46 2012 +0100 @@ -202,7 +202,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)\"" \
--- a/acinclude.m4 Mon Feb 27 14:47:39 2012 -0500 +++ b/acinclude.m4 Mon Feb 27 22:05:46 2012 +0100 @@ -669,6 +669,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([IT_FIND_JAVADOC],
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc Mon Feb 27 14:47:39 2012 -0500 +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Mon Feb 27 22:05:46 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