Fixed the version commiting logic - and moved it.
This commit is contained in:
@@ -27,10 +27,12 @@ then
|
||||
echo "Tarball already built. Not rebuilding."
|
||||
exit 0
|
||||
fi
|
||||
echo "$PROJECT $revno" '>>' "$RECORDFILE"
|
||||
cat "$RECORDFILE" | sort > "$RECORDFILE"
|
||||
( cd $VERSIONDIR ; bzr up ; bzr commit -m"Added $PROJECT $snapshotversion" )
|
||||
|
||||
python setup.py sdist
|
||||
tarball=$(echo dist/*.tar.gz)
|
||||
mv "$tarball" "dist/$(basename $tarball .tar.gz)${SEPARATOR}bzr${revno}.tar.gz"
|
||||
|
||||
echo "$PROJECT $revno" >> "$RECORDFILE"
|
||||
sort "$RECORDFILE" > "$RECORDFILE".tmp
|
||||
mv "$RECORDFILE".tmp "$RECORDFILE"
|
||||
( cd $VERSIONDIR ; bzr up ; bzr commit -m"Added $PROJECT $snapshotversion" )
|
||||
|
||||
@@ -64,7 +64,8 @@ do
|
||||
buildno=$(($buildno + 1))
|
||||
else
|
||||
echo "$PROJECT $pkgversion" >> "$PKGRECORDFILE"
|
||||
cat "$PKGRECORDFILE" | sort > "$PKGRECORDFILE"
|
||||
sort "$PKGRECORDFILE" > "$PKGRECORDFILE".tmp
|
||||
mv "$PKGRECORDFILE".tmp "$PKGRECORDFILE"
|
||||
( cd $VERSIONDIR ;
|
||||
bzr up ;
|
||||
bzr commit -m"Added $PROJECT $snapshotversion" )
|
||||
|
||||
@@ -106,9 +106,7 @@ fi
|
||||
|
||||
|
||||
snapshotversion=$(find_next_version)
|
||||
echo "$PROJECT $snapshotversion" >> "$RECORDFILE"
|
||||
cat "$RECORDFILE" | sort > "$RECORDFILE"
|
||||
( cd $VERSIONDIR ; bzr up ; bzr commit -m"Added $PROJECT $snapshotversion" )
|
||||
|
||||
|
||||
# Should be ~ if tarball version is the one we're working *toward*. (By far preferred!)
|
||||
# Should be + if tarball version is already released and we're moving forward after it.
|
||||
@@ -122,3 +120,8 @@ tarball=$(echo dist/*.tar.gz)
|
||||
|
||||
echo mv "$tarball" "dist/$(basename $tarball .tar.gz)${SEPARATOR}${snapshotversion}.tar.gz"
|
||||
mv "$tarball" "dist/$(basename $tarball .tar.gz)${SEPARATOR}${snapshotversion}.tar.gz"
|
||||
|
||||
echo "$PROJECT $revno" >> "$RECORDFILE"
|
||||
sort "$RECORDFILE" > "$RECORDFILE".tmp
|
||||
mv "$RECORDFILE".tmp "$RECORDFILE"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user