changeset in /hg/icedtea6: - Fix issue that was causing gcj buil...
Deepak Bhole
dbhole at redhat.com
Fri Oct 17 01:03:10 PDT 2008
changeset d7d655481120 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d7d655481120
description:
- Fix issue that was causing gcj build to fail.
- Fix crash when jvm dies unexpectedly
diffstat:
3 files changed, 50 insertions(+), 47 deletions(-)
IcedTeaPlugin.cc | 29 ++++++++++++++++-------------
Makefile.am | 48 ++++++++++++++++++++++++------------------------
configure.ac | 20 ++++++++++----------
diffs (185 lines):
diff -r add7ca8b2072 -r d7d655481120 IcedTeaPlugin.cc
--- a/IcedTeaPlugin.cc Fri Oct 17 01:22:45 2008 -0400
+++ b/IcedTeaPlugin.cc Fri Oct 17 03:58:00 2008 -0400
@@ -2566,20 +2566,23 @@ plugin_in_pipe_callback (GIOChannel* sou
{
PLUGIN_DEBUG ("appletviewer has stopped.");
keep_installed = FALSE;
+ } else
+ {
+
+
+ // push message to queue
+ PR_EnterMonitor(jvmMsgQueuePRMonitor);
+ jvmMsgQueue.push(nsCString(message));
+ PR_ExitMonitor(jvmMsgQueuePRMonitor);
+
+ // poke process thread
+ PRThread *prThread;
+ processThread->GetPRThread(&prThread);
+ PRStatus res = PR_Interrupt(prThread);
+
}
- // push message to queue
- PR_EnterMonitor(jvmMsgQueuePRMonitor);
- jvmMsgQueue.push(nsCString(message));
- PR_ExitMonitor(jvmMsgQueuePRMonitor);
-
- // poke process thread
- PRThread *prThread;
- processThread->GetPRThread(&prThread);
- PRStatus res = PR_Interrupt(prThread);
-
PLUGIN_DEBUG ("plugin_in_pipe_callback return");
-
return keep_installed;
}
@@ -4325,13 +4328,13 @@ IcedTeaJNIEnv::GetEnabledPrivileges(nsCS
if (hasUniversalBrowserRead == PR_TRUE)
{
*privileges += "UniversalBrowserRead";
- *privileges += ",";
}
ctx->Implies("UniversalJavaPermission", "UniversalJavaPermission", &hasUniversalJavaPermission);
if (hasUniversalJavaPermission == PR_TRUE)
{
- *privileges += "UniversalJavaPermission";
+ *privileges += ",";
+ *privileges += "UniversalJavaPermission";
}
}
diff -r add7ca8b2072 -r d7d655481120 Makefile.am
--- a/Makefile.am Fri Oct 17 01:22:45 2008 -0400
+++ b/Makefile.am Fri Oct 17 03:58:00 2008 -0400
@@ -961,16 +961,16 @@ stamps/icedtea.stamp: stamps/bootstrap-d
$(ICEDTEA_ENV) \
-C openjdk/control/make/ \
$(ICEDTEA_BUILD_TARGET)
+if ENABLE_GCJWEBPLUGIN
+ cp -pPRf gcjwebplugin.so \
+ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+ cp -pPRf gcjwebplugin.so \
+ $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
+else
if ENABLE_PLUGIN
cp -pPRf IcedTeaPlugin.so \
$(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
cp -pPRf IcedTeaPlugin.so \
- $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
-else
-if ENABLE_GCJWEBPLUGIN
- cp -pPRf gcjwebplugin.so \
- $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
- cp -pPRf gcjwebplugin.so \
$(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
endif
endif
@@ -1024,16 +1024,16 @@ stamps/icedtea-debug.stamp: stamps/boots
$(ICEDTEA_ENV) \
-C openjdk/control/make \
$(ICEDTEA_DEBUG_BUILD_TARGET)
+if ENABLE_GCJWEBPLUGIN
+ cp -pPRf gcjwebplugin.so \
+ $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+ cp -pPRf gcjwebplugin.so \
+ $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR)
+else
if ENABLE_PLUGIN
cp -pPRf IcedTeaPlugin.so \
$(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
cp -pPRf IcedTeaPlugin.so \
- $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR)
-else
-if ENABLE_GCJWEBPLUGIN
- cp -pPRf gcjwebplugin.so \
- $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
- cp -pPRf gcjwebplugin.so \
$(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR)
endif
endif
@@ -1393,6 +1393,18 @@ clean-cacao:
rm -rf cacao
rm -f stamps/cacao.stamp
+if ENABLE_GCJWEBPLUGIN
+# gcjwebplugin.so.
+gcjwebplugin.so: gcjwebplugin.cc
+ $(CXX) $(CXXFLAGS) $(MOZILLA_CFLAGS) \
+ $(MOZILLA_LIBS) $(GLIB_CFLAGS) $(GLIB_LIBS) \
+ $(GTK_CFLAGS) $(GTK_LIBS) \
+ -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\"" \
+ -fPIC -shared -o $@ $<
+
+clean-gcjwebplugin:
+ rm -f gcjwebplugin.so
+else
if ENABLE_PLUGIN
# IcedTeaPlugin.so.
# Separate compile and link invocations to ensure intermediate object
@@ -1414,18 +1426,6 @@ clean-IcedTeaPlugin:
clean-IcedTeaPlugin:
rm -f IcedTeaPlugin.o
rm -f IcedTeaPlugin.so
-else
-if ENABLE_GCJWEBPLUGIN
-# gcjwebplugin.so.
-gcjwebplugin.so: gcjwebplugin.cc
- $(CXX) $(CXXFLAGS) $(MOZILLA_CFLAGS) \
- $(MOZILLA_LIBS) $(GLIB_CFLAGS) $(GLIB_LIBS) \
- $(GTK_CFLAGS) $(GTK_LIBS) \
- -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\"" \
- -fPIC -shared -o $@ $<
-
-clean-gcjwebplugin:
- rm -f gcjwebplugin.so
endif
endif
diff -r add7ca8b2072 -r d7d655481120 configure.ac
--- a/configure.ac Fri Oct 17 01:22:45 2008 -0400
+++ b/configure.ac Fri Oct 17 03:58:00 2008 -0400
@@ -124,8 +124,8 @@ AM_CONDITIONAL(ENABLE_PLUGIN, test "x${e
AC_ARG_ENABLE([gcjwebplugin],
[AS_HELP_STRING([--enable-gcjwebplugin],
- [Build the GCJ Web Plugin plugin])],
- [enable_gcjplugin="yes"], [enable_gcjplugin="no"])
+ [Build the GCJ Web Plugin plugin (deprecated)])],
+ [enable_gcjwebplugin="yes"], [enable_gcjwebplugin="no"])
AM_CONDITIONAL(ENABLE_GCJWEBPLUGIN, test "x${enable_gcjwebplugin}" = "xyes")
AC_ARG_ENABLE([pulse-java],
@@ -384,14 +384,8 @@ fi
dnl Check for plugin support headers and libraries.
dnl FIXME: use unstable
-if test "x${enable_plugin}" = "xyes"
-then
- PKG_CHECK_MODULES(XULRUNNER, \
- nspr mozilla-js mozilla-plugin libxul-unstable >= 1.9)
- PKG_CHECK_MODULES(GTK, gtk+-2.0)
-else
- if test "x${enable_gcjwebplugin}" = "xyes"
- then
+if test "x${enable_gcjwebplugin}" = "xyes"
+then
PKG_CHECK_MODULES(MOZILLA, mozilla-plugin libxul-unstable, \
[MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
if test "x${MOZILLA_FOUND}" = xno
@@ -438,6 +432,12 @@ else
AC_SUBST(GLIB_LIBS)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
+else
+ if test "x${enable_plugin}" = "xyes"
+ then
+ PKG_CHECK_MODULES(XULRUNNER, \
+ nspr mozilla-js mozilla-plugin libxul-unstable >= 1.9)
+ PKG_CHECK_MODULES(GTK, gtk+-2.0)
fi
fi
More information about the distro-pkg-dev
mailing list