summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2007-09-02 20:53:15 +0000
committerBill Meier <wmeier@newsguy.com>2007-09-02 20:53:15 +0000
commitc2d927e6a2eb1ee883c5ce639e9b857c1e49da98 (patch)
treee9930353ea80c7d9742bbba40fad91ffc5cbd53e /tools
parent0e09d21936e8a96433dda2d6f670487c65a085a3 (diff)
downloadwireshark-c2d927e6a2eb1ee883c5ce639e9b857c1e49da98.tar.gz
Verify existence of required downloaded library packages during make after Makefile.nmake updated
svn path=/trunk/; revision=22769
Diffstat (limited to 'tools')
-rwxr-xr-xtools/win32-setup.sh15
1 files changed, 14 insertions, 1 deletions
diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh
index 5862664ee3..3d8e27a358 100755
--- a/tools/win32-setup.sh
+++ b/tools/win32-setup.sh
@@ -21,7 +21,8 @@ err_exit () {
usage () {
echo "Usage:"
echo " $0 --appverify <appname> [<appname>] ..."
- echo " $0 --download <destination> <subdirectory> <package>"
+ echo " $0 --libverify <destination> <subdirectory> <package>"
+ echo " $0 --download <destination> <subdirectory> <package>"
echo ""
exit 1
}
@@ -49,6 +50,17 @@ case "$1" in
echo " $APP: $APP_LOC $res"
done
;;
+--libverify)
+ if [ -z "$2" -o -z "$3" -o -z "$4" ] ; then
+ usage
+ fi
+ DEST_PATH=`cygpath --dos "$2"`
+ PACKAGE_PATH=$4
+ PACKAGE=`basename "$PACKAGE_PATH"`
+ if [ ! -e $DEST_PATH/$PACKAGE ] ; then
+ err_exit "Package $PACKAGE is needed but is apparently not downloaded; 'make setup' required ?"
+ fi
+ ;;
--download)
if [ -z "$2" -o -z "$3" -o -z "$4" ] ; then
usage
@@ -57,6 +69,7 @@ case "$1" in
DEST_SUBDIR=$3
PACKAGE_PATH=$4
PACKAGE=`basename "$PACKAGE_PATH"`
+ echo ""
echo "****** $PACKAGE ******"
if [ -z "$http_proxy" -a -z "$HTTP_PROXY" ] ; then
echo "No HTTP proxy specified (http_proxy and HTTP_PROXY are empty)."