slitaz-dev-tools rev 191 1.9

tazdev: change relpkg behavior. retrieve the last version from .hgtags. Put archive in /src
author Eric Joseph-Alexandre <erjo@slitaz.org>
date Thu Jan 17 12:07:53 2013 +0100 (2013-01-17)
parents 9da0e2756a59
children 5f521061027a
files tazdev/tazdev tazdev/tazdev.conf
line diff
     1.1 --- a/tazdev/tazdev	Thu Jan 17 10:29:00 2013 +0100
     1.2 +++ b/tazdev/tazdev	Thu Jan 17 12:07:53 2013 +0100
     1.3 @@ -12,7 +12,7 @@
     1.4  #     Pascal Bellard <bellard@slitaz.org>
     1.5  #
     1.6  
     1.7 -VERSION=1.8
     1.8 +VERSION=1.9
     1.9  
    1.10  . /lib/libtaz.sh
    1.11  
    1.12 @@ -346,12 +346,19 @@
    1.13  	relpkg|-rp)
    1.14  		# Release a slitaz sub-project and upload tarball to mirror
    1.15  		[ -z "$MIRROR_SOURCES" ] && MIRROR_SOURCES="/var/www/slitaz/mirror/sources"
    1.16 -		if [ -z $2 ] || [ -z $3 ]; then
    1.17 -			echo -e "\nUsage: $0 relpkg package version\n"
    1.18 +		if [ -z $2 ]; then
    1.19 +			echo -e "\nUsage: $0 relpkg package [version]\n"
    1.20  			exit 0
    1.21  		fi
    1.22  		pkg=$2
    1.23 -		version=$3
    1.24 +		
    1.25 +		# We can get the last found version in .hgtags
    1.26 +		if [ -z $3 ]; then
    1.27 +			version=$(tail -n 1 $PROJECTS/$pkg/.hgtags | awk '{print $2'})
    1.28 +		else
    1.29 +			version=$3
    1.30 +		fi
    1.31 +
    1.32  		echo "" && cd $PROJECTS/$pkg
    1.33  
    1.34  		# Sanity check
    1.35 @@ -363,8 +370,8 @@
    1.36  
    1.37  		# Archive
    1.38  		echo -n "Creating tarball and md5sum for: $pkg-$version... "
    1.39 -		hg archive -t tgz $pkg-$version.tar.gz
    1.40 -		md5sum $pkg-$version.tar.gz > $pkg-$version.md5
    1.41 +		hg archive -t tgz $SOURCE/$pkg-$version.tar.gz
    1.42 +		( cd $SOURCE; md5sum $pkg-$version.tar.gz > $pkg-$version.md5 )
    1.43  		echo "Done"
    1.44  
    1.45  		# Upload
    1.46 @@ -373,7 +380,7 @@
    1.47  		if [ "$upload" = "y" ]; then
    1.48  			echo "Uploading to: $MIRROR/sources/${pkg#slitaz-}"
    1.49  			scp $pkg-$version.tar.gz $pkg-$version.md5 \
    1.50 -				$user@$MIRROR:$MIRROR_SOURCES/${pkg#slitaz-}
    1.51 +				$MIRROR:$MIRROR_SOURCES/${pkg#slitaz-}
    1.52  		fi
    1.53  
    1.54  		# Update pkg in wok
     2.1 --- a/tazdev/tazdev.conf	Thu Jan 17 10:29:00 2013 +0100
     2.2 +++ b/tazdev/tazdev.conf	Thu Jan 17 12:07:53 2013 +0100
     2.3 @@ -7,6 +7,9 @@
     2.4  # Path to all own and copy projects.
     2.5  PROJECTS="$HOME/Projects"
     2.6  
     2.7 +# Path to archive
     2.8 +SOURCE=$SLITAZ_HOME/src
     2.9 +
    2.10  # Packages to generate a minimal chroot.
    2.11  CHROOT_PKGS="slitaz-base-files busybox cookutils tazpkg lzma"
    2.12