/hg/icedtea: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri May 14 09:31:05 PDT 2010
changeset bdd90e8c8ba7 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=bdd90e8c8ba7
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri May 14 17:19:28 2010 +0100
PR icedtea/433: Add set -e before tarball extraction so a failure
stops the build.
2010-01-21 Andrew John Hughes <ahughes at redhat.com>
PR icedtea/433
* Makefile.am: Add set -e to tarball extractions so
that they fail immediately.
changeset f4ec4881ecef in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=f4ec4881ecef
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri May 14 17:24:15 2010 +0100
Support libjpeg8 and always choose the dlopen invocation at build
time.
2010-01-25 Andrew John Hughes <ahughes at redhat.com>
* patches/icedtea-libraries.patch: Make all dlopen
choices at build-time, not just one. Support libjpeg8 as
well.
changeset 6f8b8cfe8663 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=6f8b8cfe8663
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri May 14 17:30:57 2010 +0100
Standardise plugin versioning and the name of IcedTea (IcedTea7 in
this case).
2010-01-25 Andrew John Hughes <ahughes at redhat.com>
* IcedTeaPlugin.cc: Standardise plugin versioning.
* Makefile.am: Set ICEDTEA_NAME and use in place of literal
"IcedTea7". Use HAS_PKGVERSION to set ICEDTEA_PKG and
output DISTRO_PACKAGE_VERSION rather than running test. Set
PLUGIN_VERSION and use for both plugins.
* acinclude.m4: (IT_GET_PKGVERSION): Moved from configure.ac
and changed to a macro with output.
(IT_GET_LSB_DATA): Depend on IT_GET_PKGVERSION.
* configure.ac: Invoke new IT_GET_PKGVERSION macro.
* plugin/icedteanp/IcedTeaNPPlugin.cc: Standardise plugin
versioning.
diffstat:
7 files changed, 98 insertions(+), 39 deletions(-)
ChangeLog | 32 +++++++++++++++++++++++++
IcedTeaPlugin.cc | 4 +--
Makefile.am | 44 ++++++++++++++++++++++-------------
acinclude.m4 | 27 +++++++++++++++++----
configure.ac | 12 ---------
patches/icedtea-libraries.patch | 12 +++++++--
plugin/icedteanp/IcedTeaNPPlugin.cc | 6 ++--
diffs (380 lines):
diff -r 1aa2dc59b11f -r 6f8b8cfe8663 ChangeLog
--- a/ChangeLog Fri May 14 15:36:37 2010 +0100
+++ b/ChangeLog Fri May 14 17:30:57 2010 +0100
@@ -1,3 +1,35 @@ 2010-05-14 Andrew John Hughes <ahughes
+2010-01-25 Andrew John Hughes <ahughes at redhat.com>
+
+ * IcedTeaPlugin.cc:
+ Standardise plugin versioning.
+ * Makefile.am:
+ Set ICEDTEA_NAME and use in place of literal
+ "IcedTea7". Use HAS_PKGVERSION to set ICEDTEA_PKG
+ and output DISTRO_PACKAGE_VERSION rather than
+ running test. Set PLUGIN_VERSION and use for
+ both plugins.
+ * acinclude.m4:
+ (IT_GET_PKGVERSION): Moved from configure.ac and
+ changed to a macro with output.
+ (IT_GET_LSB_DATA): Depend on IT_GET_PKGVERSION.
+ * configure.ac:
+ Invoke new IT_GET_PKGVERSION macro.
+ * plugin/icedteanp/IcedTeaNPPlugin.cc:
+ Standardise plugin versioning.
+
+2010-01-25 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/icedtea-libraries.patch:
+ Make all dlopen choices at build-time,
+ not just one. Support libjpeg8 as well.
+
+2010-01-21 Andrew John Hughes <ahughes at redhat.com>
+
+ PR icedtea/433
+ * Makefile.am:
+ Add set -e to tarball extractions so
+ that they fail immediately.
+
2010-05-14 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
diff -r 1aa2dc59b11f -r 6f8b8cfe8663 IcedTeaPlugin.cc
--- a/IcedTeaPlugin.cc Fri May 14 15:36:37 2010 +0100
+++ b/IcedTeaPlugin.cc Fri May 14 17:30:57 2010 +0100
@@ -275,8 +275,8 @@ inline long get_time_in_s()
#define PLUGIN_CHECK(message, result)
#endif
-#define PLUGIN_NAME "IcedTea Java Web Browser Plugin"
-#define PLUGIN_DESCRIPTION "The " PLUGIN_NAME PLUGIN_VERSION " executes Java applets."
+#define PLUGIN_NAME "IcedTea Java Web Browser Plugin (using " PLUGIN_VERSION ")"
+#define PLUGIN_DESCRIPTION "The " PLUGIN_NAME " executes Java applets."
#define PLUGIN_MIME_DESC \
"application/x-java-vm:class,jar:IcedTea;" \
"application/x-java-applet:class,jar:IcedTea;" \
diff -r 1aa2dc59b11f -r 6f8b8cfe8663 Makefile.am
--- a/Makefile.am Fri May 14 15:36:37 2010 +0100
+++ b/Makefile.am Fri May 14 17:30:57 2010 +0100
@@ -455,9 +455,15 @@ JDK_UPDATE_VERSION = $(shell echo $(OPEN
JDK_UPDATE_VERSION = $(shell echo $(OPENJDK_VERSION) | sed -e "s/^b//")
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
+ICEDTEA_NAME="IcedTea7"
if HAS_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_ENV = \
ALT_JDK_IMPORT_PATH="$(ICEDTEA_BOOT_DIR)" \
@@ -498,7 +504,7 @@ ICEDTEA_ENV = \
ANT_RESPECT_JAVA_HOME="TRUE" \
RHINO_JAR="$(RHINO_JAR)" \
DISTRIBUTION_ID="$(DIST_ID)" \
- DERIVATIVE_ID="IcedTea6 $(PACKAGE_VERSION)$(ICEDTEA_REV)" \
+ DERIVATIVE_ID="$(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)" \
ALT_JIBX_LIBS_PATH="$(JIBX_DEPS_DIR)" \
ALT_NETX_DIST="$(NETX_CLASSES)" \
ALT_LIVECONNECT_DIST="$(LIVECONNECT_CLASSES)" \
@@ -1161,6 +1167,7 @@ if OPENJDK_SRC_DIR_FOUND
if OPENJDK_SRC_DIR_FOUND
cp -a $(OPENJDK_SRC_DIR) openjdk
else
+ set -e ; \
if ! test -d openjdk ; then \
if [ ! -z $(OPENJDK_SRC_ZIP) ] ; then \
case "$(OPENJDK_SRC_ZIP)" in \
@@ -1176,6 +1183,7 @@ else
false; \
fi; \
fi;
+ set -e ; \
if [ ! -z $(CORBA_SRC_ZIP) ] ; then \
if test -e ${CORBA_SRC_ZIP} ; \
then \
@@ -1189,6 +1197,7 @@ else
fi ; \
fi ; \
fi
+ set -e ; \
if [ ! -z $(JAXP_SRC_ZIP) ] ; then \
if test -e ${JAXP_SRC_ZIP} ; \
then \
@@ -1202,6 +1211,7 @@ else
fi ; \
fi ; \
fi
+ set -e ; \
if [ ! -z $(JAXWS_SRC_ZIP) ] ; then \
if test -e ${JAXWS_SRC_ZIP} ; \
then \
@@ -1215,6 +1225,7 @@ else
fi ; \
fi ; \
fi
+ set -e ; \
if [ ! -z $(JDK_SRC_ZIP) ] ; then \
if test -e ${JDK_SRC_ZIP} ; \
then \
@@ -1228,6 +1239,7 @@ else
fi ; \
fi ; \
fi
+ set -e ; \
if [ ! -z $(LANGTOOLS_SRC_ZIP) ] ; then \
if test -e ${LANGTOOLS_SRC_ZIP} ; \
then \
@@ -1242,6 +1254,7 @@ else
fi ; \
fi
endif
+ set -e ; \
if [ ! -z $(HOTSPOT_SRC_ZIP) ] ; then \
if test -e ${HOTSPOT_SRC_ZIP} ; \
then \
@@ -1269,12 +1282,14 @@ clean-extract-openjdk: clean-overlay cle
stamps/extract-visualvm.stamp: stamps/download-visualvm.stamp
if WITH_VISUALVM
+ set -e ; \
if ! test -d netbeans ; \
then \
mkdir netbeans ; \
$(TAR) xf $(NETBEANS_PROFILER_SRC_ZIP) -C netbeans ; \
fi
+ set -e ; \
if ! test -d visualvm ; \
then \
$(TAR) xf $(VISUALVM_SRC_ZIP) ; \
@@ -1292,6 +1307,7 @@ stamps/extract-cacao.stamp: stamps/downl
stamps/extract-cacao.stamp: stamps/download-cacao.stamp
if BUILD_CACAO
if !USE_SYSTEM_CACAO
+ set -e ; \
if ! test -d cacao/cacao ; \
then \
mkdir cacao ; \
@@ -1311,6 +1327,7 @@ clean-extract-cacao: clean-cacao
stamps/extract-jaxws.stamp: stamps/extract-openjdk.stamp \
stamps/download-jaxws-drop.stamp stamps/download-jaf-drop.stamp
+ set -e ; \
if test "x$(NEED_JAXWS_SRC)" = "xtrue"; then \
(cd openjdk/jaxws ; \
$(ANT) -Ddrops.dir=$(abs_top_builddir)/drops \
@@ -1319,6 +1336,7 @@ stamps/extract-jaxws.stamp: stamps/extra
cd $(abs_top_builddir)) ; \
fi
if DTDTYPE_QNAME
+ set -e ; \
(cd $(BUILD_OUTPUT_DIR)/jaxws; \
all_patches_ok=yes; \
for p in $(JAXWS_PATCHES) ; \
@@ -1392,6 +1410,7 @@ clean-ports:
rm -f stamps/ports.stamp
stamps/generated.stamp: stamps/ports.stamp
+ set -e ; \
if [ ! -e $(abs_top_builddir)/generated ]; then \
cp -a $(abs_top_srcdir)/generated $(abs_top_builddir); \
find $(abs_top_builddir)/generated -type f -exec chmod 640 '{}' ';' \
@@ -1541,10 +1560,10 @@ stamps/versioning.stamp: stamps/patch.st
if ! test "x$(WITH_CACAO)" = "xno"; then \
echo "JDK_DERIVATIVE_NAME=$${icedtea_version}" \
>>openjdk/jdk/make/common/shared/Defs.gmk ; \
- echo "PRODUCT_NAME=IcedTea7" \
+ echo "PRODUCT_NAME=$(ICEDTEA_NAME)" \
>>openjdk/jdk/make/common/shared/Defs.gmk ; \
else \
- echo "JDK_DERIVATIVE_NAME=IcedTea7 $${icedtea_version}" \
+ echo "JDK_DERIVATIVE_NAME=$(ICEDTEA_NAME) $${icedtea_version}" \
>>openjdk/jdk/make/common/shared/Defs.gmk ; \
fi ;
@@ -1552,11 +1571,11 @@ if HAS_JDK_REVISION
echo "JDK_REVID=$(JDK_REVISION)" >>openjdk/jdk/make/common/shared/Defs.gmk ;
endif
- echo "DISTRO_NAME=$(DIST_NAME)" >>openjdk/jdk/make/common/shared/Defs.gmk ; \
- if [ -n "$(PKGVERSION)" ]; then \
+ echo "DISTRO_NAME=$(DIST_NAME)" >>openjdk/jdk/make/common/shared/Defs.gmk ;
+if HAS_PKGVERSION
echo "DISTRO_PACKAGE_VERSION=$(PKGVERSION)" \
- >>openjdk/jdk/make/common/shared/Defs.gmk ; \
- fi; \
+ >>openjdk/jdk/make/common/shared/Defs.gmk ;
+endif
if test x"$(PROJECT_NAME)" != "xjdk7"; then \
proj_suffix="-$(PROJECT_NAME)"; \
fi ; \
@@ -2011,8 +2030,7 @@ NPPLUGIN_OBJECTS=IcedTeaNPPlugin.o IcedT
$(PLUGIN_BUILD_DIR)/%.o: $(PLUGIN_SRCDIR)/%.cc
mkdir -p $(PLUGIN_BUILD_DIR) && \
$(CXX) $(CXXFLAGS) \
- -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\"" \
- -DPLUGIN_VERSION="\"$(PACKAGE_VERSION)$(ICEDTEA_REV)\"" \
+ -DPLUGIN_VERSION="\"$(PLUGIN_VERSION)\"" \
-DMOZILLA_VERSION_COLLAPSED="$(MOZILLA_VERSION_COLLAPSED)" \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
@@ -2041,15 +2059,9 @@ if ENABLE_PLUGIN
# is listed before -l options. See:
# http://developer.mozilla.org/en/docs/XPCOM_Glue
$(PLUGIN_BUILD_DIR)/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"; \
mkdir -p $(PLUGIN_BUILD_DIR) && \
$(CXX) $(CXXFLAGS) \
- -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\"" \
- -DPLUGIN_VERSION="\"$$plugin_version\"" \
+ -DPLUGIN_VERSION="\"$(PLUGIN_VERSION)\"" \
-DMOZILLA_VERSION_COLLAPSED="$(MOZILLA_VERSION_COLLAPSED)" \
$(GTK_CFLAGS) \
$(MOZILLA_CFLAGS) \
diff -r 1aa2dc59b11f -r 6f8b8cfe8663 acinclude.m4
--- a/acinclude.m4 Fri May 14 15:36:37 2010 +0100
+++ b/acinclude.m4 Fri May 14 17:30:57 2010 +0100
@@ -1666,15 +1666,33 @@ AC_DEFUN([WITH_VISUALVM_ZIP],
AC_SUBST(ALT_VISUALVM_ZIP)
])
-AC_DEFUN([IT_GET_LSB_DATA],
+AC_DEFUN_ONCE([IT_GET_PKGVERSION],
[
+AC_MSG_CHECKING([for distribution package version])
+AC_ARG_WITH([pkgversion],
+ [AS_HELP_STRING([--with-pkgversion=PKG],
+ [Use PKG in the version string in addition to "IcedTea"])],
+ [case "$withval" in
+ yes) AC_MSG_ERROR([package version not specified]) ;;
+ no) PKGVERSION=none ;;
+ *) PKGVERSION="$withval" ;;
+ esac],
+ [PKGVERSION=none])
+AC_MSG_RESULT([${PKGVERSION}])
+AM_CONDITIONAL(HAS_PKGVERSION, test "x${PKGVERSION}" != "xnone")
+AC_SUBST(PKGVERSION)
+])
+
+AC_DEFUN_ONCE([IT_GET_LSB_DATA],
+[
+AC_REQUIRE([IT_GET_PKGVERSION])
AC_MSG_CHECKING([build identification])
if test -n "$LSB_RELEASE"; then
lsb_info="$($LSB_RELEASE -ds | sed 's/^"//;s/"$//')"
- if test -n "$PKGVERSION"; then
+ if test "x$PKGVERSION" = "xnone"; then
+ DIST_ID="Built on $lsb_info ($(date))"
+ else
DIST_ID="$lsb_info, package $PKGVERSION"
- else
- DIST_ID="Built on $lsb_info ($(date))"
fi
DIST_NAME="$($LSB_RELEASE -is | sed 's/^"//;s/"$//')"
else
@@ -1724,7 +1742,6 @@ AC_DEFUN_ONCE([IT_OBTAIN_HG_REVISIONS],
AM_CONDITIONAL([HAS_JDK_REVISION], test "x${JDK_REVISION}" != xnone)
AM_CONDITIONAL([HAS_HOTSPOT_REVISION], test "x${HOTSPOT_REVISION}" != xnone)
])
-
AC_DEFUN_ONCE([IT_CHECK_OLD_PLUGIN],
[
AC_MSG_CHECKING([whether to build the browser plugin])
diff -r 1aa2dc59b11f -r 6f8b8cfe8663 configure.ac
--- a/configure.ac Fri May 14 15:36:37 2010 +0100
+++ b/configure.ac Fri May 14 17:30:57 2010 +0100
@@ -132,17 +132,7 @@ AM_CONDITIONAL([ENABLE_NSS], [test x$ENA
AM_CONDITIONAL([ENABLE_NSS], [test x$ENABLE_NSS = xyes])
AC_MSG_RESULT(${ENABLE_NSS})
-AC_ARG_WITH([pkgversion],
- [AS_HELP_STRING([--with-pkgversion=PKG],
- [Use PKG in the version string in addition to "IcedTea"])],
- [case "$withval" in
- yes) AC_MSG_ERROR([package version not specified]) ;;
- no) PKGVERSION= ;;
- *) PKGVERSION="$withval" ;;
- esac],
- [PKGVERSION=])
-AC_SUBST(PKGVERSION)
-
+IT_GET_PKGVERSION
IT_GET_LSB_DATA
SET_ARCH_DIRS
diff -r 1aa2dc59b11f -r 6f8b8cfe8663 patches/icedtea-libraries.patch
--- a/patches/icedtea-libraries.patch Fri May 14 15:36:37 2010 +0100
+++ b/patches/icedtea-libraries.patch Fri May 14 17:30:57 2010 +0100
@@ -700,17 +700,21 @@ diff -Nru openjdk.orig/jdk/src/share/nat
}
-@@ -2341,6 +2401,146 @@
+@@ -2341,6 +2401,150 @@
/********************** end of destination manager ************/
+METHODDEF(void)
+initIDs()
+{
++#if JPEG_LIB_VERSION >= 80
++ void *handle = dlopen("libjpeg.so.8", RTLD_LAZY | RTLD_GLOBAL);
++#else
+#if JPEG_LIB_VERSION >= 70
+ void *handle = dlopen("libjpeg.so.7", RTLD_LAZY | RTLD_GLOBAL);
+#else
+ void *handle = dlopen("libjpeg.so.62", RTLD_LAZY | RTLD_GLOBAL);
++#endif
+#endif
+
+ jpegstderror = (fn_jpegstderror)dlsym(handle, "jpeg_std_error");
@@ -20988,14 +20992,18 @@ diff -Nru openjdk.orig/jdk/src/share/nat
/* Initialize the Java VM instance variable when the library is
first loaded */
JavaVM *jvm;
-@@ -462,6 +490,72 @@
+@@ -462,6 +490,76 @@
Java_sun_awt_image_JPEGImageDecoder_initIDs(JNIEnv *env, jclass cls,
jclass InputStreamClass)
{
++#if JPEG_LIB_VERSION >= 80
++ void *handle = dlopen("libjpeg.so.8", RTLD_LAZY | RTLD_GLOBAL);
++#else
+#if JPEG_LIB_VERSION >= 70
+ void *handle = dlopen("libjpeg.so.7", RTLD_LAZY | RTLD_GLOBAL);
+#else
+ void *handle = dlopen("libjpeg.so.62", RTLD_LAZY | RTLD_GLOBAL);
++#endif
+#endif
+
+ jpegstderror = (fn_jpegstderror)dlsym(handle, "jpeg_std_error");
diff -r 1aa2dc59b11f -r 6f8b8cfe8663 plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc Fri May 14 15:36:37 2010 +0100
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Fri May 14 17:30:57 2010 +0100
@@ -87,8 +87,8 @@ exception statement from your version. *
__LINE__, g_thread_self (), first, second, third)
// Plugin information passed to about:plugins.
-#define PLUGIN_NAME "IcedTea NPR Web Browser Plugin (using IcedTea)"
-#define PLUGIN_DESC "The " PLUGIN_NAME PLUGIN_VERSION " executes Java applets."
+#define PLUGIN_NAME "IcedTea NPR Web Browser Plugin (using " PLUGIN_VERSION ")"
+#define PLUGIN_DESC "The " PLUGIN_NAME " executes Java applets."
#define PLUGIN_MIME_DESC \
"application/x-java-vm:class,jar:IcedTea;" \
@@ -2079,7 +2079,7 @@ NP_GetValue (void* future, NPPVariable v
{
case NPPVpluginNameString:
PLUGIN_DEBUG_0ARG ("NP_GetValue: returning plugin name.\n");
- *char_value = g_strdup (PLUGIN_NAME " " PACKAGE_VERSION);
+ *char_value = g_strdup (PLUGIN_NAME);
break;
case NPPVpluginDescriptionString:
More information about the distro-pkg-dev
mailing list