Make data files consistent with release tags

Author: dspinellis

notes.txt

@@ -232,4 +232,4 @@ TODO {{{1
   (could be done with git blame on each file)
 - Add support for SCCS file comment fields (^AT and ^At)
   See http://publib.boulder.ibm.com/infocenter/aix/v7r1/index.jsp?topic=%2Fcom.ibm.aix.files%2Fdoc%2Faixfiles%2Fsccsfile.htm
-- 
+- Check for duplicate files at existing tags and add them to the ignore lists

src/author-path/1bsd src/author-path/BSD-1

@@ -53,56 +53,56 @@ gfi()
 # DEBUG=-p\ '(u1\.s)|(((nami)|(c00)|(ex_addr))\.c)|(open\.2)|(((proc)|(stat))\.h)'
 
 # V1: Assembly language kernel
-perl ../import-dir.pl -m Epoch -c ../author-path/v1 -n ../bell.au \
+perl ../import-dir.pl -m Epoch -c ../author-path/Research-V1 -n ../bell.au \
 	$DEBUG \
 	$ARCHIVE/v1/sys Research V1 -0500 | gfi
 
 # V3: C kernel
-perl ../import-dir.pl -m Research-V1 -c ../author-path/v3 -n ../bell.au \
+perl ../import-dir.pl -m Research-V1 -c ../author-path/Research-V3 -n ../bell.au \
 	-r Research-V1 $DEBUG \
 	-u ../unmatched/Research-V3 $ARCHIVE/v3 Research V3 -0500 | gfi
 
 # V4: Manual pages
-perl ../import-dir.pl -m Research-V3 -c ../author-path/v4 -n ../bell.au \
+perl ../import-dir.pl -m Research-V3 -c ../author-path/Research-V4 -n ../bell.au \
 	-r Research-V3 $DEBUG \
 	-u ../unmatched/Research-V4 $ARCHIVE/v4 Research V4 -0500 | gfi
 
 # V5: Full (apart from manual pages)
-perl ../import-dir.pl -m Research-V4 -c ../author-path/v5 -n ../bell.au \
+perl ../import-dir.pl -m Research-V4 -c ../author-path/Research-V5 -n ../bell.au \
 	-r Research-V3,Research-V4 $DEBUG \
 	-u ../unmatched/Research-V5 $ARCHIVE/v5 Research V5 -0500 | gfi
 
 # V6: Full
-perl ../import-dir.pl -m Research-V5 -c ../author-path/v6 -n ../bell.au \
+perl ../import-dir.pl -m Research-V5 -c ../author-path/Research-V6 -n ../bell.au \
 	-r Research-V5 $DEBUG \
 	-u ../unmatched/Research-V6 $ARCHIVE/v6 Research V6 -0500 | gfi
 
 # BSD1: Just commands; forked from V6
-# Leaves behind .ref-v6
-perl ../import-dir.pl -m Research-V6 -c ../author-path/1bsd -n ../berkeley.au \
-	-r Research-V6 $DEBUG -i ../ignore/1bsd \
+# Leaves behind .ref-Research-V6
+perl ../import-dir.pl -m Research-V6 -c ../author-path/BSD-1 -n ../berkeley.au \
+	-r Research-V6 $DEBUG -i ../ignore/BSD-1 \
 	-u ../unmatched/BSD-1 $ARCHIVE/1bsd BSD 1 -0800 | gfi
 
 # BSD2: Just commands
-perl ../import-dir.pl -m BSD-1 -c ../author-path/2bsd -n ../berkeley.au \
-	-r BSD-1,Research-V6 $DEBUG -i ../ignore/2bsd \
+perl ../import-dir.pl -m BSD-1 -c ../author-path/BSD-2 -n ../berkeley.au \
+	-r BSD-1,Research-V6 $DEBUG -i ../ignore/BSD-2 \
 	-u ../unmatched/BSD-2 $ARCHIVE/2bsd BSD 2 -0800 | gfi
 
 # V7: Full
-perl ../import-dir.pl -m Research-V6 -c ../author-path/v7 -n ../bell.au \
-	-r Research-V6 $DEBUG -i ../ignore/v7 \
+perl ../import-dir.pl -m Research-V6 -c ../author-path/Research-V7 -n ../bell.au \
+	-r Research-V6 $DEBUG -i ../ignore/Research-V7 \
 	-u ../unmatched/Research-V7 $ARCHIVE/v7 Research V7 -0500 | gfi
 
 # Unix/32V: Full
-perl ../import-dir.pl -m Research-V7 -c ../author-path/32v -n ../bell.au \
-	-r Research-V7 $DEBUG -i ../ignore/32v \
+perl ../import-dir.pl -m Research-V7 -c ../author-path/Bell-32V -n ../bell.au \
+	-r Research-V7 $DEBUG -i ../ignore/Bell-32V \
 	$ARCHIVE/32v Bell 32V -0500 | gfi
 
 # BSD 3.0: First full distribution
 # Merge 32V and 2BSD
-perl ../import-dir.pl -m Bell-32V,BSD-2 -c ../author-path/3bsd \
+perl ../import-dir.pl -m Bell-32V,BSD-2 -c ../author-path/BSD-3 \
 	-n ../berkeley.au \
-	-r Bell-32V,BSD-2 $DEBUG -i ../ignore/3bsd \
+	-r Bell-32V,BSD-2 $DEBUG -i ../ignore/BSD-3 \
 	-u ../unmatched/BSD-3 $ARCHIVE/3bsd BSD 3 -0800 | gfi
 
 # BSD SCCS: From 1980 to 1995
@@ -112,18 +112,18 @@ then
 	STRIP="-s $DIR"
 	DIR=$DIR/sys/sys
 fi
-perl ../import-dir.pl -S -C 1996-01-01 -m BSD-3 -c ../author-path/3bsd \
+perl ../import-dir.pl -S -C 1996-01-01 -m BSD-3 -c ../author-path/BSD-3 \
 	-n ../berkeley.au -u ../unmatched/BSD-SCCS.authors $DEBUG \
 	-r BSD-3 -P usr/src/ \
 	$STRIP $DIR BSD-SCCS | gfi
 
 # Merge SCCS and incremental 4BSD additions
 SCCS_AT_RELEASE=$(git log --before='1980-11-15 11:24:58 +0200' -n 1 --format='%H' BSD-SCCS)
-perl ../import-dir.pl -m BSD-3,$SCCS_AT_RELEASE -c ../author-path/4bsd \
+perl ../import-dir.pl -m BSD-3,$SCCS_AT_RELEASE -c ../author-path/BSD-4 \
 	-n ../berkeley.au \
 	-r BSD-3,$SCCS_AT_RELEASE $DEBUG \
-	-i ../ignore/4bsd-src,../ignore/4bsd-catman,../ignore/4bsd-other,../ignore/4bsd-map \
-	-I ../ignore/4bsd-sccs \
+	-i ../ignore/BSD-4-src,../ignore/BSD-4-catman,../ignore/BSD-4-other,../ignore/BSD-4-map \
+	-I ../ignore/BSD-4-sccs \
 	-u ../unmatched/BSD-4 $ARCHIVE/CSRG//cd1/4.0 BSD 4 -0800 | gfi
 
 
@@ -179,20 +179,20 @@ do
 	git checkout Research-V$i
 	verify_same_text . $ARCHIVE/v$i /dev/null
 done
-verify_same_text . $ARCHIVE/v7 ../ignore/v7
+verify_same_text . $ARCHIVE/v7 ../ignore/Research-V7
 
 # Verify BSD releases
 for i in 1 2 3
 do
 	git checkout BSD-$i
-	verify_same_text . $ARCHIVE/${i}bsd ../ignore/${i}bsd
+	verify_same_text . $ARCHIVE/${i}bsd ../ignore/BSD-${i}
 done
 
 git checkout Bell-32V
-verify_same_text . $ARCHIVE/32v ../ignore/32v
+verify_same_text . $ARCHIVE/32v ../ignore/Bell-32V
 
 git checkout BSD-4
-verify_same_text . $ARCHIVE/CSRG/cd1/4.0 ../ignore/4bsd-src
+verify_same_text . $ARCHIVE/CSRG/cd1/4.0 ../ignore/BSD-4-src
 
 # Verify that log/blame work as expected
 N_EXPECTED=3