Mercurial > hg > release > icedtea6-1.5
changeset 546:bab93b9ee9c3 cacao
2008-01-03 Lillian Angel <langel@redhat.com>
* Makefile.am
(dist-openjdk): Added check for mercurial forest extension.
(stamps/clone.stamp): Likewise.
* Makefile.in: Regenerate.
| author | Lillian Angel <langel@redhat.com> |
|---|---|
| date | Thu, 03 Jan 2008 10:15:35 -0500 |
| parents | 78dc6574285c |
| children | 93c1d1a3868b |
| files | ChangeLog Makefile.am Makefile.in |
| diffstat | 3 files changed, 31 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Dec 28 10:12:51 2007 -0500 +++ b/ChangeLog Thu Jan 03 10:15:35 2008 -0500 @@ -1,3 +1,10 @@ +2008-01-03 Lillian Angel <langel@redhat.com> + + * Makefile.am + (dist-openjdk): Added check for mercurial forest extension. + (stamps/clone.stamp): Likewise. + * Makefile.in: Regenerate. + 2007-12-28 Lillian Angel <langel@redhat.com> * rt/java/awt/image/Raster.java
--- a/Makefile.am Fri Dec 28 10:12:51 2007 -0500 +++ b/Makefile.am Thu Jan 03 10:15:35 2008 -0500 @@ -117,6 +117,12 @@ # Creates archive of openjdk. dist-openjdk: + if ! hg fclone -h; \ + then \ + echo "No forest extension found. Please refer to" \ + "http://selenic.com/mercurial/wiki/index.cgi/ForestExtension"; \ + exit 1; \ + fi hg fclone -r jdk7-$(OPENJDK_VERSION) $(OPENJDK_URL) openjdk-dist/openjdk find -name \\.hg* | xargs rm -rf cd openjdk-dist && $(ZIP) -r openjdk-$(OPENJDK_VERSION) openjdk/ @@ -140,6 +146,12 @@ if [ ! -z $(OPENJDK_SRC_ZIP) ] ; then \ $(UNZIP) -q $(OPENJDK_SRC_ZIP) ; \ else \ + if ! hg fclone -h; \ + then \ + echo "No forest extension found. Please refer to" \ + "http://selenic.com/mercurial/wiki/index.cgi/ForestExtension"; \ + exit 1; \ + fi; \ hg fclone -r jdk7-$(OPENJDK_VERSION) $(OPENJDK_URL) openjdk; \ fi ; \ fi
--- a/Makefile.in Fri Dec 28 10:12:51 2007 -0500 +++ b/Makefile.in Thu Jan 03 10:15:35 2008 -0500 @@ -615,6 +615,12 @@ # Creates archive of openjdk. dist-openjdk: + if ! hg fclone -h; \ + then \ + echo "No forest extension found. Please refer to" \ + "http://selenic.com/mercurial/wiki/index.cgi/ForestExtension"; \ + exit 1; \ + fi hg fclone -r jdk7-$(OPENJDK_VERSION) $(OPENJDK_URL) openjdk-dist/openjdk find -name \\.hg* | xargs rm -rf cd openjdk-dist && $(ZIP) -r openjdk-$(OPENJDK_VERSION) openjdk/ @@ -626,6 +632,12 @@ if [ ! -z $(OPENJDK_SRC_ZIP) ] ; then \ $(UNZIP) -q $(OPENJDK_SRC_ZIP) ; \ else \ + if ! hg fclone -h; \ + then \ + echo "No forest extension found. Please refer to" \ + "http://selenic.com/mercurial/wiki/index.cgi/ForestExtension"; \ + exit 1; \ + fi; \ hg fclone -r jdk7-$(OPENJDK_VERSION) $(OPENJDK_URL) openjdk; \ fi ; \ fi