Mercurial > hg > release > icedtea7-2.0
changeset 2177:9101193ed8b7
- Fixed IcedTea Bug# 446: Use JDK_UPDATE_VERSION to set the jpi version.
| author | Deepak Bhole <dbhole@redhat.com> |
|---|---|
| date | Mon, 22 Feb 2010 17:53:44 -0500 |
| parents | 6efc1920dff5 |
| children | 3b7e7b51b89f |
| files | ChangeLog Makefile.am plugin/icedteanp/IcedTeaNPPlugin.cc |
| diffstat | 3 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri May 28 13:59:18 2010 +0100 +++ b/ChangeLog Mon Feb 22 17:53:44 2010 -0500 @@ -1,3 +1,9 @@ +2010-02-22 Deepak Bhole <dbhole@redhat.com> + + * Makefile.am: Provide JDK_UPDATE_VERSION when compiling the plugin + * plugin/icedteanp/IcedTeaNPPlugin.cc: Use JDK_UPDATE_VERSION to set the + jpi version. + 2010-05-28 Andrew John Hughes <ahughes@redhat.com> * Makefile.am:
--- a/Makefile.am Fri May 28 13:59:18 2010 +0100 +++ b/Makefile.am Mon Feb 22 17:53:44 2010 -0500 @@ -2051,6 +2051,7 @@ $(PLUGIN_BUILD_DIR)/%.o: $(PLUGIN_SRCDIR)/%.cc mkdir -p $(PLUGIN_BUILD_DIR) && \ $(CXX) $(CXXFLAGS) \ + -DJDK_UPDATE_VERSION="\"$(JDK_UPDATE_VERSION)\"" \ -DPLUGIN_VERSION="\"$(PLUGIN_VERSION)\"" \ -DMOZILLA_VERSION_COLLAPSED="$(MOZILLA_VERSION_COLLAPSED)" \ $(GLIB_CFLAGS) \
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc Fri May 28 13:59:18 2010 +0100 +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Mon Feb 22 17:53:44 2010 -0500 @@ -107,7 +107,7 @@ "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_00:class,jar:IcedTea;" \ + "application/x-java-applet;jpi-version=1.6.0_" JDK_UPDATE_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 +123,7 @@ "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_00:class,jar:IcedTea;" \ + "application/x-java-bean;jpi-version=1.6.0_" JDK_UPDATE_VERSION ":class,jar:IcedTea;" \ "application/x-java-vm-npruntime::IcedTea;" #define PLUGIN_URL NS_INLINE_PLUGIN_CONTRACTID_PREFIX NS_JVM_MIME_TYPE