summaryrefslogtreecommitdiff
path: root/test/windows
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2012-06-15 16:29:24 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2012-06-15 16:29:24 +0200
commite65fe5eb90a90edc2ea25f892b7d384713216c8d (patch)
treefb59b2ec2c720a950403a7f38798d9892733144c /test/windows
parentca9b354dec28a4f419f5b6ba972f900f9964e569 (diff)
Add support for packages with different minor versions on Windows
Diffstat (limited to 'test/windows')
-rwxr-xr-xtest/windows/odb/unpack49
1 files changed, 25 insertions, 24 deletions
diff --git a/test/windows/odb/unpack b/test/windows/odb/unpack
index d3a37d6..82d53e7 100755
--- a/test/windows/odb/unpack
+++ b/test/windows/odb/unpack
@@ -38,52 +38,53 @@ rm -rf libodb libodb-mssql libodb-oracle libodb-pgsql libodb-sqlite \
libodb-mysql libodb-boost libodb-qt odb odb-tests odb-examples \
odb-tests-* odb-examples-*
-v=`echo $base/libodb-?.*.zip | sed -e "s%$base/libodb-\(.*\).zip%\1%"`
+v=`echo $base/odb-*-*-*.zip | sed -e "s%$base/odb-\([^-]*\).*.zip%\1%"`
+mv=`echo $v | sed -e 's%\([0-9]*\.[0-9]*\).*%\1%'`
-echo unpacking $v from $base
+echo unpacking $mv from $base
-unzip -q $base/libodb-$v.zip
-mv libodb-$v libodb
+unzip -q $base/libodb-$mv.*.zip
+mv libodb-$mv.*/ libodb
-unzip -q $base/libodb-mssql-$v.zip
-mv libodb-mssql-$v libodb-mssql
+unzip -q $base/libodb-mssql-$mv.*.zip
+mv libodb-mssql-$mv.*/ libodb-mssql
-unzip -q $base/libodb-oracle-$v.zip
-mv libodb-oracle-$v libodb-oracle
+unzip -q $base/libodb-oracle-$mv.*.zip
+mv libodb-oracle-$mv.*/ libodb-oracle
-unzip -q $base/libodb-pgsql-$v.zip
-mv libodb-pgsql-$v libodb-pgsql
+unzip -q $base/libodb-pgsql-$mv.*.zip
+mv libodb-pgsql-$mv.*/ libodb-pgsql
-unzip -q $base/libodb-sqlite-$v.zip
-mv libodb-sqlite-$v libodb-sqlite
+unzip -q $base/libodb-sqlite-$mv.*.zip
+mv libodb-sqlite-$mv.*/ libodb-sqlite
-unzip -q $base/libodb-mysql-$v.zip
-mv libodb-mysql-$v libodb-mysql
+unzip -q $base/libodb-mysql-$mv.*.zip
+mv libodb-mysql-$mv.*/ libodb-mysql
-unzip -q $base/libodb-boost-$v.zip
-mv libodb-boost-$v libodb-boost
+unzip -q $base/libodb-boost-$mv.*.zip
+mv libodb-boost-$mv.*/ libodb-boost
-unzip -q $base/libodb-qt-$v.zip
-mv libodb-qt-$v libodb-qt
+unzip -q $base/libodb-qt-$mv.*.zip
+mv libodb-qt-$mv.*/ libodb-qt
-unzip -q $base/odb-tests-$v.zip
+unzip -q $base/odb-tests-$mv.*.zip
if [ $mingw = n ]; then
for d in $databases; do
- cp -r odb-tests-$v odb-tests-$d
+ cp -r odb-tests-$mv.*/ odb-tests-$d
done
rm -r odb-tests-$v
else
- mv odb-tests-$v odb-tests
+ mv odb-tests-$mv.*/ odb-tests
fi
-unzip -q $base/odb-examples-$v.zip
+unzip -q $base/odb-examples-$mv.*.zip
if [ $mingw = n ]; then
for d in $databases; do
- cp -r odb-examples-$v odb-examples-$d
+ cp -r odb-examples-$mv.*/ odb-examples-$d
done
rm -r odb-examples-$v
else
- mv odb-examples-$v odb-examples
+ mv odb-examples-$mv.*/ odb-examples
fi
if [ $mingw = n ]; then