Changeset 557 for draft-ietf-httpbis

Timestamp:

12/03/09 00:07:29 (12 years ago)

Author:

fielding@…

Message:

change to a real script that takes the old and new directories as args

File:

• draft-ietf-httpbis/diffs/dodiff (modified) (1 diff)

draft-ietf-httpbis/diffs/dodiff

@@ -1 @@
-# rfcdiff ../orig/rfc2616.txt ../orig/rfc2616-symrefs.txt
+#!/usr/bin/perl
 #
-# rfcdiff ../orig/rfc2616-symrefs.txt ../00/draft-ietf-httpbis-p1-messaging-00.txt
-# rfcdiff ../orig/rfc2616-symrefs.txt ../00/draft-ietf-httpbis-p2-semantics-00.txt
-# rfcdiff ../orig/rfc2616-symrefs.txt ../00/draft-ietf-httpbis-p3-payload-00.txt
-# rfcdiff ../orig/rfc2616-symrefs.txt ../00/draft-ietf-httpbis-p4-conditional-00.txt
-# rfcdiff ../orig/rfc2616-symrefs.txt ../00/draft-ietf-httpbis-p5-range-00.txt
-# rfcdiff ../orig/rfc2616-symrefs.txt ../00/draft-ietf-httpbis-p6-cache-00.txt
-# rfcdiff ../orig/rfc2616-symrefs.txt ../00/draft-ietf-httpbis-p7-auth-00.txt
-#
-# rfcdiff ../00/draft-ietf-httpbis-p1-messaging-00.txt ../01/draft-ietf-httpbis-p1-messaging-01.txt
-# rfcdiff ../00/draft-ietf-httpbis-p2-semantics-00.txt ../01/draft-ietf-httpbis-p2-semantics-01.txt
-# rfcdiff ../00/draft-ietf-httpbis-p3-payload-00.txt ../01/draft-ietf-httpbis-p3-payload-01.txt
-# rfcdiff ../00/draft-ietf-httpbis-p4-conditional-00.txt ../01/draft-ietf-httpbis-p4-conditional-01.txt
-# rfcdiff ../00/draft-ietf-httpbis-p5-range-00.txt ../01/draft-ietf-httpbis-p5-range-01.txt
-# rfcdiff ../00/draft-ietf-httpbis-p6-cache-00.txt ../01/draft-ietf-httpbis-p6-cache-01.txt
-# rfcdiff ../00/draft-ietf-httpbis-p7-auth-00.txt ../01/draft-ietf-httpbis-p7-auth-01.txt
-#
-# rfcdiff ../01/draft-ietf-httpbis-p1-messaging-01.txt \
-#         ../02/draft-ietf-httpbis-p1-messaging-02.txt
-# rfcdiff ../01/draft-ietf-httpbis-p2-semantics-01.txt \
-#         ../02/draft-ietf-httpbis-p2-semantics-02.txt
-# rfcdiff ../01/draft-ietf-httpbis-p3-payload-01.txt \
-#         ../02/draft-ietf-httpbis-p3-payload-02.txt
-# rfcdiff ../01/draft-ietf-httpbis-p4-conditional-01.txt \
-#         ../02/draft-ietf-httpbis-p4-conditional-02.txt
-# rfcdiff ../01/draft-ietf-httpbis-p5-range-01.txt \
-#         ../02/draft-ietf-httpbis-p5-range-02.txt
-# rfcdiff ../01/draft-ietf-httpbis-p6-cache-01.txt \
-#         ../02/draft-ietf-httpbis-p6-cache-02.txt
-# rfcdiff ../01/draft-ietf-httpbis-p7-auth-01.txt \
-#         ../02/draft-ietf-httpbis-p7-auth-02.txt
+# usage: dodiff old new
+#  where old and new are directory siblings of this directory
+#  and contain different versions of the same files
 
-# rfcdiff ../02/draft-ietf-httpbis-p1-messaging-02.txt \
-#         ../03/draft-ietf-httpbis-p1-messaging-03.txt
-# rfcdiff ../02/draft-ietf-httpbis-p2-semantics-02.txt \
-#         ../03/draft-ietf-httpbis-p2-semantics-03.txt
-# rfcdiff ../02/draft-ietf-httpbis-p3-payload-02.txt \
-#         ../03/draft-ietf-httpbis-p3-payload-03.txt
-# rfcdiff ../02/draft-ietf-httpbis-p4-conditional-02.txt \
-#         ../03/draft-ietf-httpbis-p4-conditional-03.txt
-# rfcdiff ../02/draft-ietf-httpbis-p5-range-02.txt \
-#         ../03/draft-ietf-httpbis-p5-range-03.txt
-# rfcdiff ../02/draft-ietf-httpbis-p6-cache-02.txt \
-#         ../03/draft-ietf-httpbis-p6-cache-03.txt
-# rfcdiff ../02/draft-ietf-httpbis-p7-auth-02.txt \
-#         ../03/draft-ietf-httpbis-p7-auth-03.txt
+$rfcdiff = $ENV{'RFCDIFF'} || 'rfcdiff';
+@drafts = ( 'p1-messaging',
+            'p2-semantics',
+            'p3-payload',
+            'p4-conditional',
+            'p5-range',
+            'p6-cache',
+            'p7-auth' );
 
-# rfcdiff ../03/draft-ietf-httpbis-p1-messaging-03.txt \
-#         ../04/draft-ietf-httpbis-p1-messaging-04.txt
-# rfcdiff ../03/draft-ietf-httpbis-p2-semantics-03.txt \
-#         ../04/draft-ietf-httpbis-p2-semantics-04.txt
-# rfcdiff ../03/draft-ietf-httpbis-p3-payload-03.txt \
-#         ../04/draft-ietf-httpbis-p3-payload-04.txt
-# rfcdiff ../03/draft-ietf-httpbis-p4-conditional-03.txt \
-#         ../04/draft-ietf-httpbis-p4-conditional-04.txt
-# rfcdiff ../03/draft-ietf-httpbis-p5-range-03.txt \
-#         ../04/draft-ietf-httpbis-p5-range-04.txt
-# rfcdiff ../03/draft-ietf-httpbis-p6-cache-03.txt \
-#         ../04/draft-ietf-httpbis-p6-cache-04.txt
-# rfcdiff ../03/draft-ietf-httpbis-p7-auth-03.txt \
-#         ../04/draft-ietf-httpbis-p7-auth-04.txt
+$oldv = shift;
+$newv = shift;
 
-# rfcdiff ../04/draft-ietf-httpbis-p1-messaging-04.txt \
-#         ../05/draft-ietf-httpbis-p1-messaging-05.txt
-# rfcdiff ../04/draft-ietf-httpbis-p2-semantics-04.txt \
-#         ../05/draft-ietf-httpbis-p2-semantics-05.txt
-# rfcdiff ../04/draft-ietf-httpbis-p3-payload-04.txt \
-#         ../05/draft-ietf-httpbis-p3-payload-05.txt
-# rfcdiff ../04/draft-ietf-httpbis-p4-conditional-04.txt \
-#         ../05/draft-ietf-httpbis-p4-conditional-05.txt
-# rfcdiff ../04/draft-ietf-httpbis-p5-range-04.txt \
-#         ../05/draft-ietf-httpbis-p5-range-05.txt
-# rfcdiff ../04/draft-ietf-httpbis-p6-cache-04.txt \
-#         ../05/draft-ietf-httpbis-p6-cache-05.txt
-# rfcdiff ../04/draft-ietf-httpbis-p7-auth-04.txt \
-#         ../05/draft-ietf-httpbis-p7-auth-05.txt
+if (!(defined($oldv) && -d "../$oldv")) {
+    die "first argument must be the name of the old directory\n";
+}
+if (!(defined($newv) && -d "../$newv")) {
+    die "second argument must be the name of the new directory\n";
+}
+if ($oldv eq $newv) {
+    die "no differences: both arguments are the same directory\n";
+}
 
-rfcdiff ../05/draft-ietf-httpbis-p1-messaging-05.txt \
-        ../06/draft-ietf-httpbis-p1-messaging-06.txt
-rfcdiff ../05/draft-ietf-httpbis-p2-semantics-05.txt \
-        ../06/draft-ietf-httpbis-p2-semantics-06.txt
-rfcdiff ../05/draft-ietf-httpbis-p3-payload-05.txt \
-        ../06/draft-ietf-httpbis-p3-payload-06.txt
-rfcdiff ../05/draft-ietf-httpbis-p4-conditional-05.txt \
-        ../06/draft-ietf-httpbis-p4-conditional-06.txt
-rfcdiff ../05/draft-ietf-httpbis-p5-range-05.txt \
-        ../06/draft-ietf-httpbis-p5-range-06.txt
-rfcdiff ../05/draft-ietf-httpbis-p6-cache-05.txt \
-        ../06/draft-ietf-httpbis-p6-cache-06.txt
-rfcdiff ../05/draft-ietf-httpbis-p7-auth-05.txt \
-        ../06/draft-ietf-httpbis-p7-auth-06.txt
+if ($newv =~ /^\d\d$/) {  # second argument is a two-digit draft version
+    $newf = "../$newv/draft-ietf-httpbis-";
+    $newb = "-$newv\.txt";
+}
+else {
+    $newf = "../$newv/";
+    $newb = ".txt";
+}
 
-# rfcdiff ../00/draft-ietf-httpbis-p1-messaging-00.txt ../latest/p1-messaging.txt
-# rfcdiff ../00/draft-ietf-httpbis-p2-semantics-00.txt ../latest/p2-semantics.txt
-# rfcdiff ../00/draft-ietf-httpbis-p3-payload-00.txt ../latest/p3-payload.txt
-# rfcdiff ../00/draft-ietf-httpbis-p4-conditional-00.txt ../latest/p4-conditional.txt
-# rfcdiff ../00/draft-ietf-httpbis-p5-range-00.txt ../latest/p5-range.txt
-# rfcdiff ../00/draft-ietf-httpbis-p6-cache-00.txt ../latest/p6-cache.txt
-# rfcdiff ../00/draft-ietf-httpbis-p7-auth-00.txt ../latest/p7-auth.txt
+if ($oldv eq 'orig') {
+    foreach $draft (@drafts) {
+        system $rfcdiff, "../orig/rfc2616-symrefs.txt", "$newf$draft$newb";
+    }
+}
+elsif ($oldv =~ /^\d\d$/) {
+    $oldf = "../$oldv/draft-ietf-httpbis-";
+    $oldb = "-$oldv\.txt";
 
-rfcdiff ../latest/p1-messaging.txt ../latest-roy/p1-messaging.txt
-# rfcdiff ../latest/p2-semantics.txt ../latest-roy/p2-semantics.txt
-# rfcdiff ../latest/p3-payload.txt ../latest-roy/p3-payload.txt
-# rfcdiff ../latest/p4-conditional.txt ../latest-roy/p4-conditional.txt
-# rfcdiff ../latest/p5-range.txt ../latest-roy/p5-range.txt
-# rfcdiff ../latest/p6-cache.txt ../latest-roy/p6-cache.txt
-# rfcdiff ../latest/p7-auth.txt ../latest-roy/p7-auth.txt
+    foreach $draft (@drafts) {
+        system $rfcdiff, "$oldf$draft$oldb", "$newf$draft$newb";
+    }
+}
+else {
+    $oldf = "../$oldv/";
+    $oldb = '.txt';
+
+    foreach $draft (@drafts) {
+        system $rfcdiff, "$oldf$draft$oldb", "$newf$draft$newb";
+    }
+}
+
+exit 0;