changeset in /hg/icedtea6: * Makefile.am: Remove GCJ Web Plugin ...
Deepak Bhole
dbhole at redhat.com
Wed May 6 13:07:32 PDT 2009
changeset c5c31d555ae3 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c5c31d555ae3
description:
* Makefile.am: Remove GCJ Web Plugin support.
* configure.ac: Ditto.
diffstat:
3 files changed, 20 insertions(+), 110 deletions(-)
ChangeLog | 5 ++++
Makefile.am | 57 +++++-------------------------------------------
configure.ac | 68 +++++++---------------------------------------------------
diffs (253 lines):
diff -r 538d1a817e21 -r c5c31d555ae3 ChangeLog
--- a/ChangeLog Wed May 06 14:09:31 2009 -0400
+++ b/ChangeLog Wed May 06 16:10:04 2009 -0400
@@ -1,3 +1,8 @@ 2009-05-06 Lillian Angel <langel at redha
+2009-05-05 Deepak Bhole <dbhole at redhat.com>
+
+ * Makefile.am: Remove GCJ Web Plugin support.
+ * configure.ac: Ditto.
+
2009-05-06 Lillian Angel <langel at redhat.com>
Fixes bz#498108
diff -r 538d1a817e21 -r c5c31d555ae3 Makefile.am
--- a/Makefile.am Wed May 06 14:09:31 2009 -0400
+++ b/Makefile.am Wed May 06 16:10:04 2009 -0400
@@ -8,12 +8,6 @@ NETBEANS_PROFILER_MD5SUM = a6756a62291eb
NETBEANS_PROFILER_MD5SUM = a6756a62291ebea5c0e2431389b31380
VISUALVM_MD5SUM = a289739f4a5bcdb9a2c642cfcc1e83fe
-if ENABLE_GCJWEBPLUGIN
-GCJWEBPLUGIN_CLEAN = clean-gcjwebplugin
-GCJWEBPLUGIN_TARGET = gcjwebplugin.so
-else
-GCJWEBPLUGIN_CLEAN =
-GCJWEBPLUGIN_TARGET =
if ENABLE_PLUGIN
ICEDTEAPLUGIN_CLEAN = clean-IcedTeaPlugin
ICEDTEAPLUGIN_TARGET = IcedTeaPlugin.so
@@ -22,9 +16,8 @@ else
else
ICEDTEAPLUGIN_CLEAN =
ICEDTEAPLUGIN_TARGET =
-PLUGIN_PATCH = patches/icedtea-plugin.patch
+PLUGIN_PATCH =
LIVECONNECT_DIR =
-endif
endif
if ENABLE_PULSE_JAVA
@@ -68,9 +61,6 @@ if ENABLE_PLUGIN
if ENABLE_PLUGIN
rm -f IcedTeaPlugin.o IcedTeaPlugin.so
else
-if ENABLE_GCJWEBPLUGIN
- rm -f gcjwebplugin.so
-endif
endif
if BUILD_CACAO
rm -rf cacao
@@ -89,13 +79,12 @@ install:
clean-bootstrap-directory-symlink-ecj icedtea icedtea-debug \
clean-icedtea icedtea-against-icedtea clean-icedtea-ecj clean-plugs \
clean-tools-jar clean-shared-objects clean-visualvm clean-nbplatform \
- clean-copy clean-hotspot-tools clean-rt $(GCJWEBPLUGIN_CLEAN) \
- $(ICEDTEAPLUGIN_CLEAN) hotspot hotspot-helper clean-extra \
- clean-jtreg clean-jtreg-reports
+ clean-copy clean-hotspot-tools clean-rt $(ICEDTEAPLUGIN_CLEAN) \
+ hotspot hotspot-helper clean-extra clean-jtreg clean-jtreg-reports
EXTRA_DIST = rt generated \
patches/* \
- gcjwebplugin.cc tools-copy contrib ports \
+ tools-copy contrib ports \
extra overlays \
javaws.png javaws.desktop visualvm.desktop \
jconsole.desktop policytool.desktop \
@@ -1119,7 +1108,7 @@ stamps/icedtea.stamp: stamps/bootstrap-d
stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \
stamps/hotspot-tools.stamp stamps/plugs.stamp \
stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
- $(GCJWEBPLUGIN_TARGET) $(ICEDTEAPLUGIN_TARGET) \
+ $(ICEDTEAPLUGIN_TARGET) \
extra-lib/about.jar stamps/cacao.stamp stamps/visualvm.stamp \
stamps/pulse-java.stamp
$(ARCH_PREFIX) $(MAKE) \
@@ -1130,18 +1119,11 @@ stamps/icedtea.stamp: stamps/bootstrap-d
mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext
-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)
-endif
endif
if ENABLE_PULSE_JAVA
cp -pPRf libpulse-java.so \
@@ -1204,7 +1186,7 @@ stamps/icedtea-debug.stamp: stamps/boots
stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \
stamps/hotspot-tools.stamp stamps/plugs.stamp \
stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
- $(GCJWEBPLUGIN_TARGET) $(ICEDTEAPLUGIN_TARGET) \
+ $(ICEDTEAPLUGIN_TARGET) \
extra-lib/about.jar stamps/cacao.stamp stamps/visualvm.stamp \
stamps/pulse-java.stamp
$(ARCH_PREFIX) $(MAKE) \
@@ -1215,18 +1197,11 @@ stamps/icedtea-debug.stamp: stamps/boots
mkdir -p $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR)
mkdir -p $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/ext
mkdir -p $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/ext
-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)
-endif
endif
if ENABLE_PULSE_JAVA
cp -pPRf libpulse-java.so \
@@ -1624,24 +1599,6 @@ clean-cacao:
rm -rf cacao
rm -f stamps/cacao.stamp
-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:
- rm -f gcjwebplugin.so
-else
if ENABLE_PLUGIN
# IcedTeaPlugin.so.
# Separate compile and link invocations to ensure intermediate object
@@ -1671,8 +1628,6 @@ clean-IcedTeaPlugin:
rm -f IcedTeaPlugin.o
rm -f IcedTeaPlugin.so
endif
-endif
-
# PulseAudio based mixer
# (pulse-java)
diff -r 538d1a817e21 -r c5c31d555ae3 configure.ac
--- a/configure.ac Wed May 06 14:09:31 2009 -0400
+++ b/configure.ac Wed May 06 16:10:04 2009 -0400
@@ -127,21 +127,13 @@ AM_CONDITIONAL(WITH_VISUALVM, test "x${e
AM_CONDITIONAL(WITH_VISUALVM, test "x${enable_visualvm}" = "xyes")
AC_MSG_RESULT(${enable_visualvm})
-AC_MSG_CHECKING([whether to build the LiveConnect plugin])
-AC_ARG_ENABLE([liveconnect],
- [AS_HELP_STRING([--disable-liveconnect],
+AC_MSG_CHECKING([whether to build the browser plugin])
+AC_ARG_ENABLE([plugin],
+ [AS_HELP_STRING([--disable-plugin],
[Disable compilation of browser plugin])],
[enable_plugin="${enableval}"], [enable_plugin="yes"])
AM_CONDITIONAL(ENABLE_PLUGIN, test "x${enable_plugin}" = "xyes")
AC_MSG_RESULT(${enable_plugin})
-
-AC_MSG_CHECKING([whether to build gcjwebplugin])
-AC_ARG_ENABLE([gcjwebplugin],
- [AS_HELP_STRING([--enable-gcjwebplugin],
- [Build the GCJ Web Plugin plugin (deprecated)])],
- [enable_gcjwebplugin="${enableval}"], [enable_gcjwebplugin="no"])
-AM_CONDITIONAL(ENABLE_GCJWEBPLUGIN, test "x${enable_gcjwebplugin}" = "xyes")
-AC_MSG_RESULT(${enable_gcjwebplugin})
AC_MSG_CHECKING([whether to include PulseAudio support])
AC_ARG_ENABLE([pulse-java],
@@ -452,47 +444,12 @@ fi
dnl Check for plugin support headers and libraries.
dnl FIXME: use unstable
-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
- then
- PKG_CHECK_MODULES(MOZILLA, mozilla-plugin, \
- [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
- fi
- if test "x${MOZILLA_FOUND}" = xno
- then
- PKG_CHECK_MODULES(MOZILLA, firefox-plugin firefox-xpcom, \
- [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
- fi
- if test "x${MOZILLA_FOUND}" = xno
- then
- PKG_CHECK_MODULES(MOZILLA, xulrunner-plugin xulrunner-xpcom, \
- [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
- fi
- if test "x${MOZILLA_FOUND}" = xno
- then
- PKG_CHECK_MODULES(MOZILLA, mozilla-firefox-plugin mozilla-firefox-xpcom, \
- [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
- fi
- if test "x${MOZILLA_FOUND}" = xno
- then
- PKG_CHECK_MODULES(MOZILLA, seamonkey-plugin seamonkey-xpcom, \
- [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
- fi
- if test "x${MOZILLA_FOUND}" = xno
- then
- PKG_CHECK_MODULES(MOZILLA, iceape-plugin iceape-xpcom, \
- [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
- fi
- if test "x${MOZILLA_FOUND}" = xno
- then
- AC_MSG_ERROR([Could not find plugin support headers and libraries.])
- fi
-
+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)
PKG_CHECK_MODULES(GLIB, glib-2.0)
- PKG_CHECK_MODULES(GTK, gtk+-2.0 gthread-2.0 gdk-pixbuf-2.0)
AC_SUBST(MOZILLA_CFLAGS)
AC_SUBST(MOZILLA_LIBS)
@@ -500,14 +457,7 @@ then
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
+ fi
AC_LANG_PUSH([C++])
OLDCPPFLAGS="$CPPFLAGS"
More information about the distro-pkg-dev
mailing list