projects
/
uffi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r2153: *** empty log message ***
[uffi.git]
/
make-upstream.sh
diff --git
a/make-upstream.sh
b/make-upstream.sh
index 90a553bc8b04eea9cb84762dab4144394a663975..d9454917f6ce07ab53b9fb38e7a0f4a44c81a0ff 100755
(executable)
--- a/
make-upstream.sh
+++ b/
make-upstream.sh
@@
-12,17
+12,23
@@
usage () {
Usage: $progname [options]
Creates upstream archives
Options:
Usage: $progname [options]
Creates upstream archives
Options:
+ -c Commit and tag CVS tree with current version numbers
-t Tag CVS tree with current version numbers
-t Tag CVS tree with current version numbers
+ -f Force creation of upstream archive, even if exists'
-h Print this brief help
EOF
}
-h Print this brief help
EOF
}
+opt_force=0
+
# Command line
while [ $# != 0 ]; do
value="`echo x\"$1\" | sed -e 's/^x-.//'`"
case "$1" in
-h) usage; exit 0 ;;
# Command line
while [ $# != 0 ]; do
value="`echo x\"$1\" | sed -e 's/^x-.//'`"
case "$1" in
-h) usage; exit 0 ;;
+ -c) opt_commit=1; opt_tag=1 ;;
-t) opt_tag=1 ;;
-t) opt_tag=1 ;;
+ -f) opt_force=1 ;;
*) usage; exit 0 ;;
esac
shift
*) usage; exit 0 ;;
esac
shift
@@
-38,6
+44,14
@@
PACKAGE_DIR=/usr/local/src/Packages/${DEBPKG}
DISTDIR=${PKG}-${VERSION}
DEBDIR=${DEBPKG}-${VERSION}
DISTDIR=${PKG}-${VERSION}
DEBDIR=${DEBPKG}-${VERSION}
+if [ ! -z ${opt_tag} ]; then
+ UPSTREAM_TAG=upstream_version_`echo ${VERSION} | tr . _`
+ echo "(Re-)tagging with Upstream tag '${UPSTREAM_TAG}'"
+ cvs -q rtag -d $UPSTREAM_TAG $PKG > /dev/null
+ cvs -q tag -F $UPSTREAM_TAG > /dev/null
+
+fi
+
if [ -f ${PACKAGE_DIR}/${DEBPKG}_${VERSION}.orig.tar.gz ]; then
echo "File ${PACKAGE_DIR}/${DEBPKG}_${VERSION}.orig.tar.gz already exists."
echo -n "Are you sure that you want to create a new upstream archive? (y/N): "
if [ -f ${PACKAGE_DIR}/${DEBPKG}_${VERSION}.orig.tar.gz ]; then
echo "File ${PACKAGE_DIR}/${DEBPKG}_${VERSION}.orig.tar.gz already exists."
echo -n "Are you sure that you want to create a new upstream archive? (y/N): "
@@
-50,13
+64,6
@@
if [ -f ${PACKAGE_DIR}/${DEBPKG}_${VERSION}.orig.tar.gz ]; then
esac
fi
esac
fi
-if [ ! -z ${opt_tag} ]; then
- UPSTREAM_TAG=upstream_version_`echo ${VERSION} | tr . _`
- echo "(Re-)tagging with Upstream tag '${UPSTREAM_TAG}'"
- cvs -q rtag -d $UPSTREAM_TAG $PKG > /dev/null
- cvs -q tag -F $UPSTREAM_TAG > /dev/null
-
-fi
# Prepare for archive
cd ..
rm -f ${PKG}_${VERSION}.tar.gz ${DEBPKG}_${VERSION}.orig.tar.gz
# Prepare for archive
cd ..
rm -f ${PKG}_${VERSION}.tar.gz ${DEBPKG}_${VERSION}.orig.tar.gz