< prev index next >
common/bin/compare.sh
Print this page
@@ -980,11 +980,11 @@
if [ "$(uname -o)" = "Cygwin" ]; then
COMPARE_ROOT=$(cygpath -msa $COMPARE_ROOT)
fi
fi
-THIS="$( cd "$( dirname "$0" )" && pwd )"
+THIS="$( cd "$( dirname "$0" )" > /dev/null && pwd )"
echo "$THIS"
THIS_SCRIPT="$0"
if [ -z "$1" ] || [ "$1" = "-h" ] || [ "$1" = "-?" ] || [ "$1" = "/h" ] || [ "$1" = "/?" ] || [ "$1" = "-help" ] || [ "$1" = "--help" ]; then
echo "bash ./compare.sh [OPTIONS] [FILTER]"
@@ -1070,12 +1070,12 @@
;;
-execs)
CMP_EXECS=true
;;
-2dirs)
- THIS="$(cd "$2" && pwd )"
- OTHER="$(cd "$3" && pwd )"
+ THIS="$(cd "$2" > /dev/null && pwd )"
+ OTHER="$(cd "$3" > /dev/null && pwd )"
THIS_BASE_DIR="$THIS"
OTHER_BASE_DIR="$OTHER"
SKIP_DEFAULT=true
shift
shift
@@ -1112,25 +1112,25 @@
shift
done
if [ "$CMP_2_ZIPS" = "true" ]; then
THIS_DIR="$(dirname $THIS_FILE)"
- THIS_DIR="$(cd "$THIS_DIR" && pwd )"
+ THIS_DIR="$(cd "$THIS_DIR" > /dev/null && pwd )"
OTHER_DIR="$(dirname $OTHER_FILE)"
- OTHER_DIR="$(cd "$OTHER_DIR" && pwd )"
+ OTHER_DIR="$(cd "$OTHER_DIR" > /dev/null && pwd )"
THIS_FILE_NAME="$(basename $THIS_FILE)"
OTHER_FILE_NAME="$(basename $OTHER_FILE)"
echo Comparing $THIS_DIR/$THIS_FILE_NAME and $OTHER_DIR/$OTHER_FILE_NAME
compare_zip_file $THIS_DIR $OTHER_DIR $COMPARE_ROOT/2zips $THIS_FILE_NAME $OTHER_FILE_NAME
exit
fi
if [ "$CMP_2_BINS" = "true" ]; then
THIS_DIR="$(dirname $THIS_FILE)"
- THIS_DIR="$(cd "$THIS_DIR" && pwd )"
+ THIS_DIR="$(cd "$THIS_DIR" > /dev/null && pwd )"
OTHER_DIR="$(dirname $OTHER_FILE)"
- OTHER_DIR="$(cd "$OTHER_DIR" && pwd )"
+ OTHER_DIR="$(cd "$OTHER_DIR" > /dev/null && pwd )"
THIS_FILE_NAME="$(basename $THIS_FILE)"
OTHER_FILE_NAME="$(basename $OTHER_FILE)"
echo Comparing $THIS_DIR/$THIS_FILE_NAME and $OTHER_DIR/$OTHER_FILE_NAME
compare_bin_file $THIS_DIR $OTHER_DIR $COMPARE_ROOT/2bins $THIS_FILE_NAME $OTHER_FILE_NAME
exit
@@ -1159,11 +1159,11 @@
if [ ! -d "$OTHER" ]; then
echo "Other build directory does not exist:"
echo "$OTHER"
exit 1
fi
- OTHER="$( cd "$OTHER" && pwd )"
+ OTHER="$( cd "$OTHER" > /dev/null && pwd )"
echo "Comparing to:"
echo "$OTHER"
echo
fi
@@ -1173,10 +1173,28 @@
THIS_J2SDK="$THIS/install/jdk"
THIS_J2RE="$THIS/install/jre"
OTHER_J2SDK="$OTHER/install/jdk"
OTHER_J2RE="$OTHER/install/jre"
echo "Selecting install images for compare"
+ elif [ -d "$THIS/deploy/images/jdk" ] && [ -d "$OTHER/deploy/images/jdk" ]; then
+ THIS_J2SDK="$THIS/deploy/images/jdk"
+ THIS_J2RE="$THIS/deploy/images/jre"
+ OTHER_J2SDK="$OTHER/deploy/images/jdk"
+ OTHER_J2RE="$OTHER/deploy/images/jre"
+ echo "Selecting deploy images for compare"
+ elif [ -d "$THIS/deploy/images/jdk" ] && [ -d "$OTHER/deploy/jdk" ]; then
+ THIS_J2SDK="$THIS/deploy/images/jdk"
+ THIS_J2RE="$THIS/deploy/images/jre"
+ OTHER_J2SDK="$OTHER/deploy/jdk"
+ OTHER_J2RE="$OTHER/deploy/jre"
+ echo "Selecting deploy images for compare"
+ elif [ -d "$THIS/deploy/jdk" ] && [ -d "$OTHER/deploy/images/jdk" ]; then
+ THIS_J2SDK="$THIS/deploy/jdk"
+ THIS_J2RE="$THIS/deploy/jre"
+ OTHER_J2SDK="$OTHER/deploy/images/jdk"
+ OTHER_J2RE="$OTHER/deploy/images/jre"
+ echo "Selecting deploy images for compare"
elif [ -d "$THIS/deploy/jdk" ] && [ -d "$OTHER/deploy/jdk" ]; then
THIS_J2SDK="$THIS/deploy/jdk"
THIS_J2RE="$THIS/deploy/jre"
OTHER_J2SDK="$OTHER/deploy/jdk"
OTHER_J2RE="$OTHER/deploy/jre"
@@ -1190,27 +1208,76 @@
else
echo "No common images found."
exit 1
fi
- if [ -d "$THIS/images/jdk-bundle" ] && [ -d "$OTHER/images/jdk-bundle" ]; then
+ if [ -d "$THIS/deploy/images/jdk-bundle" ] && [ -d "$OTHER/deploy/images/jdk-bundle" ]; then
+ THIS_J2SDK_BUNDLE="$THIS/deploy/images/jdk-bundle"
+ THIS_J2RE_BUNDLE="$THIS/deploy/images/jre-bundle"
+ OTHER_J2SDK_BUNDLE="$OTHER/deploy/images/jdk-bundle"
+ OTHER_J2RE_BUNDLE="$OTHER/deploy/images/jre-bundle"
+ echo "Also comparing deploy macosx bundles"
+ elif [ -d "$THIS/deploy/images/jdk-bundle" ] && [ -d "$OTHER/deploy/jdk-bundle" ]; then
+ THIS_J2SDK_BUNDLE="$THIS/deploy/images/jdk-bundle"
+ THIS_J2RE_BUNDLE="$THIS/deploy/images/jre-bundle"
+ OTHER_J2SDK_BUNDLE="$OTHER/deploy/jdk-bundle"
+ OTHER_J2RE_BUNDLE="$OTHER/deploy/jre-bundle"
+ echo "Also comparing deploy macosx bundles"
+ elif [ -d "$THIS/deploy/jdk-bundle" ] && [ -d "$OTHER/deploy/images/jdk-bundle" ]; then
+ THIS_J2SDK_BUNDLE="$THIS/deploy/jdk-bundle"
+ THIS_J2RE_BUNDLE="$THIS/deploy/jre-bundle"
+ OTHER_J2SDK_BUNDLE="$OTHER/deploy/images/jdk-bundle"
+ OTHER_J2RE_BUNDLE="$OTHER/deploy/images/jre-bundle"
+ echo "Also comparing deploy macosx bundles"
+ elif [ -d "$THIS/deploy/jdk-bundle" ] && [ -d "$OTHER/deploy/jdk-bundle" ]; then
+ THIS_J2SDK_BUNDLE="$THIS/deploy/jdk-bundle"
+ THIS_J2RE_BUNDLE="$THIS/deploy/jre-bundle"
+ OTHER_J2SDK_BUNDLE="$OTHER/deploy/jdk-bundle"
+ OTHER_J2RE_BUNDLE="$OTHER/deploy/jre-bundle"
+ echo "Also comparing deploy macosx bundles"
+ elif [ -d "$THIS/images/jdk-bundle" ] && [ -d "$OTHER/images/jdk-bundle" ]; then
THIS_J2SDK_BUNDLE="$THIS/images/jdk-bundle"
THIS_J2RE_BUNDLE="$THIS/images/jre-bundle"
OTHER_J2SDK_BUNDLE="$OTHER/images/jdk-bundle"
OTHER_J2RE_BUNDLE="$OTHER/images/jre-bundle"
- echo "Also comparing macosx bundles"
+ echo "Also comparing jdk macosx bundles"
fi
- if [ -d "$THIS/deploy" ] && [ -d "$OTHER/deploy" ]; then
- THIS_DEPLOY_BUNDLE_DIR="$THIS/deploy/dist/installer/bundles"
+ if [ -d "$THIS/deploy/images/bundles" ] && [ -d "$OTHER/deploy/images/bundles" ]; then
+ THIS_DEPLOY_BUNDLE_DIR="$THIS/deploy/images/bundles"
+ OTHER_DEPLOY_BUNDLE_DIR="$OTHER/deploy/images/bundles"
+ echo "Also comparing deploy javadoc bundles"
+ elif [ -d "$THIS/deploy/images/bundles" ] && [ -d "$OTHER/deploy/bundles" ]; then
+ THIS_DEPLOY_BUNDLE_DIR="$THIS/deploy/images/bundles"
OTHER_DEPLOY_BUNDLE_DIR="$OTHER/deploy/bundles"
- echo "Also comparing deploy/bundles"
- if [ "$OPENJDK_TARGET_OS" = "macosx" ]; then
+ echo "Also comparing deploy javadoc bundles"
+ elif [ -d "$THIS/deploy/bundles" ] && [ -d "$OTHER/deploy/images/bundles" ]; then
+ THIS_DEPLOY_BUNDLE_DIR="$THIS/deploy/bundles"
+ OTHER_DEPLOY_BUNDLE_DIR="$OTHER/deploy/images/bundles"
+ echo "Also comparing deploy javadoc bundles"
+ elif [ -d "$THIS/deploy/bundles" ] && [ -d "$OTHER/deploy/bundles" ]; then
+ THIS_DEPLOY_BUNDLE_DIR="$THIS/deploy/bundles"
+ OTHER_DEPLOY_BUNDLE_DIR="$OTHER/deploy/bundles"
+ echo "Also comparing deploy javadoc bundles"
+ fi
+
+ if [ -d "$THIS/deploy/images/JavaAppletPlugin.plugin" ] && [ -d "$OTHER/deploy/images/JavaAppletPlugin.plugin" ]; then
+ THIS_DEPLOY_APPLET_PLUGIN_DIR="$THIS/deploy/images/JavaAppletPlugin.plugin"
+ OTHER_DEPLOY_APPLET_PLUGIN_DIR="$OTHER/deploy/images/JavaAppletPlugin.plugin"
+ echo "Also comparing deploy applet image"
+ elif [ -d "$THIS/deploy/images/JavaAppletPlugin.plugin" ] && [ -d "$OTHER/deploy/JavaAppletPlugin.plugin" ]; then
+ THIS_DEPLOY_APPLET_PLUGIN_DIR="$THIS/deploy/images/JavaAppletPlugin.plugin"
+ OTHER_DEPLOY_APPLET_PLUGIN_DIR="$OTHER/deploy/JavaAppletPlugin.plugin"
+ echo "Also comparing deploy applet image"
+ elif [ -d "$THIS/deploy/JavaAppletPlugin.plugin" ] && [ -d "$OTHER/deploy/images/JavaAppletPlugin.plugin" ]; then
+ THIS_DEPLOY_APPLET_PLUGIN_DIR="$THIS/deploy/JavaAppletPlugin.plugin"
+ OTHER_DEPLOY_APPLET_PLUGIN_DIR="$OTHER/deploy/images/JavaAppletPlugin.plugin"
+ echo "Also comparing deploy applet image"
+ elif [ -d "$THIS/deploy/JavaAppletPlugin.plugin" ] && [ -d "$OTHER/deploy/JavaAppletPlugin.plugin" ]; then
THIS_DEPLOY_APPLET_PLUGIN_DIR="$THIS/deploy/JavaAppletPlugin.plugin"
OTHER_DEPLOY_APPLET_PLUGIN_DIR="$OTHER/deploy/JavaAppletPlugin.plugin"
- echo "Also comparing JavaAppletPlugin"
- fi
+ echo "Also comparing deploy applet image"
fi
if [ -d "$OTHER/images" ]; then
OTHER_SEC_DIR="$OTHER/images"
else
< prev index next >