/hg/icedtea7: 4 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Aug 6 03:00:38 UTC 2014
changeset a85a6db8cb67 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=a85a6db8cb67
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Jun 13 01:46:35 2014 +0100
Update tarball scripts and .hgignore
2014-06-12 Andrew John Hughes <gnu.andrew at member.fsf.org>
* .hgignore: Add compile script added by
recent version of Automake.
* scripts/create_tarballs.sh: New script
to create tarballs using Mercurial, as used
for the drops created for the previous bump.
* scripts/gen_changeset_and_sha256sums.sh:
Updated to latest local version, with support
for tarballs created by create_tarballs.sh.
* scripts/update_tarballs.sh:
Updated to latest local version with support
for OpenJDK 8.
changeset ca6723e81f6b in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=ca6723e81f6b
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Aug 05 19:41:19 2014 +0100
Remove obsolete files.
2014-06-13 Andrew John Hughes <gnu.andrew at member.fsf.org>
* javaws.desktop,
* javaws.png:
Remove obsolete files.
* Makefile.am:
(EXTRA_DIST): Remove above.
changeset 5d3eb06bf1a1 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=5d3eb06bf1a1
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Aug 05 19:46:20 2014 +0100
PR1848: Removal of project support leaves trailing '-' in version
2014-06-13 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1848: Removal of project support leaves
trailing '-' in version
* Makefile.am:
(versioning): Drop use of PROJECT_NAME removed
in PR1365.
* NEWS: Updated.
changeset 2fb095d3fc86 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=2fb095d3fc86
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Aug 06 04:00:20 2014 +0100
PR1846: Build fails when using IcedTea7 as bootstrap JDK with native ecj
2014-08-05 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1846: Build fails when using IcedTea7 as bootstrap
JDK with native ecj
* NEWS: Updated.
* patches/boot/icedteart.patch:
Remove additions of ICEDTEA_RT to classpath which
are no longer needed.
diffstat:
.hgignore | 2 +-
ChangeLog | 40 +++++++++++++
Makefile.am | 6 +-
NEWS | 1 +
javaws.desktop | 11 ---
javaws.png | Bin
patches/boot/icedteart.patch | 28 ---------
scripts/create_tarballs.sh | 93 ++++++++++++++++++++++++++++++++
scripts/gen_changeset_and_sha256sums.sh | 80 ++++++++++++++++++++++++---
scripts/update_tarballs.sh | 79 ++++++++++++++++++++++++--
10 files changed, 278 insertions(+), 62 deletions(-)
diffs (431 lines):
diff -r 8cc9f91d6085 -r 2fb095d3fc86 .hgignore
--- a/.hgignore Fri Aug 01 15:31:11 2014 +0100
+++ b/.hgignore Wed Aug 06 04:00:20 2014 +0100
@@ -10,4 +10,4 @@
config.status
install-sh
Makefile.in
-
+compile
diff -r 8cc9f91d6085 -r 2fb095d3fc86 ChangeLog
--- a/ChangeLog Fri Aug 01 15:31:11 2014 +0100
+++ b/ChangeLog Wed Aug 06 04:00:20 2014 +0100
@@ -1,3 +1,43 @@
+2014-08-05 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1846: Build fails when using IcedTea7 as bootstrap
+ JDK with native ecj
+ * NEWS: Updated.
+ * patches/boot/icedteart.patch:
+ Remove additions of ICEDTEA_RT to classpath which
+ are no longer needed.
+
+2014-06-13 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1848: Removal of project support leaves
+ trailing '-' in version
+ * Makefile.am:
+ (versioning): Drop use of PROJECT_NAME removed
+ in PR1365.
+ * NEWS: Updated.
+
+2014-06-13 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * javaws.desktop,
+ * javaws.png:
+ Remove obsolete files.
+ * Makefile.am:
+ (EXTRA_DIST): Remove above.
+
+2014-06-12 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * .hgignore: Add compile script added by
+ recent version of Automake.
+ * scripts/create_tarballs.sh: New script
+ to create tarballs using Mercurial, as used
+ for the drops created for the previous bump.
+ * scripts/gen_changeset_and_sha256sums.sh:
+ Updated to latest local version, with support
+ for tarballs created by create_tarballs.sh.
+ * scripts/update_tarballs.sh:
+ Updated to latest local version with support
+ for OpenJDK 8.
+
2014-07-31 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
diff -r 8cc9f91d6085 -r 2fb095d3fc86 Makefile.am
--- a/Makefile.am Fri Aug 01 15:31:11 2014 +0100
+++ b/Makefile.am Wed Aug 06 04:00:20 2014 +0100
@@ -740,7 +740,6 @@
$(top_srcdir)/patches/cacao/*.patch \
$(top_srcdir)/patches/hotspot/*/*.patch \
tools-copy contrib overlays \
- javaws.png javaws.desktop \
jconsole.desktop policytool.desktop \
$(JTREG_SRCS) HACKING fsg.sh \
hotspot.map autogen.sh \
@@ -1465,13 +1464,10 @@
echo "DISTRO_PACKAGE_VERSION=$(PKGVERSION)" \
>>openjdk/jdk/make/common/shared/Defs.gmk ;
endif
- if test x"$(PROJECT_NAME)" != "xjdk7" && test x"$(PROJECT_NAME)" != "xicedtea"; then \
- proj_suffix="-$(PROJECT_NAME)"; \
- fi ; \
if test x"$(VERSION_SUFFIX)" != "x"; then \
ver_suffix="-$(VERSION_SUFFIX)"; \
fi ; \
- $(SED) -i "s#BUILD_VARIANT_RELEASE)#BUILD_VARIANT_RELEASE)$${proj_suffix}$${ver_suffix}#" \
+ $(SED) -i "s#BUILD_VARIANT_RELEASE)#BUILD_VARIANT_RELEASE)$${ver_suffix}#" \
openjdk/jdk/make/common/shared/Defs.gmk;
mkdir -p stamps
touch $@
diff -r 8cc9f91d6085 -r 2fb095d3fc86 NEWS
--- a/NEWS Fri Aug 01 15:31:11 2014 +0100
+++ b/NEWS Wed Aug 06 04:00:20 2014 +0100
@@ -73,6 +73,7 @@
* Bug fixes
- PR1786: Allow x86 build to occur on x86_64 using a previously built x86_64 build
- PR1847: Synchronise javac.in with IcedTea6
+ - PR1846: Build fails when using IcedTea7 as bootstrap JDK with native ecj
New in release 2.4.8 (2014-07-23):
diff -r 8cc9f91d6085 -r 2fb095d3fc86 javaws.desktop
--- a/javaws.desktop Fri Aug 01 15:31:11 2014 +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;
diff -r 8cc9f91d6085 -r 2fb095d3fc86 javaws.png
Binary file javaws.png has changed
diff -r 8cc9f91d6085 -r 2fb095d3fc86 patches/boot/icedteart.patch
--- a/patches/boot/icedteart.patch Fri Aug 01 15:31:11 2014 +0100
+++ b/patches/boot/icedteart.patch Wed Aug 06 04:00:20 2014 +0100
@@ -1,31 +1,3 @@
-diff -Nru openjdk-boot.orig/jdk/make/common/BuildToolJar.gmk openjdk-boot/jdk/make/common/BuildToolJar.gmk
---- openjdk-boot.orig/jdk/make/common/BuildToolJar.gmk 2009-12-04 23:26:17.000000000 +0000
-+++ openjdk-boot/jdk/make/common/BuildToolJar.gmk 2009-12-13 20:16:48.000000000 +0000
-@@ -43,7 +43,8 @@
- @$(prep-target)
- @$(MKDIR) -p $(BUILDTOOLCLASSDIR)
- $(BOOT_JAVAC_CMD) -d $(BUILDTOOLCLASSDIR) \
-- -sourcepath $(BUILDTOOL_SOURCE_ROOT) $(BUILDTOOL_MAIN_SOURCE_FILE)
-+ -sourcepath $(BUILDTOOL_SOURCE_ROOT) -classpath $(ICEDTEA_RT) \
-+ $(BUILDTOOL_MAIN_SOURCE_FILE)
- $(BOOT_JAR_CMD) cfm $@ $(BUILDTOOL_MANIFEST_FILE) \
- -C $(BUILDTOOLCLASSDIR) $(PKGDIR) \
- $(BOOT_JAR_JFLAGS) || $(RM) $@
-diff -Nru openjdk-boot.orig/jdk/make/common/Rules.gmk openjdk-boot/jdk/make/common/Rules.gmk
---- openjdk-boot.orig/jdk/make/common/Rules.gmk 2009-12-04 23:26:17.000000000 +0000
-+++ openjdk-boot/jdk/make/common/Rules.gmk 2009-12-13 20:16:48.000000000 +0000
-@@ -237,8 +237,9 @@
- $(ECHO) "# Java sources to be compiled: (listed in file $<)"; \
- $(CAT) $<.filtered; \
- $(ECHO) "# Running javac:"; \
-- $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$<.filtered; \
-- $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$<.filtered; \
-+ $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -bootclasspath "$(CLASSDESTDIR):$(ICEDTEA_RT)" \
-+ -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
-+ $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -bootclasspath "$(CLASSDESTDIR):$(ICEDTEA_RT)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
- fi
- @$(java-vm-cleanup)
-
diff -Nru openjdk-boot.orig/jdk/make/sun/javazic/Makefile openjdk-boot/jdk/make/sun/javazic/Makefile
--- openjdk-boot.orig/jdk/make/sun/javazic/Makefile 2009-12-04 23:26:37.000000000 +0000
+++ openjdk-boot/jdk/make/sun/javazic/Makefile 2009-12-13 20:16:48.000000000 +0000
diff -r 8cc9f91d6085 -r 2fb095d3fc86 scripts/create_tarballs.sh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/create_tarballs.sh Wed Aug 06 04:00:20 2014 +0100
@@ -0,0 +1,93 @@
+#!/bin/bash
+
+# Copyright (C) 2014 Red Hat, Inc.
+# Written by Andrew John Hughes <gnu.andrew at redhat.com>.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+CHECKOUT_DIR=$1
+DOWNLOAD_DIR=$2
+TAG=$3
+RUNNING_DIR=$(dirname $0)
+CTYPE=bz2
+echo "PWD: $PWD"
+echo "COMPRESSION TYPE: ${CTYPE}"
+
+if [ $(echo $0|grep '8$') ]; then
+ echo "Assuming OpenJDK 8 and later";
+ OPENJDK8=true;
+ NASHORN=nashorn;
+else
+ echo "Assuming OpenJDK 7 and earlier";
+ OPENJDK8=false;
+fi
+
+if test "x$CHECKOUT_DIR" = "x"; then
+ echo "ERROR: Checkout directory must be specified";
+ echo "$0 <CHECKOUT_DIR> <DOWNLOAD_DIR> <TAG>"
+ exit -1;
+fi
+
+if test "x$DOWNLOAD_DIR" = "x"; then
+ if test "x$OPENJDK8" = "xfalse"; then
+ DOWNLOAD_DIR=/home/downloads/java/drops/icedtea7 ;
+ else
+ DOWNLOAD_DIR=/home/downloads/java/drops/icedtea8 ;
+ fi
+fi
+
+if test "x$TAG" = "x"; then
+ TAG=tip ;
+elif echo ${TAG}|grep '^icedtea' ; then
+ if test "x$CHECKOUT_DIR" = "x"; then
+ echo "No checkout directory found.";
+ exit -1;
+ fi
+fi
+
+echo "TAG = $TAG";
+echo "Creating new tarballs in $DOWNLOAD_DIR"
+echo "Using checkout directory $CHECKOUT_DIR"
+URL=$(hg -R ${CHECKOUT_DIR} paths default)
+PREFIX=$(echo ${URL}|sed -r 's#.*/([^/]*)$#\1#'|sed 's#\.#-#')
+echo "Upstream URL is ${URL}"
+echo "Prefix for root tree is ${PREFIX}"
+pushd $DOWNLOAD_DIR
+for repos in . corba jaxp jaxws langtools hotspot jdk $NASHORN;
+do
+ if test "x$repos" = "x."; then
+ FILENAME=openjdk;
+ REPONAME=${PREFIX};
+ else
+ FILENAME=${repos};
+ REPONAME=${repos};
+ fi
+ if echo ${TAG} | egrep '^(icedtea|jdk|tip)' > /dev/null ; then
+ CHANGESET=$(hg log -r ${TAG} -R ${CHECKOUT_DIR}/$repos | head -n1| awk -F ':' '{print $3}')
+ else
+ CHANGESET=${TAG}
+ fi
+ echo "Creating ${FILENAME}.tar.${CTYPE} containing ${REPONAME}-${CHANGESET} from tag ${TAG} in ${CHECKOUT_DIR}/${repos}"
+ hg archive -R ${CHECKOUT_DIR}/$repos -t t${CTYPE} -r ${TAG} -p ${REPONAME}-${CHANGESET} ${FILENAME}.tar.${CTYPE}
+done
+echo Removing outdated symlinks
+find $DOWNLOAD_DIR -maxdepth 1 -type l -exec rm -vf '{}' ';'
+popd
+echo Generating new changeset IDs and SHA256 sums
+echo URL = ${URL}
+if test "x$OPENJDK8" = "xfalse"; then
+ $RUNNING_DIR/gen_changeset_and_sha256sums.sh bz2 $DOWNLOAD_DIR ${URL}
+else
+ $RUNNING_DIR/gen_changeset_and_sha256sums_8.sh bz2 $DOWNLOAD_DIR ${URL}
+fi
diff -r 8cc9f91d6085 -r 2fb095d3fc86 scripts/gen_changeset_and_sha256sums.sh
--- a/scripts/gen_changeset_and_sha256sums.sh Fri Aug 01 15:31:11 2014 +0100
+++ b/scripts/gen_changeset_and_sha256sums.sh Wed Aug 06 04:00:20 2014 +0100
@@ -1,19 +1,79 @@
#!/bin/bash
-DOWNLOAD_DIR=$1
+# Copyright (C) 2014 Red Hat, Inc.
+# Written by Andrew John Hughes <gnu.andrew at redhat.com>.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+COMPRESSION_TYPE=$1
+DOWNLOAD_DIR=$2
+ROOT_URL=$3
+
+if [ $(echo $0|grep '_8') ]; then
+ echo "Assuming OpenJDK 8 and later";
+ OPENJDK8=true;
+ NASHORN=nashorn;
+else
+ echo "Assuming OpenJDK 7 and earlier";
+ OPENJDK8=false;
+fi
+
+if test "x$COMPRESSION_TYPE" = "x"; then
+ echo "ERROR: Compression type must be specified.";
+ echo "$0 <COMPRESSION_TYPE> <DOWNLOAD_DIR> <ROOT_URL>"
+ exit -1;
+fi
if test "x$DOWNLOAD_DIR" = "x"; then
- DOWNLOAD_DIR=/home/downloads/java/icedtea ;
+ if test "x$OPENJDK8" = "xfalse"; then
+ DOWNLOAD_DIR=/home/downloads/java/drops/icedtea7 ;
+ else
+ DOWNLOAD_DIR=/home/downloads/java/drops/icedtea8 ;
+ fi
+fi
+
+if test "x$URL" = "x"; then
+ if test "x$OPENJDK8" = "xfalse"; then
+ URL=http://icedtea.classpath.org/hg/icedtea7-forest ;
+ else
+ URL=http://icedtea.classpath.org/hg/icedtea8-forest ;
+ fi
fi
rm -f /tmp/changesets /tmp/sums
-for repos in corba hotspot jaxp jaxws jdk langtools openjdk
+for repos in corba jaxp jaxws jdk langtools openjdk $NASHORN
do
- echo Generating changeset and checksum for $repos using $DOWNLOAD_DIR/$repos.tar.gz
- file=$DOWNLOAD_DIR/$repos.tar.gz
- id=$(echo $repos|tr '[a-z]' '[A-Z]')
- sha256sum=$(sha256sum $file|awk '{print $1}')
- changeset=$(tar tzf $file|head -n1|sed -r "s#[a-z0-9-]*-([0-9a-z]*)/.*#\1#")
- echo "${id}_CHANGESET = $changeset" >> /tmp/changesets
- echo "${id}_SHA256SUM = $sha256sum" >> /tmp/sums
+ file=$DOWNLOAD_DIR/$repos.tar.${COMPRESSION_TYPE}
+ echo Generating changeset and checksum for $repos using ${file}
+ if [ -e $file ] ; then
+ id=$(echo $repos|tr '[a-z]' '[A-Z]')
+ sha256sum=$(sha256sum $file|awk '{print $1}')
+ changeset=$(tar tf $file|head -n1|sed -r "s#[a-z0-9-]*-([0-9a-z]*)/.*#\1#")
+ name=$(echo ${DOWNLOAD_DIR}|sed -r 's#.*(icedtea.*)#\1#'|sed 's#7/#-#')
+ ln -sf ${file} ${DOWNLOAD_DIR}/${name}-${repos}-${changeset}.tar.${COMPRESSION_TYPE}
+ echo "${id}_CHANGESET = $changeset" >> /tmp/changesets
+ echo "${id}_SHA256SUM = $sha256sum" >> /tmp/sums
+ fi
done
+
+file=${DOWNLOAD_DIR}/hotspot.tar.${COMPRESSION_TYPE}
+echo Generating changeset and checksum for hotspot using ${file}
+if [ -e ${file} ] ; then
+ sha256sum=$(sha256sum $file|awk '{print $1}')
+ name=$(echo ${DOWNLOAD_DIR}|sed -r 's#.*(icedtea.*)#\1#'|sed 's#7/#-#')
+ changeset=$(tar tf $file|head -n1|sed -r "s#[a-z0-9-]*-([0-9a-z]*)/.*#\1#")
+ ln -sf ${file} ${DOWNLOAD_DIR}/${name}-hotspot-$changeset.tar.${COMPRESSION_TYPE}
+ echo "default ${ROOT_URL}/hotspot ${changeset} ${sha256sum}" > /tmp/hotspot.map
+fi
+
diff -r 8cc9f91d6085 -r 2fb095d3fc86 scripts/update_tarballs.sh
--- a/scripts/update_tarballs.sh Fri Aug 01 15:31:11 2014 +0100
+++ b/scripts/update_tarballs.sh Wed Aug 06 04:00:20 2014 +0100
@@ -1,20 +1,85 @@
#!/bin/bash
+# Copyright (C) 2014 Red Hat, Inc.
+# Written by Andrew John Hughes <gnu.andrew at redhat.com>.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
DOWNLOAD_DIR=$1
+URL=$2
+TAG=$3
+CHECKOUT_DIR=$4
RUNNING_DIR=$(dirname $0)
echo $PWD
-if test "x$DOWNLOAD_DIR" = "x"; then
- DOWNLOAD_DIR=/home/downloads/java/icedtea ;
+if [ $(echo $0|grep '8$') ]; then
+ echo "Assuming OpenJDK 8 and later";
+ OPENJDK8=true;
+ NASHORN=nashorn;
+else
+ echo "Assuming OpenJDK 7 and earlier";
+ OPENJDK8=false;
fi
+if test "x$DOWNLOAD_DIR" = "x"; then
+ if test "x$OPENJDK8" = "xfalse"; then
+ DOWNLOAD_DIR=/home/downloads/java/drops/icedtea7 ;
+ else
+ DOWNLOAD_DIR=/home/downloads/java/drops/icedtea8 ;
+ fi
+fi
+
+if test "x$URL" = "x"; then
+ if test "x$OPENJDK8" = "xfalse"; then
+ URL=http://icedtea.classpath.org/hg/icedtea7-forest ;
+ else
+ URL=http://icedtea.classpath.org/hg/icedtea8-forest ;
+ fi
+fi
+
+if test "x$TAG" = "x"; then
+ TAG=tip ;
+elif echo ${TAG}|grep '^icedtea' ; then
+ if test "x$CHECKOUT_DIR" = "x"; then
+ echo "No checkout directory found.";
+ exit -1;
+ fi
+fi
+
+echo "URL = $URL, TAG = $TAG";
echo Downloading new tarballs to $DOWNLOAD_DIR
pushd $DOWNLOAD_DIR
-for repos in corba jaxp jaxws langtools hotspot jdk;
+for repos in . corba jaxp jaxws langtools hotspot jdk $NASHORN;
do
- wget -O $repos.tar.gz http://icedtea.classpath.org/hg/icedtea7-forest/$repos/archive/tip.tar.gz
+ if test "x$repos" = "x."; then
+ FILENAME=openjdk;
+ else
+ FILENAME=$repos;
+ fi
+ if echo ${TAG} | egrep '^(icedtea|jdk)' > /dev/null ; then
+ CHANGESET=$(hg log -r ${TAG} -R ${CHECKOUT_DIR}/$repos | head -n1| awk -F ':' '{print $3}')
+ else
+ CHANGESET=${TAG}
+ fi
+ wget -O ${FILENAME}.tar.gz ${URL}/$repos/archive/${CHANGESET}.tar.gz
done
-wget -O openjdk.tar.gz http://icedtea.classpath.org/hg/icedtea7-forest/archive/tip.tar.gz
+echo Removing outdated symlinks
+find $DOWNLOAD_DIR -maxdepth 1 -type l -exec rm -vf '{}' ';'
+popd
echo Generating new changeset IDs and SHA256 sums
-popd
-$RUNNING_DIR/gen_changeset_and_sha256sums.sh $DOWNLOAD_DIR
+if test "x$OPENJDK8" = "xfalse"; then
+ $RUNNING_DIR/gen_changeset_and_sha256sums.sh gz $DOWNLOAD_DIR ${URL}
+else
+ $RUNNING_DIR/gen_changeset_and_sha256sums_8.sh gz $DOWNLOAD_DIR ${URL}
+fi
More information about the distro-pkg-dev
mailing list