Changeset 21498

Timestamp:

Feb 15, 2009, 5:45:22 PM (17 years ago)

Author:

welling

Message:

Another attempt at a sensible way to infer the proper CVS default tag.

Location:

branches/ipp-magic-v0/psconfig

Files:

• psbuild (modified) (1 diff)
• pschecklibs (modified) (1 diff)
• pscheckperl (modified) (1 diff)

branches/ipp-magic-v0/psconfig/psbuild

@@ -1 +1 @@
 #!/usr/bin/env perl
 
-# Get the CVS tag
+$tagsets = "tagsets";
+if (!-d $tagsets || !-r $tagsets || !-x $tagsets) { die "missing the directory of distribution tables: $tagsets\n"; }
+
+# Get the default CVS tag
 $cvsNameString= '$Name: not supported by cvs2svn $';
-if ( $cvsNameString =~ /\$Name: not supported by cvs2svn $/ ) {
+if ( $cvsNameString =~ /\$[N]ame: (.+) $/ ) {
     $cvsTag = $1;
 } 
-else { die "ERROR: cannot parse CVS tag string\n"; }
-
-$tagsets = "tagsets";
-if (!-d $tagsets || !-r $tagsets || !-x $tagsets) { die "missing the directory of distribution tables: $tagsets\n"; }
+else { 
+    @list = <$tagsets/*.dist>;
+
+    if ( $list[-1] =~ /$tagsets\/(.+)\.dist/ ) {
+        $cvsTag = $1;
+    }
+    else { die "ERROR: unable to determine version tag\n"; }
+}
 
 $version = "";

branches/ipp-magic-v0/psconfig/pschecklibs

@@ -1 +1 @@
 #!/usr/bin/env perl
 
-# Get the CVS tag
+$tagsets = "tagsets";
+$needdev = 0;
+
+# Get the default CVS tag
 $cvsNameString= '$Name: not supported by cvs2svn $';
-if ( $cvsNameString =~ /\$Name: not supported by cvs2svn $/ ) {
+if ( $cvsNameString =~ /\$[N]ame: (.+) $/ ) {
     $cvsTag = $1;
 } 
-else { die "ERROR: cannot parse CVS tag string\n"; }
-# Strip off release version number if present
-if ( $cvsTag =~ /^(.+)\-\d*$/ ) {
-    $cvsTag = $1;
-}
-
-$tagsets = "tagsets";
-$needdev = 0;
+else { 
+    @list = <$tagsets/*.libs>;
+
+    if ( $list[-1] =~ /$tagsets\/(.+)\.libs/ ) {
+        $cvsTag = $1;
+    }
+    else { die "ERROR: unable to determine version tag\n"; }
+}
 
 # default system library locations

branches/ipp-magic-v0/psconfig/pscheckperl

@@ -1 +1 @@
 #!/usr/bin/env perl
 
-# Get the CVS tag
+$tagsets = "tagsets";
+
+# Get the default CVS tag
 $cvsNameString= '$Name: not supported by cvs2svn $';
-if ( $cvsNameString =~ /\$Name: not supported by cvs2svn $/ ) {
+if ( $cvsNameString =~ /\$[N]ame: (.+) $/ ) {
     $cvsTag = $1;
 } 
-else { die "ERROR: cannot parse CVS tag string\n"; }
-# Strip off release version number if present
-if ( $cvsTag =~ /^(.+)\-\d*$/ ) {
-    $cvsTag = $1;
+else { 
+    @list = <$tagsets/*.perl>;
+
+    if ( $list[-1] =~ /$tagsets\/(.+)\.perl/ ) {
+        $cvsTag = $1;
+    }
+    else { die "ERROR: unable to determine version tag\n"; }
 }
-
-$tagsets = "tagsets";
 
 $version = "";