97 # For example a method parameter randomly named "thePoint" or "aPoint". Ignore this.
98 if test "x$SUFFIX" = "xclass"; then
99 # To improve performance when large diffs are found, do a rough filtering of classes
100 # elibeble for these exceptions
101 if $GREP -R -e '[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}' \
102 -e '[0-9]\{2\}/[0-9]\{2\}/[0-9]\{4\}' \
103 -e thePoint -e aPoint -e setItemsPtr ${THIS_FILE} > /dev/null; then
104 $JAVAP -c -constants -l -p ${OTHER_FILE} > ${OTHER_FILE}.javap
105 $JAVAP -c -constants -l -p ${THIS_FILE} > ${THIS_FILE}.javap
106 TMP=$($DIFF ${OTHER_FILE}.javap ${THIS_FILE}.javap | \
107 $GREP '^[<>]' | \
108 $SED -e '/[<>].*[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}.*/d' \
109 -e '/[0-9]\{2\}\/[0-9]\{2\}\/[0-9]\{4\}/d' \
110 -e '/[<>].*Point Lcom\/apple\/jobjc\/foundation\/NSPoint;/d' \
111 -e '/[<>].*public com\.apple\.jobjc\.Pointer<com\.apple\.jobjc\..*itemsPtr();/d' \
112 -e '/[<>].*public void setItemsPtr(com\.apple\.jobjc\.Pointer<com\.apple\.jobjc\..*);/d')
113 fi
114 fi
115 if test "x$SUFFIX" = "xproperties"; then
116 # Run through nawk to add possibly missing newline at end of file.
117 $CAT $OTHER_FILE | $NAWK '{ print }' > $OTHER_FILE.cleaned
118 # Disable this exception since we aren't changing the properties cleaning method yet.
119 # $CAT $OTHER_FILE | $SED -e 's/\([^\\]\):/\1\\:/g' -e 's/\([^\\]\)=/\1\\=/g' -e 's/#.*/#/g' \
120 # | $SED -f "$SRC_ROOT/common/makefiles/support/unicode2x.sed" \
121 # | $SED -e '/^#/d' -e '/^$/d' \
122 # -e :a -e '/\\$/N; s/\\\n//; ta' \
123 # -e 's/^[ \t]*//;s/[ \t]*$//' \
124 # -e 's/\\=/=/' | LC_ALL=C $SORT > $OTHER_FILE.cleaned
125 TMP=$(LC_ALL=C $DIFF $OTHER_FILE.cleaned $THIS_FILE)
126 fi
127 if test -n "$TMP"; then
128 echo Files $OTHER_FILE and $THIS_FILE differ
129 return 1
130 fi
131
132 return 0
133 }
134
135 ##########################################################################################
136 # Compare directory structure
137
|
97 # For example a method parameter randomly named "thePoint" or "aPoint". Ignore this.
98 if test "x$SUFFIX" = "xclass"; then
99 # To improve performance when large diffs are found, do a rough filtering of classes
100 # elibeble for these exceptions
101 if $GREP -R -e '[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}' \
102 -e '[0-9]\{2\}/[0-9]\{2\}/[0-9]\{4\}' \
103 -e thePoint -e aPoint -e setItemsPtr ${THIS_FILE} > /dev/null; then
104 $JAVAP -c -constants -l -p ${OTHER_FILE} > ${OTHER_FILE}.javap
105 $JAVAP -c -constants -l -p ${THIS_FILE} > ${THIS_FILE}.javap
106 TMP=$($DIFF ${OTHER_FILE}.javap ${THIS_FILE}.javap | \
107 $GREP '^[<>]' | \
108 $SED -e '/[<>].*[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}.*/d' \
109 -e '/[0-9]\{2\}\/[0-9]\{2\}\/[0-9]\{4\}/d' \
110 -e '/[<>].*Point Lcom\/apple\/jobjc\/foundation\/NSPoint;/d' \
111 -e '/[<>].*public com\.apple\.jobjc\.Pointer<com\.apple\.jobjc\..*itemsPtr();/d' \
112 -e '/[<>].*public void setItemsPtr(com\.apple\.jobjc\.Pointer<com\.apple\.jobjc\..*);/d')
113 fi
114 fi
115 if test "x$SUFFIX" = "xproperties"; then
116 # Run through nawk to add possibly missing newline at end of file.
117 $CAT $OTHER_FILE | $NAWK '{ print }' | LC_ALL=C $SORT > $OTHER_FILE.cleaned
118 # Disable this exception since we aren't changing the properties cleaning method yet.
119 # $CAT $OTHER_FILE | $SED -e 's/\([^\\]\):/\1\\:/g' -e 's/\([^\\]\)=/\1\\=/g' -e 's/#.*/#/g' \
120 # | $SED -f "$SRC_ROOT/common/makefiles/support/unicode2x.sed" \
121 # | $SED -e '/^#/d' -e '/^$/d' \
122 # -e :a -e '/\\$/N; s/\\\n//; ta' \
123 # -e 's/^[ \t]*//;s/[ \t]*$//' \
124 # -e 's/\\=/=/' | LC_ALL=C $SORT > $OTHER_FILE.cleaned
125 TMP=$(LC_ALL=C $DIFF $OTHER_FILE.cleaned $THIS_FILE)
126 fi
127 if test -n "$TMP"; then
128 echo Files $OTHER_FILE and $THIS_FILE differ
129 return 1
130 fi
131
132 return 0
133 }
134
135 ##########################################################################################
136 # Compare directory structure
137
|