Remove no-longer-needed special case hacks in MSVC build scripts.

tglsfdc · tglsfdc · commit 2ee69ff65de6 · 2011-02-13T23:42:57.000-05:00
diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm
@@ -325,9 +325,6 @@ sub CopyContribFiles
         {
             $flist = ParseAndCleanRule($flist, $mf);
 
-            # Special case for contrib/spi
-            $flist = "autoinc.sql insert_username.sql moddatetime.sql refint.sql timetravel.sql"
-              if ($d eq 'spi');
             foreach my $f (split /\s+/,$flist)
             {
                 lcopy('contrib/' . $d . '/' . $f,$target . '/share/contrib/' . basename($f))
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
@@ -579,10 +579,6 @@ sub GenerateContribSqlFiles
             $l = substr($l, 0, index($l, '$(addsuffix ')) . substr($l, $i+1);
         }
 
-        # Special case for contrib/spi
-        $l = "autoinc.sql insert_username.sql moddatetime.sql refint.sql timetravel.sql"
-          if ($n eq 'spi');
-
         foreach my $d (split /\s+/, $l)
         {
             my $in = "$d.in";
@@ -594,7 +590,6 @@ sub GenerateContribSqlFiles
                 my $cont = Project::read_file("contrib/$n/$in");
                 my $dn = $out;
                 $dn =~ s/\.sql$//;
-                if ($mf =~ /^MODULE_big\s*=\s*(.*)$/m) { $dn = $1 }
                 $cont =~ s/MODULE_PATHNAME/\$libdir\/$dn/g;
                 my $o;
                 open($o,">contrib/$n/$out") || croak "Could not write to contrib/$n/$d";

Original file line number	Diff line number	Diff line change
`@@ -325,9 +325,6 @@ sub CopyContribFiles`
`325`	`325`	`{`
`326`	`326`	`$flist = ParseAndCleanRule($flist, $mf);`
`327`	`327`
`328`		`- # Special case for contrib/spi`
`329`		`- $flist = "autoinc.sql insert_username.sql moddatetime.sql refint.sql timetravel.sql"`
`330`		`- if ($d eq 'spi');`
`331`	`328`	`foreach my $f (split /\s+/,$flist)`
`332`	`329`	`{`
`333`	`330`	`lcopy('contrib/' . $d . '/' . $f,$target . '/share/contrib/' . basename($f))`