shebs 02/09/10 15:04:26
Modified: . csu-patch
maintainer-scripts import-prune local-summary local-untested
Log:
Add a -f option to local-summary to show file and line of local changes,
tweak local markers and the finding of them.
Revision Changes Path
1.3 +1 -1 gcc3/csu-patch
Index: csu-patch
===================================================================
RCS file: /cvs/Darwin/gcc3/csu-patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- csu-patch 2002/04/21 18:00:23 1.2
+++ csu-patch 2002/09/10 22:04:25 1.3
@@ -1,4 +1,4 @@
-APPLE LOCAL file
+APPLE LOCAL file C++ EH
diff -u Csu-37-orig/crt.c Csu-37/crt.c
--- Csu-37-orig/crt.c Thu Jun 28 08:55:59 2001
+++ Csu-37/crt.c Fri Jan 4 09:40:36 2002
1.2 +1 -1 gcc3/maintainer-scripts/import-prune
Index: import-prune
===================================================================
RCS file: /cvs/Darwin/gcc3/maintainer-scripts/import-prune,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import-prune 2002/09/03 15:24:28 1.1
+++ import-prune 2002/09/10 22:04:26 1.2
@@ -10,7 +10,7 @@
| sed -e 's,\./,,g' > /tmp/prunes
for fname in `cat /tmp/prunes`; do
- if head -3 $fname |grep -q 'APPLE LOCAL' || test -d $fname; then :
+ if head -3 $fname |grep -q 'APPLE *LOCAL' || test -d $fname; then :
echo "# keeping $fname"
else
echo "rm $fname; cvs remove $fname"
1.2 +13 -3 gcc3/maintainer-scripts/local-summary
Index: local-summary
===================================================================
RCS file: /cvs/Darwin/gcc3/maintainer-scripts/local-summary,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- local-summary 2002/09/03 15:24:28 1.1
+++ local-summary 2002/09/10 22:04:26 1.2
@@ -3,6 +3,7 @@
root="."
uniq_options=""
+show_file=no
while :
do
@@ -17,19 +18,28 @@
-c)
uniq_options="-c"
;;
+ -f)
+ show_file=yes
+ ;;
*)
root=$option
;;
esac
done
+
+if [ $show_file == no ]; then
+ grep 'APPLE[^_]LOCAL' -r $root | sed -e 's/.*APPLE/APPLE/' >/tmp/rawlocals
+else
+ grep -n 'APPLE[^_]LOCAL' -r $root | sed -e 's/\(.*:[0-9]*:\).*APPLE/\1 APPLE/'
>/tmp/rawlocals
+fi
-grep 'APPLE[^_]LOCAL' -r $root | \
- sed -e 's/.*APPLE/APPLE/' \
+sed < /tmp/rawlocals \
-e 's/LOCAL[: ] /LOCAL /' \
-e 's/LOCAL *begin/LOCAL/' \
-e '/LOCAL *end/d' \
+ -e '/APPLE LOCAL"/d' \
-e 's/LOCAL *file/LOCAL/' \
- -e 's/APPLE LOCAL[ ]*//' \
+ -e 's/APPLE[ ]LOCAL[ ]*//' \
-e 's,\*/.*$,,g' \
-e 's/ dpatel//' \
-e 's/ ff//' \
1.2 +2 -2 gcc3/maintainer-scripts/local-untested
Index: local-untested
===================================================================
RCS file: /cvs/Darwin/gcc3/maintainer-scripts/local-untested,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- local-untested 2002/09/03 15:24:28 1.1
+++ local-untested 2002/09/10 22:04:26 1.2
@@ -2,8 +2,8 @@
# APPLE LOCAL file maintenance
# Use from the toplevel directory.
-local-summary gcc >/tmp/locals1
-local-summary gcc/testsuite >/tmp/locals2
+maintainer-scripts/local-summary gcc >/tmp/locals1
+maintainer-scripts/local-summary gcc/testsuite >/tmp/locals2
diff -u /tmp/locals1 /tmp/locals2 | grep '^-' | sed -e 's/^-//'
