/hg/icedtea6: Backed out changeset abce9adb58ce
ddadacha at icedtea.classpath.org
ddadacha at icedtea.classpath.org
Mon Jun 13 14:24:37 PDT 2011
changeset 038d0687d646 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=038d0687d646
author: Danesh Dadachanji <ddadacha at redhat.com>
date: Mon Jun 13 17:13:51 2011 -0400
Backed out changeset abce9adb58ce
diffstat:
AUTHORS | 1 -
ChangeLog | 11 -------
Makefile.am | 7 +---
acinclude.m4 | 92 ------------------------------------------------------------
configure.ac | 9 -----
5 files changed, 1 insertions(+), 119 deletions(-)
diffs (174 lines):
diff -r abce9adb58ce -r 038d0687d646 AUTHORS
--- a/AUTHORS Mon Jun 13 16:43:37 2011 -0400
+++ b/AUTHORS Mon Jun 13 17:13:51 2011 -0400
@@ -8,7 +8,6 @@
Deepak Bhole <dbhole at redhat.com>
Tom Callaway <tcallawa at redhat.com>
Pablo del Campo <pablogdc at gmail.com>
-Danesh Dadachanji <ddadacha at redhat.com>
Thomas Fitzsimmons <fitzsim at redhat.com>
Matthew Flaschen <matthew.flaschen at gatech.edu>
Michael Franz <mvfranz at gmail.com>
diff -r abce9adb58ce -r 038d0687d646 ChangeLog
--- a/ChangeLog Mon Jun 13 16:43:37 2011 -0400
+++ b/ChangeLog Mon Jun 13 17:13:51 2011 -0400
@@ -1,14 +1,3 @@
-2011-06-13 Danesh Dadachanji <ddadacha at redhat.com>
-
- * AUTHORS: Added myself.
- * Makefile.am: Use explicit xml-commons locations if necessary.
- * acinclude.m4: Added explicit xml-commons check.
- (IT_CHECK_IF_INSTANTIABLE): Added generic macro to instantiate any
- class. Paramaters are the define, name of the class, paramaters
- for instatiation and (optional) classpath.
- * configure.ac: Invoke IT_FIND_XML_COMMONS_APIS_JAR macro after
- IT_FIND_XERCES2_JAR, assigns XML_COMMONS_APIS_JAR if necessary.
-
2011-05-23 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Add security patches.
diff -r abce9adb58ce -r 038d0687d646 Makefile.am
--- a/Makefile.am Mon Jun 13 16:43:37 2011 -0400
+++ b/Makefile.am Mon Jun 13 17:13:51 2011 -0400
@@ -1283,12 +1283,7 @@
ln -sf $(XALAN2_JAR) $(ECJ_BOOT_DIR)/lib/endorsed/xalan-j2.jar && \
ln -sf $(XALAN2_SERIALIZER_JAR) \
$(ECJ_BOOT_DIR)/lib/endorsed/xalan-j2-serializer.jar && \
- ln -sf $(XERCES2_JAR) $(ECJ_BOOT_DIR)/lib/endorsed/xerces-j2.jar && \
- if test -n "$(XML_COMMONS_APIS_JAR)"; \
- then \
- ln -sf $(XML_COMMONS_APIS_JAR) \
- $(ECJ_BOOT_DIR)/lib/endorsed/xml-commons-apis.jar; \
- fi
+ ln -sf $(XERCES2_JAR) $(ECJ_BOOT_DIR)/lib/endorsed/xerces-j2.jar
mkdir -p $(ECJ_BOOT_DIR)/jre/lib && \
cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar $(ECJ_BOOT_DIR)/jre/lib/rt.jar && \
ln -sf $(SYSTEM_JDK_DIR)/jre/lib/$(JRE_ARCH_DIR) \
diff -r abce9adb58ce -r 038d0687d646 acinclude.m4
--- a/acinclude.m4 Mon Jun 13 16:43:37 2011 -0400
+++ b/acinclude.m4 Mon Jun 13 17:13:51 2011 -0400
@@ -725,41 +725,6 @@
AC_SUBST(XERCES2_JAR)
])
-AC_DEFUN([IT_FIND_XML_COMMONS_APIS_JAR],
-[
- AC_MSG_CHECKING([for an xml-commons-apis jar])
- AC_ARG_WITH([xml-commons-apis-jar],
- [AS_HELP_STRING(--with-xml-commons-apis-jar,specify location of the xml-commons-apis jar)],
- [
- if test -f "${withval}" || test -h "${withval}" ; then
- XML_COMMONS_APIS_JAR="${withval}"
- fi
- ],
- [
- XML_COMMONS_APIS_JAR=
- ])
- if test -z "${XML_COMMONS_APIS_JAR}"; then
- if test -e "/usr/share/java/xml-commons-apis.jar"; then
- XML_COMMONS_APIS_JAR=/usr/share/java/xml-commons-apis.jar
- elif test -e "/usr/share/xml-commons/lib/xml-apis.jar"; then
- XML_COMMONS_APIS_JAR=/usr/share/xml-commons/lib/xml-apis.jar
- elif test -e "/usr/share/java/xml-apis-ext.jar"; then
- XML_COMMONS_APIS_JAR=/usr/share/java/xml-apis-ext.jar
- elif test -e "/usr/share/java/xml-commons-external.jar"; then
- XML_COMMONS_APIS_JAR=/usr/share/java/xml-commons-external.jar
- elif test -e "/usr/share/java/apache-xml-commons-apis.jar"; then
- XML_COMMONS_APIS_JAR=/usr/share/java/apache-xml-commons-apis.jar
- else
- AC_MSG_RESULT(no)
- fi
- fi
- if test -z "${XML_COMMONS_APIS_JAR}"; then
- AC_MSG_ERROR("An xml-commons-apis jar was not found.")
- fi
- AC_MSG_RESULT(${XML_COMMONS_APIS_JAR})
- AC_SUBST(XML_COMMONS_APIS_JAR)
-])
-
AC_DEFUN([IT_FIND_RHINO_JAR],
[
AC_MSG_CHECKING([whether to include Javascript support via Rhino])
@@ -1409,63 +1374,6 @@
AC_PROVIDE([$0])dnl
])
-dnl Generic macro to instantiate a Java class
-dnl Takes three arguments: the name of the macro,
-dnl the name of the class and the instantiation
-dnl paramaters. The macro name is usually the
-dnl name of the class with '.' replaced by '_'
-dnl and all letters capitalised.
-dnl Also takes optional classpath paramater.
-dnl e.g. IT_CHECK_FOR_INSTANTIABLE_CLASS([JAVA_LANG_INTEGER],
-dnl [java.lang.Integer],[0],[./bin])
-AC_DEFUN([IT_CHECK_IF_INSTANTIABLE],[
-AC_CACHE_CHECK([if $2 is instantiable], it_cv_$1, [
-CLASS=Test.java
-BYTECODE=$(echo $CLASS|sed 's#\.java##')
-mkdir tmp.$$
-cd tmp.$$
-cat << \EOF > $CLASS
-[/* [#]line __oline__ "configure" */
-public class Test
-{
- public static void main(String[] args)
- {
- new $2($3);
- }
-}
-]
-EOF
-
-if test -z $4; then
- WITH_CLASSPATH=.
-else
- WITH_CLASSPATH=$4:.
-fi
-
-if $JAVAC -cp $WITH_CLASSPATH $JAVACFLAGS -nowarn $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
- if $JAVA -classpath $WITH_CLASSPATH $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then
- it_cv_$1=yes;
- else
- it_cv_$1=no;
- fi
-else
- it_cv_$1=no;
-fi
-])
-rm -f $CLASS *.class
-cd ..
-rmdir tmp.$$
-
-if test x"${it_cv_$1}" = "xyes"
-then
- $1_INSTANTIABLE=yes
-else
- $1_INSTANTIABLE=no
-fi
-AM_CONDITIONAL([LACKS_$1], test x"${it_cv_$1}" = "xno")
-AC_PROVIDE([$0])dnl
-])
-
# Finds number of available processors using sysconf
AC_DEFUN_ONCE([IT_FIND_NUMBER_OF_PROCESSORS],[
IT_FIND_TOOL([GETCONF], [getconf])
diff -r abce9adb58ce -r 038d0687d646 configure.ac
--- a/configure.ac Mon Jun 13 16:43:37 2011 -0400
+++ b/configure.ac Mon Jun 13 17:13:51 2011 -0400
@@ -159,15 +159,6 @@
IT_FIND_XALAN2_JAR
IT_FIND_XALAN2_SERIALIZER_JAR
IT_FIND_XERCES2_JAR
- IT_CHECK_IF_INSTANTIABLE([ORG_APACHE_XERCES_DOM_DEFERREDDOCUMENTIMPL],
-[org.apache.xerces.dom.DeferredDocumentImpl],[],
-[$XALAN2_JAR:$XALAN2_SERIALIZER_JAR:$XERCES2_JAR])
- if test x"${ORG_APACHE_XERCES_DOM_DEFERREDDOCUMENTIMPL_INSTANTIABLE}" = "xno"
- then
- IT_FIND_XML_COMMONS_APIS_JAR
- else
- XML_COMMONS_APIS_JAR=
- fi
fi
AC_CONFIG_FILES([javac], [chmod +x javac])
AC_CONFIG_FILES([javap], [chmod +x javap])
More information about the distro-pkg-dev
mailing list