Whoops. Need to be more careful about putting $Id$ into the source file.

CVS was taking it upon itself to expand my regular expression into a
proper $Id$ string. Whee!


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@974 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2002-02-08 23:59:36 +00:00
parent 5581b3e65b
commit 664c4ff062
+5 -5
View File
@@ -1,6 +1,6 @@
#!/usr/bin/perl -w #!/usr/bin/perl -w
# #
# $Id: gendobj,v 1.4 2002/02/08 23:53:58 mdb Exp $ # $Id: gendobj,v 1.5 2002/02/08 23:59:36 mdb Exp $
# #
# gendobj is used to generate DObject source file definitons basded on # gendobj is used to generate DObject source file definitons basded on
# abbreviated declarations. Because DObject fields all have standard # abbreviated declarations. Because DObject fields all have standard
@@ -31,12 +31,12 @@ while ($source = shift) {
next; next;
} }
# if the destination file already exists, slurp the existing CVS $Id: gendobj,v 1.4 2002/02/08 23:53:58 mdb Exp $ # if the destination file already exists, slurp the existing CVS Id
# information out of it so that we can slip that into the new one # information out of it so that we can slip that into the new one
my $idstr; my $idstr;
if (-f $dest && open(IN, "$dest")) { if (-f $dest && open(IN, "$dest")) {
while (<IN>) { while (<IN>) {
if (/(\$Id: gendobj,v 1.4 2002/02/08 23:53:58 mdb Exp $)/) { if (/(\$[I][d]: .*\$)/) {
$idstr = $1; $idstr = $1;
} }
} }
@@ -65,8 +65,8 @@ while ($source = shift) {
my $mode = "preamble"; my $mode = "preamble";
while (<IN>) { while (<IN>) {
# swap in the parsed $Id: gendobj,v 1.4 2002/02/08 23:53:58 mdb Exp $ str if we have one # swap in the parsed Id string if we have one
$_ =~ s/(\$Id: gendobj,v 1.4 2002/02/08 23:53:58 mdb Exp $)/$idstr/ if (defined $idstr); $_ =~ s/(\$[I][d]: .*\$)/$idstr/ if (defined $idstr);
if ($mode eq "preamble") { if ($mode eq "preamble") {
# look to see if we're transitioning from the preamble to the # look to see if we're transitioning from the preamble to the