changeset in /hg/icedtea6: 2008-12-03 Matthias Klose <doko at ubu...

[Andrew John Hughes]

2008/12/3  <doko at ubuntu.com>:
> changeset 0385f0e789f0 in /hg/icedtea6
> details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=0385f0e789f0
> description:
>        2008-12-03  Matthias Klose  <doko at ubuntu.com>
>
>                * Makefile.am (stamps/extract.stamp): Only extract HOTSPOT_SRC_ZIP,
>                if WITH_ALT_HSBUILD is defined.
>
> diffstat:
>
> 2 files changed, 14 insertions(+), 7 deletions(-)
> ChangeLog   |    5 +++++
> Makefile.am |   16 +++++++++-------
>
> diffs (40 lines):
>
> diff -r 8bf089d06e19 -r 0385f0e789f0 ChangeLog
> --- a/ChangeLog Wed Dec 03 10:07:38 2008 -0500
> +++ b/ChangeLog Wed Dec 03 16:32:02 2008 +0100
> @@ -1,3 +1,8 @@ 2008-12-02  Omair Majid  <omajid at redhat.
> +2008-12-03  Matthias Klose  <doko at ubuntu.com>
> +
> +       * Makefile.am (stamps/extract.stamp): Only extract HOTSPOT_SRC_ZIP,
> +       if WITH_ALT_HSBUILD is defined.
> +
>  2008-12-02  Omair Majid  <omajid at redhat.com>
>
>        * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/ContextEvent.java:
> diff -r 8bf089d06e19 -r 0385f0e789f0 Makefile.am
> --- a/Makefile.am       Wed Dec 03 10:07:38 2008 -0500
> +++ b/Makefile.am       Wed Dec 03 16:32:02 2008 +0100
> @@ -631,15 +631,17 @@ stamps/extract.stamp: stamps/download.st
>          mkdir openjdk ; \
>          $(TAR) xf $(OPENJDK_SRC_ZIP) -C openjdk; \
>          chmod -R ug+w openjdk ; \
> -         if test -e ${HOTSPOT_SRC_ZIP} ; \
> -         then \
> -           rm -rf openjdk/hotspot ; \
> -           $(TAR) xf $(HOTSPOT_SRC_ZIP) ; \
> -           chmod -R ug+w hotspot-* ; \
> -           mv $$(find -maxdepth 1 -name 'hotspot-*' -type d) openjdk/hotspot ; \
> -         fi ; \
>          sh $(abs_top_srcdir)/fsg.sh ; \
>        fi
> +if WITH_ALT_HSBUILD
> +       if test -e ${HOTSPOT_SRC_ZIP} ; \
> +       then \
> +         rm -rf openjdk/hotspot ; \
> +         $(TAR) xf $(HOTSPOT_SRC_ZIP) ; \
> +         chmod -R ug+w hotspot-* ; \
> +         mv $$(find -maxdepth 1 -name 'hotspot-*' -type d) openjdk/hotspot ; \
> +       fi
> +endif
>  if WITH_CACAO
>  if !USE_SYSTEM_CACAO
>        if ! test -d cacao ; \
>


With this change, we now nuke an existing openjdk/hotspot directory,
which clearly isn't a good idea...

Is there a better fix?
-- 
Andrew :-)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8