/hg/release/icedtea6-1.7: 4 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Jan 25 13:59:19 PST 2010
changeset 59e7cd9e484f in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=59e7cd9e484f
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jan 25 21:31:04 2010 +0000
Make new plugin support more platforms.
2010-01-22 Deepak Bhole <dbhole at redhat.com>
* Makefile.am: Use MOZILLA_CFLAGS/LIBS rather than
XULRUNNER.
* configure.ac: Check for Mozilla not XULrunner. Bring
in libxul-unstable as well.
* plugin/icedteanp/IcedTeaNPPlugin.cc: Use PRInt32 rather than
PRInt32_t for port.
changeset 8813aa891981 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=8813aa891981
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jan 25 21:49:03 2010 +0000
Build NPPlugin in the correct place.
2010-01-25 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Build NPPlugin in the build
directory, not the source tree.
changeset c836d8e37beb in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=c836d8e37beb
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jan 25 21:52:19 2010 +0000
Fix trailing space after plugin version when pkgversion not set.
2010-01-25 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Remove trailing space after IcedTea
version in plugin version information when package
version is not set.
changeset 5ac24157f4ba in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=5ac24157f4ba
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jan 25 21:59:04 2010 +0000
Provide a plugin alias depending on the appropriate plugin stamp.
2010-01-25 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Provide stamp targets for both
npplugin and the old plugin so 'make plugin' builds
the one configured.
diffstat:
4 files changed, 61 insertions(+), 15 deletions(-)
ChangeLog | 31 +++++++++++++++++++++++++++++
Makefile.am | 37 ++++++++++++++++++++++++-----------
configure.ac | 6 ++---
plugin/icedteanp/IcedTeaNPPlugin.cc | 2 -
diffs (172 lines):
diff -r 4336498d14b4 -r 5ac24157f4ba ChangeLog
--- a/ChangeLog Mon Jan 25 19:42:12 2010 +0000
+++ b/ChangeLog Mon Jan 25 21:59:04 2010 +0000
@@ -1,3 +1,34 @@ 2010-01-25 Andrew John Hughes <ahughes@
+2010-01-25 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ Provide stamp targets for both npplugin
+ and the old plugin so 'make plugin' builds
+ the one configured.
+
+2010-01-25 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ Remove trailing space after IcedTea version
+ in plugin version information when package
+ version is not set.
+
+2010-01-25 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ Build NPPlugin in the build directory,
+ not the source tree.
+
+2010-01-22 Deepak Bhole <dbhole at redhat.com>
+
+ * Makefile.am:
+ Use MOZILLA_CFLAGS/LIBS rather than
+ XULRUNNER.
+ * configure.ac:
+ Check for Mozilla not XULrunner.
+ Bring in libxul-unstable as well.
+ * plugin/icedteanp/IcedTeaNPPlugin.cc:
+ Use PRInt32 rather than PRInt32_t for port.
+
2010-01-25 Andrew John Hughes <ahughes at redhat.com>
* IcedTeaPlugin.cc:
diff -r 4336498d14b4 -r 5ac24157f4ba Makefile.am
--- a/Makefile.am Mon Jan 25 19:42:12 2010 +0000
+++ b/Makefile.am Mon Jan 25 21:59:04 2010 +0000
@@ -116,7 +116,8 @@ ICEDTEAPLUGIN_TARGET = stamps/icedtea-np
ICEDTEAPLUGIN_TARGET = stamps/icedtea-npplugin
PLUGIN_PATCH = patches/icedtea-liveconnect.patch
LIVECONNECT_DIR = -C lib/rt netscape
-NPPLUGIN_DIR=$(abs_top_srcdir)/plugin/icedteanp
+NPPLUGIN_DIR=$(abs_top_builddir)/plugin/icedteanp
+NPPLUGIN_SRCDIR=$(abs_top_srcdir)/plugin/icedteanp
LIVECONNECT_SRCS = $(NPPLUGIN_DIR)/java
else
if ENABLE_PLUGIN
@@ -386,10 +387,10 @@ ICEDTEA_REV="+${ICEDTEA_REVISION}"
ICEDTEA_REV="+${ICEDTEA_REVISION}"
endif
if HAS_PKGVERSION
-ICEDTEA_PKG="(${PKGVERSION})"
-endif
-
-PLUGIN_VERSION=$(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV) $(ICEDTEA_PKG)
+ICEDTEA_PKG=" (${PKGVERSION})"
+endif
+
+PLUGIN_VERSION=$(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)$(ICEDTEA_PKG)
ICEDTEA_ENV = \
IMPORT_BINARY_PLUGS=true \
@@ -1489,7 +1490,8 @@ NPPLUGIN_OBJECTS=IcedTeaNPPlugin.o IcedT
IcedTeaJavaRequestProcessor.o IcedTeaPluginRequestProcessor.o \
IcedTeaPluginUtils.o
-$(addprefix $(NPPLUGIN_DIR)/,$(NPPLUGIN_OBJECTS)): $(addprefix $(NPPLUGIN_DIR)/,$(NPPLUGIN_SRC))
+$(addprefix $(NPPLUGIN_DIR)/,$(NPPLUGIN_OBJECTS)): $(addprefix $(NPPLUGIN_SRCDIR)/,$(NPPLUGIN_SRC))
+ mkdir -p $(NPPLUGIN_DIR) && \
cd $(NPPLUGIN_DIR) && \
$(CXX) $(CXXFLAGS) \
-DPLUGIN_VERSION="\"$(PLUGIN_VERSION)\"" \
@@ -1497,7 +1499,7 @@ NPPLUGIN_OBJECTS=IcedTeaNPPlugin.o IcedT
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
$(MOZILLA_CFLAGS) \
- -fPIC -c $(NPPLUGIN_SRC)
+ -fPIC -c $(addprefix $(NPPLUGIN_SRCDIR)/,$(NPPLUGIN_SRC))
$(NPPLUGIN_DIR)/IcedTeaNPPlugin.so: $(addprefix $(NPPLUGIN_DIR)/,$(NPPLUGIN_OBJECTS))
cd $(NPPLUGIN_DIR) && \
@@ -1508,8 +1510,9 @@ NPPLUGIN_OBJECTS=IcedTeaNPPlugin.o IcedT
$(MOZILLA_LIBS)\
-shared -o $@
-stamps/icedtea-npplugin: $(NPPLUGIN_DIR)/IcedTeaNPPlugin.so
- touch stamps/icedtea-npplugin
+stamps/icedtea-npplugin.stamp: $(NPPLUGIN_DIR)/IcedTeaNPPlugin.so
+ mkdir -p stamps
+ touch stamps/icedtea-npplugin.stamp
clean-IcedTeaNPPlugin:
cd $(NPPLUGIN_DIR);\
@@ -1527,14 +1530,18 @@ IcedTeaPlugin.o: IcedTeaPlugin.cc
-DPLUGIN_VERSION="\"$(PLUGIN_VERSION)\"" \
-DMOZILLA_VERSION_COLLAPSED="$(MOZILLA_VERSION_COLLAPSED)" \
$(GTK_CFLAGS) \
- $(XULRUNNER_CFLAGS) \
+ $(MOZILLA_CFLAGS) \
-fPIC -c -o $@ $<
IcedTeaPlugin.so: IcedTeaPlugin.o
$(CXX) $(CXXFLAGS) \
$< \
$(GTK_LIBS) \
- $(XULRUNNER_LIBS) \
+ $(MOZILLA_LIBS) \
-shared -o $@
+
+stamps/icedtea-plugin.stamp: IcedTeaPlugin.so
+ mkdir -p stamps
+ touch stamps/icedtea-plugin.stamp
clean-IcedTeaPlugin:
rm -f IcedTeaPlugin.o
@@ -2216,3 +2223,11 @@ clean: distclean-local
clean: distclean-local
jtreg: stamps/jtreg.stamp
+
+if ENABLE_NPPLUGIN
+plugin: stamps/icedtea-npplugin.stamp
+else
+if ENABLE_PLUGIN
+plugin: stamps/icedtea-plugin.stamp
+endif
+endif
diff -r 4336498d14b4 -r 5ac24157f4ba configure.ac
--- a/configure.ac Mon Jan 25 19:42:12 2010 +0000
+++ b/configure.ac Mon Jan 25 21:59:04 2010 +0000
@@ -419,7 +419,7 @@ dnl FIXME: use unstable
dnl FIXME: use unstable
if test "x${enable_plugin}" = "xyes"
then
- PKG_CHECK_MODULES(XULRUNNER, \
+ PKG_CHECK_MODULES(MOZILLA, \
nspr mozilla-js mozilla-plugin libxul-unstable >= 1.9)
PKG_CHECK_MODULES(GTK, gtk+-2.0)
PKG_CHECK_MODULES(GLIB, glib-2.0)
@@ -435,7 +435,7 @@ if test "x${enable_npplugin}" = "xyes"
if test "x${enable_npplugin}" = "xyes"
then
PKG_CHECK_MODULES(MOZILLA, \
- mozilla-plugin libxul)
+ mozilla-plugin libxul libxul-unstable)
PKG_CHECK_MODULES(GTK, gtk+-2.0)
PKG_CHECK_MODULES(GLIB, glib-2.0)
@@ -451,7 +451,7 @@ then
then
AC_LANG_PUSH([C++])
OLDCPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $XULRUNNER_CFLAGS"
+ CPPFLAGS="$CPPFLAGS $MOZILLA_CFLAGS"
AC_CACHE_CHECK([for xulrunner version], [xulrunner_cv_collapsed_version],
[AC_RUN_IFELSE(
diff -r 4336498d14b4 -r 5ac24157f4ba plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc Mon Jan 25 19:42:12 2010 +0000
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Mon Jan 25 21:59:04 2010 +0000
@@ -1336,7 +1336,7 @@ get_proxy_info(const char* siteAddr, cha
// if proxy info is available, extract it
nsCString phost;
- PRint32_t pport;
+ PRInt32 pport;
nsCString ptype;
info->GetHost(phost);
More information about the distro-pkg-dev
mailing list