# HG changeset patch
# User Antoine Bodin <gokhlayeh@slitaz.org>
# Date 1299862694 -3600
# Node ID f1207145dcb3f4a70be6aaa01d7d6ac8a5051400
# Parent  2074057740e12ab74eae237cfc7f1aeb48a39e70
Fix icedtea6; handle multi-sources using some new receipts

diff -r 2074057740e1 -r f1207145dcb3 icedtea6-jdk/receipt
--- a/icedtea6-jdk/receipt	Fri Mar 11 17:41:03 2011 +0100
+++ b/icedtea6-jdk/receipt	Fri Mar 11 17:58:14 2011 +0100
@@ -7,29 +7,28 @@
 SHORT_DESC="A Free Software harness for OpenJDK."
 MAINTAINER="rcx@zoominternet.net"
 DEPENDS="icedtea6-jre glibc-base zlib xorg-libX11 xorg-libXau xorg-libXdmcp"
-BUILD_DEPENDS="gcc+gcj slitaz-toolchain autoconf automake m4 diffutils gawk \
+BUILD_DEPENDS="gcc+gcj autoconf automake m4 diffutils gawk \
 coreutils-file-special coreutils-file-summarize alsa-lib-dev cups-dev \
-gawk file patch findutils perl zip unzip bzip2 tar cpio glib-dev zlib-dev \
-fastjar rhino ecj apache-ant xalan-xerces-j \
+file patch findutils perl zip unzip bzip2 tar cpio glib-dev \
+fastjar rhino ecj apache-ant xalan-xerces-j wget \
 freetype-dev gtk+-dev giflib-dev jpeg-dev libpng-dev \
 xorg-inputproto xorg-kbproto xorg-libXi-dev xorg-libXinerama-dev \
 xorg-libXp-dev xorg-libXt-dev xorg-libXtst-dev xorg-printproto \
 xorg-recordproto xorg-renderproto xorg-xextproto xorg-xineramaproto xorg-xproto \
-nss"
+nss jdk6-jaws jdk6-jaxp jdk6-jaf openjdk-6-src"
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="http://www.iced-tea.org/"
 WGET_URL="http://icedtea.classpath.org/download/source/$TARBALL"
 
+# Note to icedtea6 updaters,
+# You should check version into receipts:
+# * jdk6-jaxws (version: $openjdk_version)
+# * jdk6-jaxp (version: $openjdk_version)
+# * jdk6-jaf (version: $openjdk_version)
+# * openjdk-6-src (version: $openjdk_version-$openjdk_date)
+# Theses receipts allow to have source tarballs managed by tazwok.
 openjdk_version="b20"
 openjdk_date="21_jun_2010"
-JAXWS="jdk6-jaxws-${openjdk_version}.zip"
-JAXP="jdk6-jaxp-${openjdk_version}.zip"
-JAF="jdk6-jaf-${openjdk_version}.zip"
-OPENJDK="openjdk-6-src-${openjdk_version}-${openjdk_date}.tar.gz"
-WGETJAXWS="https://jax-ws.dev.java.net/files/documents/4202/150724"
-WGETJAXP="https://jaxp.dev.java.net/files/documents/913/150648"
-WGETJAF="https://jax-ws.dev.java.net/files/documents/4202/150725"
-WGETOPENJDK="http://download.java.net/openjdk/jdk6/promoted/${openjdk_version}"
 
 # Rules to configure and make the package.
 compile_rules()
@@ -47,36 +46,25 @@
 	cd $src
 	mkdir drops
 	sed -i -e 's/mkdir -p drops/true/' -e 's/ jar xf/ fastjar xf/'  Makefile*
-	[ -L /usr/bin/wget ] && tazpkg get-install wget --forced
-	for i in $JAXWS $JAXP $JAF ; do
-		if [ -f $SOURCES_REPOSITORY/$i ]; then
-			cp $SOURCES_REPOSITORY/$i drops
-		elif [ "$i" == "$JAXWS" ]; then
-			wget -O $SOURCES_REPOSITORY/$JAXWS --no-check-certificate "$WGETJAXWS/$JAXWS"
-			cp $SOURCES_REPOSITORY/$JAXWS drops
-		elif [ "$i" == "$JAXP" ]; then
-			wget -O $SOURCES_REPOSITORY/$JAXP --no-check-certificate "$WGETJAXP/$JAXP"
-			cp $SOURCES_REPOSITORY/$JAXP drops
-		elif [ "$i" == "$JAF" ]; then
-			wget -O $SOURCES_REPOSITORY/$JAF --no-check-certificate "$WGETJAF/$JAF"
-			cp $SOURCES_REPOSITORY/$JAF drops
-		fi
-		
+
+	report open-bloc
+	
+	# Check than all sources files are available, or exit.
+	for i in jdk6-jaxws jdk6-jaxp jdk6-jaf; do
+		tazwok get-src $i || { report close-bloc; return 1; }
+		cp $SOURCES_REPOSITORY/$i-$openjdk_version.zip drops
 	done
+	tazwok get-src openjdk-6-src || { report close-bloc; return 1; }
+	cp $SOURCES_REPOSITORY/openjdk-6-src-$openjdk_version-$openjdk_date.tar.gz .
 
-	for i in $OPENJDK ; do
-		if [ -f $SOURCES_REPOSITORY/$i ]; then
-			cp $SOURCES_REPOSITORY/$i .
-		else
-			wget -O $SOURCES_REPOSITORY/$OPENJDK "$WGETOPENJDK/$OPENJDK"
-			cp $SOURCES_REPOSITORY/$OPENJDK .
-		fi
-	done
+	report step "Checking that all needed tools are OK"
 	[ -L /usr/bin/find ] && tazpkg get-install findutils --forced
 	[ -L /usr/bin/diff ] && tazpkg get-install diffutils --forced
 	[ "$(readlink /usr/bin/awk)" == "gawk" ] ||
 	tazpkg get-install gawk --forced
 	[ -L /usr/bin/sed ] && tazpkg get-install sed --forced
+
+	report step "Running compilation"
 	mem=$(free | awk '/Mem:/ { printf "%d\n",$2/1024 }')
 	cat > slitaz.sh <<EOT
 # Busybox compatibility
@@ -101,17 +89,18 @@
 		--with-rhino=/usr/share/java/js.jar \
 		--with-abs-install-dir=$JVM_PREFIX \
 		$CONFIGURE_ARGS &&
-	make -j 1 ARCH_PREFIX=  || return 1
+	make -j 1 ARCH_PREFIX=  || { report close-bloc; return 1; }
 
 	# NOTE: don't build with -j 4. Only build with -j 1 or tank will crash
 	# NOTE: IcedTea6 does not define an "install" target
 	
-	rm -r -f $src/_pkg
+	report step "Copying needed files to install dir"
+	rm -rf $DESTDIR
 
 	local JVM_BUILDDIR
 	JVM_BUILDDIR=$src/openjdk.build/j2sdk-image
 	local JVM_DESTDIR
-	JVM_DESTDIR=$src/_pkg$JVM_PREFIX
+	JVM_DESTDIR=$DESTDIR$JVM_PREFIX
 
 	mkdir -p $JVM_DESTDIR
 	cp -a $JVM_BUILDDIR/bin $JVM_DESTDIR
@@ -127,17 +116,18 @@
 	done
 
 	# Create symlinks for JDK binaries
-	mkdir -p $src/_pkg/usr/jdk-bin
+	mkdir -p $DESTDIR/usr/jdk-bin
 	for jbin in $(ls -1 $JVM_DESTDIR/bin) ; do
-		ln -s $JVM_PREFIX/bin/$jbin $src/_pkg/usr/jdk-bin/$jbin
+		ln -s $JVM_PREFIX/bin/$jbin $DESTDIR/usr/jdk-bin/$jbin
 	done
 	
 	# Create symlinks for JRE binaries
-	mkdir -p $src/_pkg/usr/jre-bin
+	mkdir -p $DESTDIR/usr/jre-bin
 	for jbin in $(ls -1 $JVM_DESTDIR/jre/bin) ; do
 		ln -s $JVM_PREFIX/jre/bin/$jbin $JVM_DESTDIR/bin/$jbin
-		ln -s $JVM_PREFIX/jre/bin/$jbin $src/_pkg/usr/jre-bin
+		ln -s $JVM_PREFIX/jre/bin/$jbin $DESTDIR/usr/jre-bin
 	done
+	report close-bloc
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r 2074057740e1 -r f1207145dcb3 icedtea6-jre/receipt
--- a/icedtea6-jre/receipt	Fri Mar 11 17:41:03 2011 +0100
+++ b/icedtea6-jre/receipt	Fri Mar 11 17:58:14 2011 +0100
@@ -16,9 +16,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	# tazwok does not define _pkg correctly when both WANTED and SOURCE are set
-	
-
 	mkdir -p $fs/usr/lib/jvm/java-icedtea
 	cp -a $_pkg/usr/lib/jvm/java-icedtea/jre $fs/usr/lib/jvm/java-icedtea
 }
diff -r 2074057740e1 -r f1207145dcb3 jdk6-jaf/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk6-jaf/receipt	Fri Mar 11 17:58:14 2011 +0100
@@ -0,0 +1,12 @@
+# SliTaz package receipt.
+
+PACKAGE="jdk6-jaf"
+VERSION="b20"
+CATEGORY="development"
+SHORT_DESC="A component of Sun's jdk6 we use to cook icedtea6 (empty package)"
+MAINTAINER="gokhlayeh@mailoo.org"
+BUILD_DEPENDS="wget"
+TARBALL="$PACKAGE-$VERSION.zip"
+WEB_SITE="http://java.sun.com"
+WGET_URL="https://jax-ws.dev.java.net/files/documents/4202/150725/$TARBALL"
+COOK_OPT="!unpack !repack_src !fs"
diff -r 2074057740e1 -r f1207145dcb3 jdk6-jaxp/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk6-jaxp/receipt	Fri Mar 11 17:58:14 2011 +0100
@@ -0,0 +1,12 @@
+# SliTaz package receipt.
+
+PACKAGE="jdk6-jaxp"
+VERSION="b20"
+CATEGORY="development"
+SHORT_DESC="A component of Sun's jdk6 we use to cook icedtea6 (empty package)"
+MAINTAINER="gokhlayeh@mailoo.org"
+BUILD_DEPENDS="wget"
+TARBALL="$PACKAGE-$VERSION.zip"
+WEB_SITE="http://java.sun.com"
+WGET_URL="https://jaxp.dev.java.net/files/documents/913/150648/$TARBALL"
+COOK_OPT="!unpack !repack_src !fs"
diff -r 2074057740e1 -r f1207145dcb3 jdk6-jaxws/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk6-jaxws/receipt	Fri Mar 11 17:58:14 2011 +0100
@@ -0,0 +1,12 @@
+# SliTaz package receipt.
+
+PACKAGE="jdk6-jaxws"
+VERSION="b20"
+CATEGORY="development"
+SHORT_DESC="A component of Sun's jdk6 we use to cook icedtea6 (empty package)"
+MAINTAINER="gokhlayeh@mailoo.org"
+BUILD_DEPENDS="wget"
+TARBALL="$PACKAGE-$VERSION.zip"
+WEB_SITE="http://java.sun.com"
+WGET_URL="https://jax-ws.dev.java.net/files/documents/4202/150724/$TARBALL"
+COOK_OPT="!unpack !repack_src !fs"
diff -r 2074057740e1 -r f1207145dcb3 openjdk-6-src/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/openjdk-6-src/receipt	Fri Mar 11 17:58:14 2011 +0100
@@ -0,0 +1,11 @@
+# SliTaz package receipt.
+
+PACKAGE="openjdk-6-src"
+VERSION="b20-21_jun_2010"
+CATEGORY="development"
+SHORT_DESC="Openjdk6 we use to cook icedtea6 (empty package)"
+MAINTAINER="gokhlayeh@mailoo.org"
+TARBALL="$PACKAGE-$VERSION.tar.gz"
+WEB_SITE="http://java.sun.com"
+WGET_URL="http://download.java.net/openjdk/jdk6/promoted/${VERSION%-*}/$TARBALL"
+COOK_OPT="!unpack !repack_src !fs"