Mercurial > hg > release > icedtea7-2.5

changeset 1774:9f5cce422771

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Support providing the Nimbus dependencies (JIBX, BCEL and XPP3) 2009-05-14 Andrew John Hughes <ahughes@redhat.com> * Makefile.am: (OPENJDK_VERSION): Added back. (ALT_JIBX_LIBS_PATH): Point to our jibx directory. (extra.stamp): Use OpenJDK source files rather than (possibly non-existant) rt.jar. (jibx.stamp): Add symlinks to JIBX JAR files. * acinclude.m4: (FIND_BCEL_JAR): New macro. (FIND_XPP3_JAR): Likewise. (FIND_JIBX_DIR): Likewise. * configure.ac: Include new macros for finding Nimbus dependencies.
author Andrew John Hughes <ahughes@redhat.com>
date Thu, 14 May 2009 14:08:42 +0100
parents a2d7e774507e
children 2a131daaa86d
files ChangeLog Makefile.am acinclude.m4 configure.ac
diffstat 4 files changed, 155 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu May 14 10:32:51 2009 +0100
+++ b/ChangeLog	Thu May 14 14:08:42 2009 +0100
@@ -1,3 +1,19 @@
+2009-05-14  Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am:
+	(OPENJDK_VERSION): Added back.
+	(ALT_JIBX_LIBS_PATH): Point to our jibx
+	directory.
+	(extra.stamp): Use OpenJDK source files
+	rather than (possibly non-existant) rt.jar.
+	(jibx.stamp): Add symlinks to JIBX JAR files.
+	* acinclude.m4:
+	(FIND_BCEL_JAR): New macro.
+	(FIND_XPP3_JAR): Likewise.
+	(FIND_JIBX_DIR): Likewise.
+	* configure.ac:
+	Include new macros for finding Nimbus dependencies.
+
 2009-05-14  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
--- a/Makefile.am	Thu May 14 10:32:51 2009 +0100
+++ b/Makefile.am	Thu May 14 14:08:42 2009 +0100
@@ -1,3 +1,5 @@
+OPENJDK_VERSION = b58
+
 OPENJDK_CHANGESET = 4264c2fe6649
 CORBA_CHANGESET = 61116c9789b9
 JAXP_CHANGESET = ae890d80d5df
@@ -1443,7 +1445,8 @@
 	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" \
 	"JAVAC=" \
 	"RHINO_JAR=$(RHINO_JAR)" \
-	"DISTRIBUTION_ID=$(DIST_ID)"
+	"DISTRIBUTION_ID=$(DIST_ID)" \
+	"ALT_JIBX_LIBS_PATH=$(abs_top_builddir)/jibx"
 
 if WITH_CACAO
 ICEDTEA_ENV += \
@@ -1520,7 +1523,8 @@
 	"RHINO_JAR=$(RHINO_JAR)" \
 	"JAR_KNOWS_ATFILE=$(JAR_KNOWS_ATFILE)" \
 	"JAR_KNOWS_J_OPTIONS=$(JAR_KNOWS_J_OPTIONS)" \
-	"JAR_ACCEPTS_STDIN_LIST=$(JAR_ACCEPTS_STDIN_LIST)"
+	"JAR_ACCEPTS_STDIN_LIST=$(JAR_ACCEPTS_STDIN_LIST)" \
+	"ALT_JIBX_LIBS_PATH=$(abs_top_builddir)/jibx"
 
 if WITH_CACAO
 ICEDTEA_ENV_ECJ += \
@@ -2533,7 +2537,7 @@
 stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \
 	stamps/hotspot-tools.stamp stamps/plugs.stamp \
 	stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
-	$(ICEDTEAPLUGIN_TARGET) extra-lib/about.jar stamps/cacao.stamp \
+	$(ICEDTEAPLUGIN_TARGET) stamps/jibx.stamp stamps/cacao.stamp \
 	stamps/pulse-java.stamp stamps/visualvm.stamp
 	$(ARCH_PREFIX) $(MAKE) \
 	  $(ICEDTEA_ENV) \
@@ -2592,7 +2596,7 @@
 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 \
-	$(ICEDTEAPLUGIN_TARGET) extra-lib/about.jar stamps/cacao.stamp \
+	$(ICEDTEAPLUGIN_TARGET) stamps/jibx.stamp stamps/cacao.stamp \
 	stamps/pulse-java.stamp stamps/visualvm.stamp
 	$(ARCH_PREFIX) $(MAKE) \
 	  $(ICEDTEA_ENV) \
@@ -2675,7 +2679,7 @@
 	touch stamps/native-ecj.stamp
 
 stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \
-	stamps/hotspot-tools.stamp stamps/plugs.stamp \
+	stamps/hotspot-tools.stamp stamps/plugs.stamp stamps/jibx.stamp \
 	stamps/ports-ecj.stamp stamps/patch-ecj.stamp stamps/cacao.stamp
 	$(ARCH_PREFIX) $(MAKE) \
 	  $(ICEDTEA_ENV_ECJ) \
@@ -2922,13 +2926,17 @@
 	then \
 	  $(JAVAC) $(MEMORY_LIMIT) -g -d extra-lib \
 	    -source 1.5 \
-	    -sourcepath extra -cp $(ICEDTEA_BOOT_DIR)/jre/lib/rt.jar \
-	    -bootclasspath \'\' @extra-source-files.txt ; \
+	    -sourcepath $(abs_top_srcdir)/extra \
+	    -bootclasspath \
+	        '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_builddir)/generated' \
+	    @extra-source-files.txt ; \
 	else \
 	  $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d extra-lib \
             -source 1.5 \
-            -sourcepath extra -cp $(ICEDTEA_BOOT_DIR)/jre/lib/rt.jar \
-            -bootclasspath \'\' @extra-source-files.txt ; \
+	    -sourcepath $(abs_top_srcdir)/extra \
+	    -bootclasspath \
+	        '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_builddir)/generated' \
+	    @extra-source-files.txt ; \
 	fi
 	cp -r $(abs_top_srcdir)/extra/net/sourceforge/jnlp/about/resources \
 	  extra-lib/net/sourceforge/jnlp/about	
@@ -2950,6 +2958,15 @@
 	  $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C extra-lib net ; \
 	fi
 
+stamps/jibx.stamp: extra-lib/about.jar
+	mkdir $(abs_top_builddir)/jibx
+	ln -s $(BCEL_JAR) $(abs_top_builddir)/jibx
+	ln -s $(XPP3_JAR) $(abs_top_builddir)/jibx
+	ln -s $(JIBX_DIR)/jibx-bind.jar $(abs_top_builddir)/jibx
+	ln -s $(JIBX_DIR)/jibx-run.jar $(abs_top_builddir)/jibx
+	mkdir -p stamps
+	touch $@
+
 stamps/cacao.stamp: stamps/extract.stamp stamps/rt-class-files.stamp
 if WITH_CACAO
 if !USE_SYSTEM_CACAO
@@ -3303,6 +3320,8 @@
 
 icedtea-ecj: stamps/icedtea-ecj.stamp
 
+jibx: stamps/jibx.stamp
+
 native-ecj: stamps/native-ecj.stamp
 
 patch-ecj: stamps/patch-ecj.stamp
--- a/acinclude.m4	Thu May 14 10:32:51 2009 +0100
+++ b/acinclude.m4	Thu May 14 14:08:42 2009 +0100
@@ -1312,3 +1312,111 @@
 AM_CONDITIONAL([CP39408_JAVAH], test x"${it_cv_cp39408_javah}" = "xyes")
 AC_PROVIDE([$0])dnl
 ])
+
+AC_DEFUN([FIND_BCEL_JAR],
+[
+  AC_MSG_CHECKING([for bytecode engineering library (BCEL)])
+  AC_ARG_WITH([bcel],
+              [AS_HELP_STRING(--with-bcel,specify location of the bcel jar)],
+  [
+    case "${withval}" in
+      yes)
+	BCEL_JAR=yes
+        ;;
+      no)
+        BCEL_JAR=no
+        ;;
+      *)
+        BCEL_JAR="${withval}"
+	;;
+     esac
+  ],
+  [
+    BCEL_JAR=yes
+  ])
+  if test x"${BCEL_JAR}" = "xyes"; then
+    if test -e "/usr/share/bcel/lib/bcel.jar"; then
+      BCEL_JAR="/usr/share/bcel/lib/bcel.jar"
+    elif test -e "/usr/share/java/bcel.jar"; then
+      BCEL_JAR="/usr/share/java/bcel.jar"
+    fi
+  fi
+  if ! test -f "${BCEL_JAR}"; then
+      AC_MSG_RESULT([not found])
+      AC_MSG_ERROR("A BCEL jar ${BCEL_JAR} was not found.")
+  fi
+  AC_MSG_RESULT(${BCEL_JAR})
+  AC_SUBST(BCEL_JAR)
+])
+
+AC_DEFUN([FIND_XPP3_JAR],
+[
+  AC_MSG_CHECKING([for XML Pull Parser 3 (XPP3)])
+  AC_ARG_WITH([xpp3],
+              [AS_HELP_STRING(--with-xpp3,specify location of the xpp3 jar)],
+  [
+    case "${withval}" in
+      yes)
+	XPP3_JAR=yes
+        ;;
+      no)
+        XPP3_JAR=no
+        ;;
+      *)
+        XPP3_JAR="${withval}"
+	;;
+     esac
+  ],
+  [
+    XPP3_JAR=yes
+  ])
+  if test x"${XPP3_JAR}" = "xyes"; then
+    if test -e "/usr/share/xpp3/lib/xpp3.jar"; then
+      XPP3_JAR="/usr/share/xpp3/lib/xpp3.jar"
+    elif test -e "/usr/share/java/xpp3.jar"; then
+      XPP3_JAR="/usr/share/java/xpp3.jar"
+    fi
+  fi
+  if ! test -f "${XPP3_JAR}"; then
+      AC_MSG_RESULT([not found])
+      AC_MSG_ERROR("A XPP3 jar ${XPP3_JAR} was not found.")
+  fi
+  AC_MSG_RESULT(${XPP3_JAR})
+  AC_SUBST(XPP3_JAR)
+])
+
+AC_DEFUN([FIND_JIBX_DIR],
+[
+  AC_MSG_CHECKING([for JIBX])
+  AC_ARG_WITH([jibx],
+              [AS_HELP_STRING(--with-jibx,specify location of the jibx jars)],
+  [
+    case "${withval}" in
+      yes)
+	JIBX_DIR=yes
+        ;;
+      no)
+        JIBX_DIR=no
+        ;;
+      *)
+        JIBX_DIR="${withval}"
+	;;
+     esac
+  ],
+  [
+    JIBX_DIR=yes
+  ])
+  if test x"${JIBX_DIR}" = "xyes"; then
+    if test -e "/usr/share/jibx/lib/jibx-run.jar"; then
+      JIBX_DIR=/usr/share/jibx/lib
+    elif test -e "/usr/share/java/jibx-run.jar"; then
+      JIBX_DIR=/usr/share/java
+    fi
+  fi
+  if ! test -d "${JIBX_DIR}"; then
+      AC_MSG_RESULT([not found])
+      AC_MSG_ERROR("A JIBX jar directory ${JIBX_JAR} was not found.")
+  fi
+  AC_MSG_RESULT(${JIBX_DIR})
+  AC_SUBST(JIBX_DIR)
+])
--- a/configure.ac	Thu May 14 10:32:51 2009 +0100
+++ b/configure.ac	Thu May 14 14:08:42 2009 +0100
@@ -271,6 +271,9 @@
 fi
 IT_CP39408_JAVAH
 FIND_RHINO_JAR
+FIND_BCEL_JAR
+FIND_XPP3_JAR
+FIND_JIBX_DIR
 WITH_OPENJDK_SRC_ZIP
 WITH_HOTSPOT_SRC_ZIP
 WITH_CORBA_SRC_ZIP