equal
deleted
inserted
replaced
67 export TEE="@TEE@" |
67 export TEE="@TEE@" |
68 export UNIQ="@UNIQ@" |
68 export UNIQ="@UNIQ@" |
69 export UNPACK200="@FIXPATH@ @BOOT_JDK@/bin/unpack200" |
69 export UNPACK200="@FIXPATH@ @BOOT_JDK@/bin/unpack200" |
70 export UNARCHIVE="@UNZIP@ -q -o" |
70 export UNARCHIVE="@UNZIP@ -q -o" |
71 |
71 |
72 export SRC_ROOT="@TOPDIR@" |
72 export TOPDIR="@TOPDIR@" |
73 export OUTPUT_ROOT="@OUTPUT_ROOT@" |
73 export OUTPUT_ROOT="@OUTPUT_ROOT@" |
74 |
74 |
75 if [ "@COMPILE_TYPE@" != "cross" ]; then |
75 if [ "@COMPILE_TYPE@" != "cross" ]; then |
76 export JAVAP="@FIXPATH@ $OUTPUT_ROOT/jdk/bin/javap @JAVA_TOOL_FLAGS_SMALL@" |
76 export JAVAP="@FIXPATH@ $OUTPUT_ROOT/jdk/bin/javap @JAVA_TOOL_FLAGS_SMALL@" |
77 export JIMAGE="@FIXPATH@ $OUTPUT_ROOT/jdk/bin/jimage" |
77 export JIMAGE="@FIXPATH@ $OUTPUT_ROOT/jdk/bin/jimage" |
86 if [ "$OPENJDK_TARGET_OS" = "windows" ]; then |
86 if [ "$OPENJDK_TARGET_OS" = "windows" ]; then |
87 export PATH="@VS_PATH@" |
87 export PATH="@VS_PATH@" |
88 fi |
88 fi |
89 |
89 |
90 # Now locate the main script and run it. |
90 # Now locate the main script and run it. |
91 REAL_COMPARE_SCRIPT="$SRC_ROOT/make/scripts/compare.sh" |
91 REAL_COMPARE_SCRIPT="$TOPDIR/make/scripts/compare.sh" |
92 if [ ! -e "$REAL_COMPARE_SCRIPT" ]; then |
92 if [ ! -e "$REAL_COMPARE_SCRIPT" ]; then |
93 echo "Error: Cannot locate compare script, it should have been in $REAL_COMPARE_SCRIPT" |
93 echo "Error: Cannot locate compare script, it should have been in $REAL_COMPARE_SCRIPT" |
94 exit 1 |
94 exit 1 |
95 fi |
95 fi |
96 |
96 |
98 $RM $OUTPUT_ROOT/compare.log.old 2> /dev/null |
98 $RM $OUTPUT_ROOT/compare.log.old 2> /dev/null |
99 $MV $OUTPUT_ROOT/compare.log $OUTPUT_ROOT/compare.log.old 2> /dev/null |
99 $MV $OUTPUT_ROOT/compare.log $OUTPUT_ROOT/compare.log.old 2> /dev/null |
100 |
100 |
101 export SCRIPT_DIR="$( cd "$( dirname "$0" )" > /dev/null && pwd )" |
101 export SCRIPT_DIR="$( cd "$( dirname "$0" )" > /dev/null && pwd )" |
102 |
102 |
103 $BASH $SRC_ROOT/make/scripts/logger.sh $OUTPUT_ROOT/compare.log $BASH "$REAL_COMPARE_SCRIPT" "$@" |
103 $BASH $TOPDIR/make/scripts/logger.sh $OUTPUT_ROOT/compare.log $BASH "$REAL_COMPARE_SCRIPT" "$@" |