Mercurial > hg > icepick
changeset 2:3a327f10031d
Fixed to work with a langtools checkout.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Wed, 28 Nov 2007 16:55:11 +0000 |
| parents | bda6762b6de3 |
| children | dbc17dd9fa08 |
| files | ChangeLog Makefile.am configure.ac m4/acinclude.m4 |
| diffstat | 4 files changed, 26 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Nov 28 16:23:15 2007 +0000 +++ b/ChangeLog Wed Nov 28 16:55:11 2007 +0000 @@ -1,3 +1,10 @@ +2007-11-28 Andrew John Hughes <gnu_andrew@member.fsf.org> + + * Makefile.am, + * configure.ac, + * m4/acinclude.m4: + Fix so that it works with a langtools checkout. + 2007-11-28 Andrew John Hughes <gnu_andrew@member.fsf.org> * NEWS,
--- a/Makefile.am Wed Nov 28 16:23:15 2007 +0000 +++ b/Makefile.am Wed Nov 28 16:55:11 2007 +0000 @@ -10,7 +10,7 @@ USER_RELEASE_SUFFIX := $(shell echo $(USER)_`date '+%d_%b_%Y_%H_%M' | tr "A-Z" "a-z"`) FULL_VERSION = $(RELEASE)-$(USER_RELEASE_SUFFIX)-$(BUILD_NUMBER) -# Setup the compiler to use the GNU Classpath library we just built. +# Setup the compiler if FOUND_ECJ JCOMPILER = $(ECJ) -1.5 -encoding UTF-8 -warn:-deprecation,serial,typeHiding,unchecked,unused,varargsCast -bootclasspath $(PATH_TO_GLIBJ_ZIP) -classpath .:$(USER_CLASSLIB) else @@ -27,7 +27,7 @@ EXTRA_DIST = tools/apt.in tools/javac.in tools/javah.in tools/javadoc.in # All our example java source files -OPENJDK_CLASSES = $(OPENJDK_SRC_DIR)/j2se/src/share/classes +OPENJDK_CLASSES = $(LANGTOOLS_SRC_DIR)/src/share/classes TOOLS_JAVA_FILES = $(OPENJDK_CLASSES)/com/sun/tools/apt/Main.java \ $(OPENJDK_CLASSES)/com/sun/javadoc/*.java \ $(OPENJDK_CLASSES)/com/sun/tools/apt/comp/*.java \ @@ -50,8 +50,8 @@ $(OPENJDK_CLASSES)/com/sun/tools/javac/model/*.java \ $(OPENJDK_CLASSES)/com/sun/tools/javac/parser/*.java \ $(OPENJDK_CLASSES)/com/sun/tools/javac/processing/*.java \ + $(OPENJDK_CLASSES)/com/sun/tools/javac/zip/*.java \ $(OPENJDK_CLASSES)/com/sun/tools/javah/*.java \ - $(OPENJDK_CLASSES)/com/sun/tools/javah/oldjavah/*.java \ $(OPENJDK_CLASSES)/com/sun/tools/javadoc/*.java \ $(OPENJDK_CLASSES)/com/sun/mirror/apt/*.java \ $(OPENJDK_CLASSES)/com/sun/mirror/type/*.java \ @@ -65,11 +65,6 @@ $(OPENJDK_CLASSES)/javax/lang/model/element/*.java \ $(OPENJDK_CLASSES)/javax/tools/*.java \ $(OPENJDK_CLASSES)/javax/annotation/processing/*.java \ - $(OPENJDK_CLASSES)/sun/tools/asm/*.java \ - $(OPENJDK_CLASSES)/sun/tools/java/*.java \ - $(OPENJDK_CLASSES)/sun/tools/javac/*.java \ - $(OPENJDK_CLASSES)/sun/tools/tree/*.java \ - $(OPENJDK_CLASSES)/sun/tools/util/*.java \ $(OPENJDK_CLASSES)/com/sun/tools/doclets/*.java \ $(OPENJDK_CLASSES)/com/sun/tools/doclets/formats/html/*.java \ $(OPENJDK_CLASSES)/com/sun/tools/doclets/formats/html/markup/*.java \ @@ -78,8 +73,7 @@ $(OPENJDK_CLASSES)/com/sun/tools/doclets/internal/toolkit/taglets/*.java \ $(OPENJDK_CLASSES)/com/sun/tools/doclets/internal/toolkit/util/*.java \ $(OPENJDK_CLASSES)/com/sun/tools/doclets/internal/toolkit/util/links/*.java \ - $(OPENJDK_CLASSES)/com/sun/tools/doclets/standard/*.java \ - $(srcdir)/com/sun/tools/javac/resources/version.java + $(OPENJDK_CLASSES)/com/sun/tools/doclets/standard/*.java # The zip files with classes we want to produce. TOOLS_ZIP = tools.jar @@ -110,8 +104,8 @@ cp -p $$file $(distdir)/$$f; \ done -$(srcdir)/com/sun/tools/javac/resources/version.java: \ - $(OPENJDK_CLASSES)/com/sun/tools/javac/resources/version-template.java +$(srcdir)/com/sun/tools/javac/resources/version.properties: \ + $(OPENJDK_CLASSES)/com/sun/tools/javac/resources/version.properties-template $(MKDIR) -p $(@D) $(SED) -e 's/$$(JDK_VERSION)/$(JDK_VERSION)/' \ -e 's/$$(FULL_VERSION)/$(FULL_VERSION)/' \ @@ -122,7 +116,7 @@ # the class files. Always regenerate all .class files and remove them # immediately. And copy the template files we use to the classes dir # so they get also included. -$(TOOLS_ZIP): $(TOOLS_JAVA_FILES) +$(TOOLS_ZIP): $(TOOLS_JAVA_FILES) $(srcdir)/com/sun/tools/javac/resources/version.properties @rm -rf classes $(MKDIR) classes # $(FIND) $(srcdir)/com $(srcdir)/javax \
--- a/configure.ac Wed Nov 28 16:23:15 2007 +0000 +++ b/configure.ac Wed Nov 28 16:55:11 2007 +0000 @@ -6,7 +6,7 @@ dnl define([AC_CACHE_LOAD], )dnl dnl define([AC_CACHE_SAVE], )dnl -AC_INIT([IcePick],[0.01],[classpath@gnu.org],[icedpick]) +AC_INIT([IcePick],[0.01],[classpath@gnu.org],[icepick]) AC_CONFIG_SRCDIR(tools/javadoc.in) AC_CANONICAL_TARGET @@ -53,7 +53,7 @@ CLASSPATH_WITH_CLASSLIB -WITH_OPENJDK_SRC_DIR +WITH_LANGTOOLS_SRC_DIR dnl ----------------------------------------------------------- dnl Initialize maintainer mode
--- a/m4/acinclude.m4 Wed Nov 28 16:23:15 2007 +0000 +++ b/m4/acinclude.m4 Wed Nov 28 16:55:11 2007 +0000 @@ -454,21 +454,21 @@ fi ]) -AC_DEFUN([WITH_OPENJDK_SRC_DIR], +AC_DEFUN([WITH_LANGTOOLS_SRC_DIR], [ - AC_MSG_CHECKING(openjdk sources) - AC_ARG_WITH([openjdk-src-dir], - [AS_HELP_STRING(--with-openjdk-src-dir,specify the location of the openjdk sources)], + AC_MSG_CHECKING(langtools sources) + AC_ARG_WITH([langtools-src-dir], + [AS_HELP_STRING(--with-langtools-src-dir,specify the location of the openjdk langtools sources)], [ - OPENJDK_SRC_DIR=${withval} + LANGTOOLS_SRC_DIR=${withval} AC_MSG_RESULT(${withval}) - conditional_with_openjdk_sources=true + conditional_with_langtools_sources=true ], [ - conditional_with_openjdk_sources=false - OPENJDK_SRC_DIR=`pwd`/openjdk + conditional_with_langtools_sources=false + LANGTOOLS_SRC_DIR=`pwd`/langtools AC_MSG_RESULT(${OPENJDK_SRC_DIR}) ]) - AC_SUBST(OPENJDK_SRC_DIR) - AM_CONDITIONAL(GNU_CLASSLIB_FOUND, test "x${conditional_with_openjdk_sources}" = xtrue) + AC_SUBST(LANGTOOLS_SRC_DIR) + AM_CONDITIONAL(GNU_CLASSLIB_FOUND, test "x${conditional_with_langtools_sources}" = xtrue) ])