changeset in /hg/icedtea6: 2008-10-25 Matthias Klose <doko at ubu...

[doko at ubuntu.com]

changeset 4b16b588ba42 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=4b16b588ba42
description:
	2008-10-25  Matthias Klose  <doko at ubuntu.com>

	        * Makefile.am (gcjwebplugin.so, IcedTeaPlugin.o): Pass PLUGIN_VERSION.
	        * gcjwebplugin.cc, IcedTeaPlugin.cc: Encode PLUGIN_VERSION in
	        PLUGIN_DESCRIPTION.

diffstat:

4 files changed, 20 insertions(+), 2 deletions(-)
ChangeLog        |    6 ++++++
IcedTeaPlugin.cc |    2 +-
Makefile.am      |   12 ++++++++++++
gcjwebplugin.cc  |    2 +-

diffs (72 lines):

diff -r ce6a731bd3b9 -r 4b16b588ba42 ChangeLog
--- a/ChangeLog	Fri Oct 24 10:10:49 2008 -0400
+++ b/ChangeLog	Sat Oct 25 23:01:28 2008 +0200
@@ -1,3 +1,9 @@ 2008-10-24  Omair Majid <omajid at redhat.c
+2008-10-25  Matthias Klose  <doko at ubuntu.com>
+
+	* Makefile.am (gcjwebplugin.so, IcedTeaPlugin.o): Pass PLUGIN_VERSION.
+	* gcjwebplugin.cc, IcedTeaPlugin.cc: Encode PLUGIN_VERSION in
+	PLUGIN_DESCRIPTION.
+
 2008-10-24  Omair Majid <omajid at redhat.com>
 
 	* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java
diff -r ce6a731bd3b9 -r 4b16b588ba42 IcedTeaPlugin.cc
--- a/IcedTeaPlugin.cc	Fri Oct 24 10:10:49 2008 -0400
+++ b/IcedTeaPlugin.cc	Sat Oct 25 23:01:28 2008 +0200
@@ -275,7 +275,7 @@ inline long get_time_in_s()
 #endif
 
 #define PLUGIN_NAME "IcedTea Web Browser Plugin"
-#define PLUGIN_DESCRIPTION "The " PLUGIN_NAME " executes Java applets."
+#define PLUGIN_DESCRIPTION "The " PLUGIN_NAME PLUGIN_VERSION " executes Java applets."
 #define PLUGIN_MIME_DESC                                               \
   "application/x-java-vm:class,jar:IcedTea;"                           \
   "application/x-java-applet:class,jar:IcedTea;"                       \
diff -r ce6a731bd3b9 -r 4b16b588ba42 Makefile.am
--- a/Makefile.am	Fri Oct 24 10:10:49 2008 -0400
+++ b/Makefile.am	Sat Oct 25 23:01:28 2008 +0200
@@ -1415,10 +1415,16 @@ if ENABLE_GCJWEBPLUGIN
 if ENABLE_GCJWEBPLUGIN
 # gcjwebplugin.so.
 gcjwebplugin.so: gcjwebplugin.cc
+	if [ -e $(abs_top_srcdir)/.hg ] && which $(HG) >/dev/null; then \
+	  revision="-r`(cd $(abs_top_srcdir); $(HG) tip --template '{rev}')`" ; \
+	fi ; \
+	if [ -n "$(PKGVERSION)" ]; then plugin_version=" ($(PKGVERSION))"; fi; \
+	plugin_version=" $(PACKAGE_VERSION)$$revision$$plugin_version"; \
 	$(CXX) $(CXXFLAGS) $(MOZILLA_CFLAGS) \
 	  $(MOZILLA_LIBS) $(GLIB_CFLAGS) $(GLIB_LIBS) \
 	  $(GTK_CFLAGS) $(GTK_LIBS) \
 	  -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\"" \
+	  -DPLUGIN_VERSION="\"$$plugin_version\"" \
 	  -fPIC -shared -o $@ $<
 
 clean-gcjwebplugin:
@@ -1430,8 +1436,14 @@ if ENABLE_PLUGIN
 # is listed before -l options.  See:
 # http://developer.mozilla.org/en/docs/XPCOM_Glue
 IcedTeaPlugin.o: IcedTeaPlugin.cc
+	if [ -e $(abs_top_srcdir)/.hg ] && which $(HG) >/dev/null; then \
+	  revision="-r`(cd $(abs_top_srcdir); $(HG) tip --template '{rev}')`" ; \
+	fi ; \
+	if [ -n "$(PKGVERSION)" ]; then plugin_version=" ($(PKGVERSION))"; fi; \
+	plugin_version=" $(PACKAGE_VERSION)$$revision$$plugin_version"; \
 	$(CXX) $(CXXFLAGS) \
 	  -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\"" \
+	  -DPLUGIN_VERSION="\"$$plugin_version\"" \
 	  $(GTK_CFLAGS) \
 	  $(XULRUNNER_CFLAGS) \
 	  -fPIC -c -o $@ $<
diff -r ce6a731bd3b9 -r 4b16b588ba42 gcjwebplugin.cc
--- a/gcjwebplugin.cc	Fri Oct 24 10:10:49 2008 -0400
+++ b/gcjwebplugin.cc	Sat Oct 25 23:01:28 2008 +0200
@@ -84,7 +84,7 @@ exception statement from your version. *
 
 // Plugin information passed to about:plugins.
 #define PLUGIN_NAME "GCJ Web Browser Plugin (using IcedTea)"
-#define PLUGIN_DESC "The " PLUGIN_NAME " executes Java applets."
+#define PLUGIN_DESC "The " PLUGIN_NAME PLUGIN_VERSION " executes Java applets."
 #define PLUGIN_MIME_DESC                                               \
   "application/x-java-vm:class,jar:IcedTea;"                           \
   "application/x-java-applet:class,jar:IcedTea;"                       \