Mercurial > hg > release > icedtea6-1.11

changeset 1934:6692226bafb6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- 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 b30c8301d479
children 1365cc7a840d
files ChangeLog Makefile.am plugin/icedteanp/IcedTeaNPPlugin.cc
diffstat 3 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Feb 22 16:54:32 2010 -0500
+++ 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-02-22  Deepak Bhole <dbhole@redhat.com>
 
 	* plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: Centralized
--- a/Makefile.am	Mon Feb 22 16:54:32 2010 -0500
+++ b/Makefile.am	Mon Feb 22 17:53:44 2010 -0500
@@ -1608,6 +1608,7 @@
 	mkdir -p $(NPPLUGIN_DIR) && \
 	cd $(NPPLUGIN_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	Mon Feb 22 16:54:32 2010 -0500
+++ 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