Mercurial > hg > icedtea10
changeset 2551:9b78b50a6207
PR1369: Remove outdated bootstrap configure tests or make them fail on error
2015-05-12 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR1369: Remove outdated bootstrap configure tests
or make them fail on error
* INSTALL:
Drop ant requirement and remove obsolete
options --with-netbeans-home, --with-ant-home,
--with-xalan2-jar, --with-xalan2-serializer-jar,
--with-xerces2-jar, --with-jaxp-drop-zip,
--with-jaf-drop-zip, --with-jaxws-drop-zip,
--with-tzdata-dir and --with-netbeans.
Update --with-gcj-home to --with-jdk-home.
* Makefile.am:
(clean-local): Remove clean-rt.
(.PHONY): Likewise.
(icedtea): Drop addition of tz.properties.
(icedtea-debug): Likewise.
(jamvm): Drop rt.stamp dependency.
(cacao): Depend on OPENJDK_TREE instead of rt.stamp
(rt-source-files.txt): Removed.
(rt-class-files.stamp): Likewise.
(rt): Likewise.
(clean-rt): Likewise.
* NEWS: Updated.
* README: Remove obsolete paragraph about being
a pre-release of OpenJDK 7. Link to OpenJDK
conformance testing.
* acinclude.m4:
(IT_JAVAH): Removed.
(IT_LIBRARY_CHECK): Likewise.
(IT_PR40630_CHECK): Likewise.
(IT_WITH_TZDATA_DIR): Likewise.
(IT_GETDTDTYPE_CHECK): Likewise.
* configure.ac:
Drop search for Ant and xsltproc. Remove
calls to macros removed from acinclude.m4
and class checks.
2014-06-13 Andrew John Hughes <gnu.andrew@member.fsf.org>
* javaws.desktop,
* javaws.png:
Remove obsolete files.
* Makefile.am:
(EXTRA_DIST): Remove above.
author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
---|---|
date | Tue, 12 May 2015 03:16:51 +0100 |
parents | 12df15a72296 |
children | 7283a59ba41b |
files | ChangeLog INSTALL Makefile.am NEWS README acinclude.m4 configure.ac javaws.desktop javaws.png |
diffstat | 9 files changed, 56 insertions(+), 362 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu May 07 05:17:05 2015 +0100 +++ b/ChangeLog Tue May 12 03:16:51 2015 +0100 @@ -1,3 +1,49 @@ +2015-05-12 Andrew John Hughes <gnu_andrew@member.fsf.org> + + PR1369: Remove outdated bootstrap configure tests + or make them fail on error + * INSTALL: + Drop ant requirement and remove obsolete + options --with-netbeans-home, --with-ant-home, + --with-xalan2-jar, --with-xalan2-serializer-jar, + --with-xerces2-jar, --with-jaxp-drop-zip, + --with-jaf-drop-zip, --with-jaxws-drop-zip, + --with-tzdata-dir and --with-netbeans. + Update --with-gcj-home to --with-jdk-home. + * Makefile.am: + (clean-local): Remove clean-rt. + (.PHONY): Likewise. + (icedtea): Drop addition of tz.properties. + (icedtea-debug): Likewise. + (jamvm): Drop rt.stamp dependency. + (cacao): Depend on OPENJDK_TREE instead of rt.stamp + (rt-source-files.txt): Removed. + (rt-class-files.stamp): Likewise. + (rt): Likewise. + (clean-rt): Likewise. + * NEWS: Updated. + * README: Remove obsolete paragraph about being + a pre-release of OpenJDK 7. Link to OpenJDK + conformance testing. + * acinclude.m4: + (IT_JAVAH): Removed. + (IT_LIBRARY_CHECK): Likewise. + (IT_PR40630_CHECK): Likewise. + (IT_WITH_TZDATA_DIR): Likewise. + (IT_GETDTDTYPE_CHECK): Likewise. + * configure.ac: + Drop search for Ant and xsltproc. Remove + calls to macros removed from acinclude.m4 + and class checks. + +2014-06-13 Andrew John Hughes <gnu.andrew@member.fsf.org> + + * javaws.desktop, + * javaws.png: + Remove obsolete files. + * Makefile.am: + (EXTRA_DIST): Remove above. + 2015-05-06 Andrew John Hughes <gnu_andrew@member.fsf.org> PR1341: Remove Rhino support
--- a/INSTALL Thu May 07 05:17:05 2015 +0100 +++ b/INSTALL Tue May 12 03:16:51 2015 +0100 @@ -21,7 +21,6 @@ xerces glib2-devel gtk2-devel -ant >= 1.6.5 with the regexp task from ant-nodeps libXinerama-devel giflib-devel libpng-devel @@ -99,14 +98,10 @@ * --with-parallel-jobs: Run the specified number of parallel jobs when building HotSpot and the JDK. If this option is passed without an argument, the number of online processors plus one is used. -* --with-netbeans-home: The location of NetBeans for use in the VisualVM build, - defaults to /usr/share/netbeans. -* --with-ant-home: The location of Ant, defaults to /usr/share/ant. * --with-pkgversion=PKG: Include the specified distro package information in the output of java -version. -* --with-gcj-home: Perform a full bootstrap build using an installed - copy of a GNU Classpath JDK such as gcj. If a directory is not specified, - a check against the list presented above is performed. +* --with-jdk-home: Use the specified JDK to bootstrap. If this option is + not specified, a check against the list presented above is performed. * --with-java: Specify the location of a 'java' binary. By default, the path is checked for gij and java. * --with-ecj: Specify the location of a 'ecj' binary. By default, the path @@ -127,22 +122,6 @@ - /usr/share/java/eclipse-ecj.jar - /usr/share/java/ecj.jar - /usr/share/eclipse-ecj-3.{2,3,4,5}/lib/ecj.jar -* --with-xalan2-jar: Specify the location of a xalan2 JAR file. By default, the - following paths are checked: - - /usr/share/java/xalan-j2.jar - - /usr/share/java/xalan2.jar - - /usr/share/xalan/lib/xalan.jar -* --with-xalan2-serializer-jar: Specify the location of a xalan2 serializer JAR file. - By default, the following paths are checked: - - /usr/share/java/xalan-j2-serializer.jar - - /usr/share/xalan-serializer/lib/serializer.jar - - /usr/share/java/serializer.jar -* --with-xerces2-jar: Specify the location of a xerces2 JAR file. By default, the - following paths are checked: - - /usr/share/java/xerces-j2.jar - - /usr/share/java/xerces2.jar - - /usr/share/xerces-2/lib/xercesImpl.jar - - /usr/share/java/xercesImpl.jar * --with-openjdk-src-zip: Specify the location of the OpenJDK tarball to avoid downloading. * --with-hotspot-src-zip: Specify the location of the HotSpot tarball to avoid downloading. * --with-corba-src-zip: Specify the location of the CORBA tarball to avoid downloading. @@ -152,17 +131,12 @@ * --with-langtools-src-zip: Specify the location of the langtools tarball to avoid downloading. * --with-nashorn-src-zip: Specify the location of the Nashorn tarball to avoid downloading. * --with-alt-jar: Use the specified jar binary in the second stage rather than the one just built. -* --with-jaxp-drop-zip: Specify the location of the JAXP source drop zip file to avoid downloading. -* --with-jaf-drop-zip: Specify the location of the JAF source drop zip file to avoid downloading. -* --with-jaxws-drop-zip: Specify the location of the JAXWS source drop zip file to avoid downloading. * --with-cacao-home: Specify the location of an installed CACAO to use rather than downloading and building one. * --with-cacao-src-zip: Specify the location of a CACAO tarball to avoid downloading. * --with-cacao-src-dir: Specify the location of a CACAO source tree to avoid downloading. * --with-jamvm-src-zip: Specify the location of a JamVM tarball to avoid downloading. * --with-hg-revision: Specify a hg revision to use (as opposed to tip) with the --enable-hg option. -* --with-tzdata-dir: Specify the location of Java timezone data, defaulting to /usr/share/javazi. -* --with-netbeans: Specify the location of NetBeans for VisualVM, defaulting to the netbeans on the path. * --with-abs-install-dir: The final install location of the j2sdk-image, for use in the SystemTap tapset. * --with-llvm-config: Specify the location of the llvm-config binary. * --with-version-suffix: Appends the given text to the JDK version output.
--- a/Makefile.am Thu May 07 05:17:05 2015 +0100 +++ b/Makefile.am Tue May 12 03:16:51 2015 +0100 @@ -489,7 +489,6 @@ $(top_srcdir)/patches/cacao/*.patch \ $(top_srcdir)/patches/jamvm/*.patch \ tools-copy contrib overlays \ - javaws.png javaws.desktop \ jconsole.desktop policytool.desktop \ $(JTREG_SRCS) \ HACKING $(PULSEAUDIO_SRCS) fsg.sh \ @@ -521,7 +520,7 @@ clean-bootstrap-directory-symlink-stage1 clean-bootstrap-directory-symlink-stage2 \ clean-extract clean-native-ecj clean-icedtea-stage2 \ clean-icedtea-debug-stage2 clean-icedtea-stage1 clean-add-zero clean-add-zero-debug \ - clean-add-cacao clean-add-cacao-debug clean-rt clean-cryptocheck + clean-add-cacao clean-add-cacao-debug clean-cryptocheck if [ -e bootstrap ]; then \ rmdir bootstrap ; \ fi @@ -547,7 +546,7 @@ clean-bootstrap-directory-symlink-stage2 clean-bootstrap-directory-stage1 \ clean-bootstrap-directory-symlink-stage1 icedtea icedtea-debug \ clean-icedtea icedtea-stage2 clean-icedtea-boot \ - clean-rt hotspot hotspot-helper clean-jtreg clean-jtreg-reports \ + hotspot hotspot-helper clean-jtreg clean-jtreg-reports \ jtregcheck clean-remove-intree-libraries \ clean-jamvm clean-extract-jamvm clean-add-jamvm clean-add-jamvm-debug \ clean-extract-hotspot clean-sanitise-openjdk clean-icedtea-debug \ @@ -1520,10 +1519,6 @@ endif cp $(abs_top_builddir)/nss.cfg \ $(BUILD_IMAGE_DIR)/j2sdk-image/jre/lib/security; -if WITH_TZDATA_DIR - cp $(abs_top_builddir)/tz.properties \ - $(BUILD_IMAGE_DIR)/j2sdk-image/jre/lib; -endif if ENABLE_JAMVM printf -- '-jamvm ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg endif @@ -1593,10 +1588,6 @@ endif cp $(abs_top_builddir)/nss.cfg \ $(BUILD_DEBUG_IMAGE_DIR)/j2sdk-image/jre/lib/security; -if WITH_TZDATA_DIR - cp $(abs_top_builddir)/tz.properties \ - $(BUILD_DEBUG_IMAGE_DIR)/j2sdk-image/jre/lib; -endif if ENABLE_JAMVM printf -- '-jamvm ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg endif @@ -1842,7 +1833,7 @@ # JamVM -stamps/jamvm.stamp: $(OPENJDK_TREE) stamps/rt.stamp +stamps/jamvm.stamp: $(OPENJDK_TREE) if BUILD_JAMVM cd jamvm/jamvm && \ ./autogen.sh --with-java-runtime-library=openjdk8 \ @@ -1904,7 +1895,7 @@ # CACAO -stamps/cacao.stamp: stamps/rt.stamp +stamps/cacao.stamp: $(OPENJDK_TREE) if BUILD_CACAO if !USE_SYSTEM_CACAO cd cacao/cacao && \ @@ -2217,51 +2208,6 @@ rm -f test/check-stap.log endif -# Support classes for non-OpenJDK bootstraps - -rt-source-files.txt: $(OPENJDK_BOOT_TREE) - rm -f $@ - for files in $(ICEDTEA_BOOTSTRAP_CLASSES) ; \ - do \ - echo $$files >> $@ ; \ - done - touch $@ - -stamps/rt-class-files.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) rt-source-files.txt - mkdir -p lib/rt - if echo $(ICEDTEA_BOOTSTRAP_CLASSES) | grep '\S' &> /dev/null ; then \ - $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d lib/rt \ - -classpath $(SYSTEM_JDK_DIR)/jre/lib/rt.jar \ - -sourcepath '$(SOURCEPATH_DIRS)' \ - -bootclasspath \'\' @rt-source-files.txt ; \ - fi - mkdir -p stamps - touch $@ - -stamps/rt.stamp: stamps/rt-class-files.stamp - if echo $(ICEDTEA_BOOTSTRAP_CLASSES) | grep '\S' &> /dev/null ; then \ - (set -e ; \ - cd lib/rt ; \ - for dirs in $(ICEDTEA_BOOTSTRAP_RESOURCES) ; \ - do \ - destpath=`echo $$dirs|sed -e 's#$(LANGTOOLS)/##' -e 's#$(SHARE)/##'` ; \ - mkdir -p `dirname $$destpath` ; \ - cp -a ../../$$dirs $$destpath ; \ - done ; \ - $(ZIP) -qur $(STAGE1_BOOT_DIR)/jre/lib/rt.jar \ - com java javax sun ); \ - fi - mkdir -p stamps - touch $@ - -clean-rt: - rm -rf lib/rt - rm -f stamps/rt-class-files.stamp stamps/rt.stamp - rm -f rt-source-files.txt - if [ -e $(STAGE1_BOOT_DIR)/jre/lib ] ; then \ - cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar $(STAGE1_BOOT_DIR)/jre/lib ; \ - fi - # Crypto Level Check stamps/cryptocheck.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) @@ -2358,8 +2304,4 @@ pulse-java: $(PULSE_JAVA_TARGET) -rt: stamps/rt.stamp - -rt-class-files: stamps/rt-class-files.stamp - sanitise-openjdk: stamps/sanitise-openjdk.stamp
--- a/NEWS Thu May 07 05:17:05 2015 +0100 +++ b/NEWS Tue May 12 03:16:51 2015 +0100 @@ -37,6 +37,7 @@ - PR1359: Check for /usr/lib64 JVMs and generic JPackage alternative - PR1364: Replace hgforest support - PR1367: Support using the system installation of LCMS + - PR1369: Remove outdated bootstrap configure tests or make them fail on error - PR1379: Add build support for Zero AArch64 - PR1766: Expand architecture support - PR1774: Support GIF lib v5
--- a/README Thu May 07 05:17:05 2015 +0100 +++ b/README Tue May 12 03:16:51 2015 +0100 @@ -32,15 +32,9 @@ Java compatibility ------------------ -IcedTea is derived from OpenJDK, Sun's open-source implementation of -the Java SE platform. At this time the build from which IcedTea was -constructed corresponds to an early build of JDK 7. When JDK 7 is -complete it will implement the Java SE 7 Platform Specification. Any -APIs in the JDK 7 implementation, whether new or old, are therefore -subject to minor adjustments, major revisions, or even outright -removal between now and the time that the Java SE 7 Platform -Specification is finalized. Please take these facts into account -before depending upon IcedTea. +IcedTea is derived from OpenJDK, an open-source implementation of +the Java SE platform. See http://openjdk.java.net/groups/conformance/ +for information on compatibility testing. A Note About License Headers ----------------------------
--- a/acinclude.m4 Thu May 07 05:17:05 2015 +0100 +++ b/acinclude.m4 Tue May 12 03:16:51 2015 +0100 @@ -1098,65 +1098,6 @@ AC_SUBST(SYSTEM_JDK_DIR) ]) -AC_DEFUN([IT_JAVAH],[ -AC_CACHE_CHECK([if $JAVAH exhibits Classpath bug 39408], it_cv_cp39408_javah, [ -SUPERCLASS=Test.java -SUBCLASS=TestImpl.java -SUB=$(echo $SUBCLASS|sed 's#\.java##') -SUBHEADER=$(echo $SUBCLASS|sed 's#\.java#.h#') -mkdir tmp.$$ -cd tmp.$$ -cat << \EOF > $SUPERCLASS -/* [#]line __oline__ "configure" */ -public class Test -{ - public static final int POTATO = 0; - public static final int CABBAGE = 1; -} -EOF -cat << \EOF > $SUBCLASS -/* [#]line __oline__ "configure" */ -public class TestImpl - extends Test -{ - public native void doStuff(); -} -EOF -if $JAVAC -cp . $JAVACFLAGS $SUBCLASS >&AS_MESSAGE_LOG_FD 2>&1; then - if $JAVAH -classpath . $SUB >&AS_MESSAGE_LOG_FD 2>&1; then - if cat $SUBHEADER | grep POTATO >&AS_MESSAGE_LOG_FD 2>&1; then - it_cv_cp39408_javah=no; - else - it_cv_cp39408_javah=yes; - fi - else - AC_MSG_ERROR([The Java header generator $JAVAH failed]) - echo "configure: failed program was:" >&AC_FD_CC - cat $SUBCLASS >&AC_FD_CC - fi -else - AC_MSG_ERROR([The Java compiler $JAVAC failed]) - echo "configure: failed program was:" >&AC_FD_CC - cat $SUBCLASS >&AC_FD_CC -fi -]) -AC_CACHE_CHECK([if $JAVAH exhibits Classpath bug 40188], it_cv_cp40188_javah, [ - if test -e $SUBHEADER ; then - if cat $SUBHEADER | grep TestImpl_POTATO >&AS_MESSAGE_LOG_FD 2>&1; then - it_cv_cp40188_javah=no; - else - it_cv_cp40188_javah=yes; - fi - fi -]) -rm -f $SUBCLASS $SUPERCLASS $SUBHEADER *.class -cd .. -rmdir tmp.$$ -AM_CONDITIONAL([CP39408_JAVAH], test x"${it_cv_cp39408_javah}" = "xyes") -AM_CONDITIONAL([CP40188_JAVAH], test x"${it_cv_cp40188_javah}" = "xyes") -AC_PROVIDE([$0])dnl -]) - AC_DEFUN([IT_CHECK_ADDITIONAL_VMS], [ AC_MSG_CHECKING([for additional virtual machines to build]) @@ -1209,85 +1150,6 @@ fi ]) -AC_DEFUN([IT_LIBRARY_CHECK],[ -AC_CACHE_CHECK([if java.io.PrintStream is missing the 1.5 constructors (PR40616)], it_cv_cp40616, [ -CLASS=Test.java -BYTECODE=$(echo $CLASS|sed 's#\.java##') -mkdir tmp.$$ -cd tmp.$$ -cat << \EOF > $CLASS -[/* [#]line __oline__ "configure" */ -import java.io.File; -import java.io.PrintStream; - -public class Test -{ - public static void main(String[] args) - throws Exception - { - PrintStream p = new PrintStream(new File("bluh"), "UTF-8"); - p.close(); - } -}] -EOF -if $JAVAC -cp . $JAVACFLAGS $CLASS >&AS_MESSAGE_LOG_FD 2>&1 ; then - if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1 ; then - it_cv_cp40616=no; - else - it_cv_cp40616=yes; - fi -else - it_cv_cp40616=yes; -fi -]) -rm -f $CLASS *.class bluh -cd .. -rmdir tmp.$$ -AM_CONDITIONAL([CP40616], test x"${it_cv_cp40616}" = "xyes") -AC_PROVIDE([$0])dnl -]) - -AC_DEFUN([IT_PR40630_CHECK],[ -if test "x${it_cv_JAVA_UTIL_SCANNER}" = "xno"; then - AC_CACHE_CHECK([if java.util.Scanner exhibits Classpath bug 40630], it_cv_cp40630, [ - CLASS=Test.java - BYTECODE=$(echo $CLASS|sed 's#\.java##') - mkdir tmp.$$ - cd tmp.$$ - cat << \EOF > $CLASS -[/* [#]line __oline__ "configure" */ -import java.util.Scanner; - -public class Test -{ - public static void main(String[] args) - throws Exception - { - Scanner s = new Scanner("Blah\nBlah\n\nBlah\n\n"); - for (int i = 0; i < 5; ++i) - s.nextLine(); - s.hasNextLine(); - } -}] -EOF - if $JAVAC -cp . $JAVACFLAGS $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then - if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then - it_cv_cp40630=no; - else - it_cv_cp40630=yes; - fi - else - it_cv_cp40630=yes; - fi - rm -f $CLASS *.class - cd .. - rmdir tmp.$$ - ]) -fi -AM_CONDITIONAL([CP40630], test x"${it_cv_cp40630}" = "xyes") -AC_PROVIDE([$0])dnl -]) - AC_DEFUN([IT_USING_ECJ],[ AC_CACHE_CHECK([if we are using ecj as javac], it_cv_ecj, [ if $JAVAC -version 2>&1| grep '^Eclipse' >&AS_MESSAGE_LOG_FD ; then @@ -1318,37 +1180,6 @@ AC_SUBST(ENABLE_WARNINGS) ]) -AC_DEFUN([IT_WITH_TZDATA_DIR], -[ - DEFAULT="/usr/share/javazi" - AC_MSG_CHECKING([which Java timezone data directory to use]) - AC_ARG_WITH([tzdata-dir], - [AS_HELP_STRING([--with-tzdata-dir[[=DIR]]],set the Java timezone data directory [[DIR=/usr/share/javazi]])], - [ - if test "x${withval}" = x || test "x${withval}" = xyes; then - TZDATA_DIR_SET=yes - TZDATA_DIR="${DEFAULT}" - else - if test "x${withval}" = xno; then - TZDATA_DIR_SET=no - AC_MSG_RESULT([no]) - else - TZDATA_DIR_SET=yes - TZDATA_DIR="${withval}" - fi - fi - ], - [ - TZDATA_DIR="${DEFAULT}" - ]) - if test "x${TZDATA_DIR}" != "x"; then - AC_MSG_RESULT([${TZDATA_DIR}]) - fi - AC_SUBST([TZDATA_DIR]) - AM_CONDITIONAL(WITH_TZDATA_DIR, test "x${TZDATA_DIR}" != "x") - AC_CONFIG_FILES([tz.properties]) -]) - dnl Generic macro to check for a Java class dnl Takes two arguments: the name of the macro dnl and the name of the class. The macro name @@ -1401,80 +1232,6 @@ AC_PROVIDE([$0])dnl ]) -AC_DEFUN([IT_GETDTDTYPE_CHECK],[ - AC_CACHE_CHECK([if javax.xml.stream.events.Attribute.getDTDType() wrongly returns a QName], it_cv_dtdtype, [ - CLASS=Test.java - BYTECODE=$(echo $CLASS|sed 's#\.java##') - mkdir tmp.$$ - cd tmp.$$ - cat << \EOF > $CLASS -[/* [#]line __oline__ "configure" */ -import javax.xml.namespace.QName; -import javax.xml.stream.Location; -import javax.xml.stream.events.Attribute; -import javax.xml.stream.events.Characters; -import javax.xml.stream.events.EndElement; -import javax.xml.stream.events.StartElement; - -import java.lang.reflect.Method; - -public class Test - implements Attribute -{ - // This method will not qualify if using an - // old version of Classpath where it returns - // a QName. - public String getDTDType() { return "Boom"; } - - // Other Attribute methods - public QName getName() { return null; } - public String getValue() { return "Bang"; } - public boolean isSpecified() { return false; } - - // XMLEvent methods - public Characters asCharacters() { return null; } - public EndElement asEndElement() { return null; } - public StartElement asStartElement() { return null; } - public int getEventType() { return 42; } - public Location getLocation() { return null; } - public QName getSchemaType() { return null; } - public boolean isAttribute() { return true; } - public boolean isCharacters() { return false; } - public boolean isEndDocument() { return false; } - public boolean isEndElement() { return false; } - public boolean isEntityReference() { return false; } - public boolean isNamespace() { return false; } - public boolean isProcessingInstruction() { return false; } - public boolean isStartDocument() { return false; } - public boolean isStartElement() { return false; } - public void writeAsEncodedUnicode(java.io.Writer w) {} - - public static void main(String[] args) - { - for (Method m : Attribute.class.getMethods()) - if (m.getName().equals("getDTDType")) - if (m.getReturnType().equals(QName.class)) - System.exit(1); - } -}] -EOF - if $JAVAC -cp . $JAVACFLAGS -source 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then - if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then - it_cv_dtdtype=no; - else - it_cv_dtdtype=yes; - fi - else - it_cv_dtdtype=yes; - fi - rm -f $CLASS *.class - cd .. - rmdir tmp.$$ - ]) -AM_CONDITIONAL([DTDTYPE_QNAME], test x"${it_cv_dtdtype}" = "xyes") -AC_PROVIDE([$0])dnl -]) - AC_DEFUN_ONCE([IT_GET_PKGVERSION], [ AC_MSG_CHECKING([for distribution package version])
--- a/configure.ac Thu May 07 05:17:05 2015 +0100 +++ b/configure.ac Tue May 12 03:16:51 2015 +0100 @@ -20,7 +20,6 @@ IT_FIND_TOOL([MAKE], [make]) IT_FIND_TOOL([GZIP], [gzip]) -IT_FIND_TOOL([ANT], [ant]) IT_FIND_TOOL([FIND], [find]) IT_FIND_TOOL([PATCH], [patch]) IT_FIND_TOOL([TAR], [tar]) @@ -105,18 +104,11 @@ IT_USING_CACAO if test "x$enable_bootstrap" = "xyes"; then IT_FIND_ECJ_JAR - IT_FIND_TOOL([XSLTPROC], [xsltproc]) fi AC_CONFIG_FILES([javac], [chmod +x javac]) AC_CONFIG_FILES([javap], [chmod +x javap]) AC_CONFIG_FILES([javah], [chmod +x javah]) -IT_JAVAH -IT_LIBRARY_CHECK -IT_CHECK_FOR_CLASS([JAVA_UTIL_SCANNER], [java.util.Scanner]) -IT_PR40630_CHECK -IT_CHECK_FOR_CLASS([JAVAX_ANNOTATION_RESOURCE], [javax.annotation.Resource]) -IT_GETDTDTYPE_CHECK IT_CHECK_ENABLE_WARNINGS IT_DIAMOND_CHECK @@ -145,7 +137,6 @@ IT_WITH_VERSION_SUFFIX IT_ENABLE_HG -IT_WITH_TZDATA_DIR IT_WITH_PAX AC_CONFIG_FILES([pax-mark-vm], [chmod +x pax-mark-vm])
--- a/javaws.desktop Thu May 07 05:17:05 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=IcedTea Web Start -Comment=IcedTea Application Launcher -Exec=/usr/bin/javaws %f -Icon=javaws.png -Terminal=false -Type=Application -NoDisplay=true -Categories=Network;WebBrowser; -MimeType=application/x-java-jnlp-file;