diff options
| -rw-r--r-- | scripts/auto-build/auto-build-common | 8 | ||||
| -rwxr-xr-x | scripts/auto-build/pd-extended-source-tarball.sh | 17 |
2 files changed, 18 insertions, 7 deletions
diff --git a/scripts/auto-build/auto-build-common b/scripts/auto-build/auto-build-common index fe05b017..0e413755 100644 --- a/scripts/auto-build/auto-build-common +++ b/scripts/auto-build/auto-build-common @@ -163,7 +163,13 @@ make_source_tarball() { rootdir=$1 tarballname=$2 + debian_tarballname=`echo $2 | sed 's|\.tar\.|.debian.tar.|'` - tar --directory $rootdir/.. --exclude-vcs --exclude=$tarballname \ + # make source tarball without debian/ + tar --directory $rootdir/.. \ + --exclude-vcs --exclude=$tarballname --exclude=debian \ -cjpf /tmp/$tarballname $(basename $1) + # make separate tarball of debian/ + tar --directory $rootdir --exclude-vcs \ + -cjpf /tmp/$debian_tarballname $(basename $1) } diff --git a/scripts/auto-build/pd-extended-source-tarball.sh b/scripts/auto-build/pd-extended-source-tarball.sh index 89a83f84..9a557bd6 100755 --- a/scripts/auto-build/pd-extended-source-tarball.sh +++ b/scripts/auto-build/pd-extended-source-tarball.sh @@ -17,11 +17,16 @@ $SCRIPT_DIR/pd-extended-auto-builder.sh source-tarball-only # the version is set by the above script, so keep this after version=$(get_pd_version $auto_build_root_dir) -archive=$(ls -1 /tmp/Pd-extended*$version*-source.tar.bz2 | tail -1) -upload_filename=$(basename $archive) -rsync -a --chmod=a+r ${archive} rsync://blinky.at.or.at/upload/${DATE}/${upload_filename} && \ - md5sum ${archive} > ${archive}.md5 && \ - rsync -a ${archive}.md5 rsync://blinky.at.or.at/upload/${DATE}/${upload_filename}.md5 && \ - rm $archive && rm $archive.md5 && \ +source=`ls -1 /tmp/Pd-extended*$version*-source.tar.bz2 | tail -1` +debian=`ls -1 /tmp/Pd-extended*$version*.debian.tar.bz2 | tail -1` +upload_filename=$(basename $source) +rsync -a --chmod=a+r ${source} rsync://blinky.at.or.at/upload/${DATE}/${upload_filename} && \ + md5sum ${source} > ${source}.md5 && \ + rsync -a ${source}.md5 rsync://blinky.at.or.at/upload/${DATE}/${upload_filename}.md5 && \ + rsync -a --chmod=a+r ${debian} rsync://blinky.at.or.at/upload/${DATE}/${upload_filename} && \ + md5sum ${debian} > ${debian}.md5 && \ + rsync -a ${debian}.md5 rsync://blinky.at.or.at/upload/${DATE}/${upload_filename}.md5 && \ + rm $source && rm $source.md5 && \ + rm $debian && rm $debian.md5 && \ echo "successfully uploaded: ${upload_filename}" && \ echo SUCCESS |