summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPete Batard <pbatard@gmail.com>2011-02-22 15:59:43 +0000
committerPete Batard <pbatard@gmail.com>2011-02-22 15:59:43 +0000
commit5e41ada56179598d8790ba98d6d0126aaf1c7de2 (patch)
tree7032dd530aab1214881ce546fabce78adb726992
parentad42c29145970d262fea026a736d0f7d0e89b4c8 (diff)
downloadlibusb-5e41ada56179598d8790ba98d6d0126aaf1c7de2.tar.gz
[internal] use pbk and offset 8000pbk330
-rw-r--r--_bump.sh10
-rw-r--r--configure.ac2
-rw-r--r--libusb/libusb_version.h2
3 files changed, 7 insertions, 7 deletions
diff --git a/_bump.sh b/_bump.sh
index 12c17d3..98eca43 100644
--- a/_bump.sh
+++ b/_bump.sh
@@ -14,8 +14,8 @@ if [ ! -n "$1" ]; then
else
TAG=$1
fi
-if [ ! ${TAG:0:3} = 'pbr' ]; then
- echo Tag "$TAG" does not start with 'pbr' - aborting
+if [ ! ${TAG:0:3} = 'pbk' ]; then
+ echo Tag "$TAG" does not start with 'pbk' - aborting
exit 1
fi
TAGVER=${TAG:3}
@@ -23,14 +23,14 @@ case $TAGVER in *[!0-9]*)
echo "$TAGVER is not a number"
exit 1
esac
-OFFSET=10000
+OFFSET=8000
TAGVER=`expr $TAGVER + 1`
TAGVER_OFF=`expr $TAGVER + $OFFSET`
-echo "Bumping version to pbr$TAGVER (nano: $TAGVER_OFF)"
+echo "Bumping version to pbk$TAGVER (nano: $TAGVER_OFF)"
sed -e "s/\(^m4_define(LIBUSB_NANO.*\)/m4_define(LIBUSB_NANO, [$TAGVER_OFF])/" configure.ac >> configure.ac~
mv configure.ac~ configure.ac
# we're duplicating libusb_version.h generation here, but that avoids having to run configure
sed -e "s/\(^#define LIBUSB_VERSION_NANO.*\)/#define LIBUSB_VERSION_NANO $TAGVER_OFF/" libusb/libusb_version.h > libusb/libusb_version.h~
mv libusb/libusb_version.h~ libusb/libusb_version.h
git commit -a -m "bumped internal version" -e
-git tag "pbr$TAGVER" \ No newline at end of file
+git tag "pbk$TAGVER" \ No newline at end of file
diff --git a/configure.ac b/configure.ac
index e1c6962..2134a93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
m4_define(LIBUSB_MAJOR, [1])
m4_define(LIBUSB_MINOR, [0])
m4_define(LIBUSB_MICRO, [8])
-m4_define(LIBUSB_NANO, [8329])
+m4_define(LIBUSB_NANO, [8330])
AC_INIT([libusb], LIBUSB_MAJOR.LIBUSB_MINOR.LIBUSB_MICRO, [libusb-devel@lists.sourceforge.net], [libusb], [http://www.libusb.org/])
diff --git a/libusb/libusb_version.h b/libusb/libusb_version.h
index f8bf69e..629022a 100644
--- a/libusb/libusb_version.h
+++ b/libusb/libusb_version.h
@@ -24,6 +24,6 @@
#define LIBUSB_VERSION_MAJOR 1
#define LIBUSB_VERSION_MINOR 0
#define LIBUSB_VERSION_MICRO 8
-#define LIBUSB_VERSION_NANO 8329
+#define LIBUSB_VERSION_NANO 8330
#endif