summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xdist.sh63
1 files changed, 32 insertions, 31 deletions
diff --git a/dist.sh b/dist.sh
index b8af74b..445efbb 100755
--- a/dist.sh
+++ b/dist.sh
@@ -20,7 +20,8 @@ function error ()
wd=`pwd`
out_root=/tmp
src_root=$HOME/work/odb
-ver=`cat $src_root/odb/version`
+ver=`sed -e 's/^\(.*\)\.\(.*\)\..*$/\1.\2/' $src_root/odb/version`
+
test=n
rebuild=n
@@ -139,9 +140,9 @@ if [ $complete = y ]; then
cd $wd
- cp $out_root/odb/odb-$ver.zip $out_root/pack/
- cp $out_root/odb/odb-$ver.tar.gz $out_root/pack/
- cp $out_root/odb/odb-$ver.tar.bz2 $out_root/pack/
+ cp $out_root/odb/odb-$ver.*.zip $out_root/pack/
+ cp $out_root/odb/odb-$ver.*.tar.gz $out_root/pack/
+ cp $out_root/odb/odb-$ver.*.tar.bz2 $out_root/pack/
odb=$out_root/odb/odb/odb
fi
@@ -162,9 +163,9 @@ make dist
cd $wd
-cp $out_root/libodb/libodb-$ver.zip $out_root/pack/
-cp $out_root/libodb/libodb-$ver.tar.gz $out_root/pack/
-cp $out_root/libodb/libodb-$ver.tar.bz2 $out_root/pack/
+cp $out_root/libodb/libodb-$ver.*.zip $out_root/pack/
+cp $out_root/libodb/libodb-$ver.*.tar.gz $out_root/pack/
+cp $out_root/libodb/libodb-$ver.*.tar.bz2 $out_root/pack/
# Build libodb-pgsql
#
@@ -182,9 +183,9 @@ make dist
cd $wd
-cp $out_root/libodb-pgsql/libodb-pgsql-$ver.zip $out_root/pack/
-cp $out_root/libodb-pgsql/libodb-pgsql-$ver.tar.gz $out_root/pack/
-cp $out_root/libodb-pgsql/libodb-pgsql-$ver.tar.bz2 $out_root/pack/
+cp $out_root/libodb-pgsql/libodb-pgsql-$ver.*.zip $out_root/pack/
+cp $out_root/libodb-pgsql/libodb-pgsql-$ver.*.tar.gz $out_root/pack/
+cp $out_root/libodb-pgsql/libodb-pgsql-$ver.*.tar.bz2 $out_root/pack/
# Build libodb-sqlite
#
@@ -202,9 +203,9 @@ make dist
cd $wd
-cp $out_root/libodb-sqlite/libodb-sqlite-$ver.zip $out_root/pack/
-cp $out_root/libodb-sqlite/libodb-sqlite-$ver.tar.gz $out_root/pack/
-cp $out_root/libodb-sqlite/libodb-sqlite-$ver.tar.bz2 $out_root/pack/
+cp $out_root/libodb-sqlite/libodb-sqlite-$ver.*.zip $out_root/pack/
+cp $out_root/libodb-sqlite/libodb-sqlite-$ver.*.tar.gz $out_root/pack/
+cp $out_root/libodb-sqlite/libodb-sqlite-$ver.*.tar.bz2 $out_root/pack/
# Build libodb-mysql
#
@@ -222,9 +223,9 @@ make dist
cd $wd
-cp $out_root/libodb-mysql/libodb-mysql-$ver.zip $out_root/pack/
-cp $out_root/libodb-mysql/libodb-mysql-$ver.tar.gz $out_root/pack/
-cp $out_root/libodb-mysql/libodb-mysql-$ver.tar.bz2 $out_root/pack/
+cp $out_root/libodb-mysql/libodb-mysql-$ver.*.zip $out_root/pack/
+cp $out_root/libodb-mysql/libodb-mysql-$ver.*.tar.gz $out_root/pack/
+cp $out_root/libodb-mysql/libodb-mysql-$ver.*.tar.bz2 $out_root/pack/
# Build libodb-tracer
#
@@ -242,9 +243,9 @@ make dist
cd $wd
-cp $out_root/libodb-tracer/libodb-tracer-$ver.zip $out_root/pack/
-cp $out_root/libodb-tracer/libodb-tracer-$ver.tar.gz $out_root/pack/
-cp $out_root/libodb-tracer/libodb-tracer-$ver.tar.bz2 $out_root/pack/
+cp $out_root/libodb-tracer/libodb-tracer-$ver.*.zip $out_root/pack/
+cp $out_root/libodb-tracer/libodb-tracer-$ver.*.tar.gz $out_root/pack/
+cp $out_root/libodb-tracer/libodb-tracer-$ver.*.tar.bz2 $out_root/pack/
# Build libodb-boost
#
@@ -262,9 +263,9 @@ make dist
cd $wd
-cp $out_root/libodb-boost/libodb-boost-$ver.zip $out_root/pack/
-cp $out_root/libodb-boost/libodb-boost-$ver.tar.gz $out_root/pack/
-cp $out_root/libodb-boost/libodb-boost-$ver.tar.bz2 $out_root/pack/
+cp $out_root/libodb-boost/libodb-boost-$ver.*.zip $out_root/pack/
+cp $out_root/libodb-boost/libodb-boost-$ver.*.tar.gz $out_root/pack/
+cp $out_root/libodb-boost/libodb-boost-$ver.*.tar.bz2 $out_root/pack/
# Build libodb-qt
#
@@ -282,9 +283,9 @@ make dist
cd $wd
-cp $out_root/libodb-qt/libodb-qt-$ver.zip $out_root/pack/
-cp $out_root/libodb-qt/libodb-qt-$ver.tar.gz $out_root/pack/
-cp $out_root/libodb-qt/libodb-qt-$ver.tar.bz2 $out_root/pack/
+cp $out_root/libodb-qt/libodb-qt-$ver.*.zip $out_root/pack/
+cp $out_root/libodb-qt/libodb-qt-$ver.*.tar.gz $out_root/pack/
+cp $out_root/libodb-qt/libodb-qt-$ver.*.tar.bz2 $out_root/pack/
# Build odb-tests
#
@@ -330,9 +331,9 @@ ODB=$odb
cd $wd
done
-cp $out_root/odb-tests-$dist_tests/odb-tests-$ver.zip $out_root/pack/
-cp $out_root/odb-tests-$dist_tests/odb-tests-$ver.tar.gz $out_root/pack/
-cp $out_root/odb-tests-$dist_tests/odb-tests-$ver.tar.bz2 $out_root/pack/
+cp $out_root/odb-tests-$dist_tests/odb-tests-$ver.*.zip $out_root/pack/
+cp $out_root/odb-tests-$dist_tests/odb-tests-$ver.*.tar.gz $out_root/pack/
+cp $out_root/odb-tests-$dist_tests/odb-tests-$ver.*.tar.bz2 $out_root/pack/
# Build odb-examples
@@ -378,6 +379,6 @@ ODB=$odb
cd $wd
done
-cp $out_root/odb-examples-$dist_examples/odb-examples-$ver.zip $out_root/pack/
-cp $out_root/odb-examples-$dist_examples/odb-examples-$ver.tar.gz $out_root/pack/
-cp $out_root/odb-examples-$dist_examples/odb-examples-$ver.tar.bz2 $out_root/pack/
+cp $out_root/odb-examples-$dist_examples/odb-examples-$ver.*.zip $out_root/pack/
+cp $out_root/odb-examples-$dist_examples/odb-examples-$ver.*.tar.gz $out_root/pack/
+cp $out_root/odb-examples-$dist_examples/odb-examples-$ver.*.tar.bz2 $out_root/pack/