Changeset 740 for vendor/current/source4/script/minimal_includes.pl

Timestamp:

Nov 14, 2012, 12:59:34 PM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source4/script/minimal_includes.pl (modified) (7 diffs)

vendor/current/source4/script/minimal_includes.pl ¶

@@ -12 +12 @@
 my $opt_remove = 0;
 my $opt_skip_system = 0;
+my $opt_waf = 0;
 
 #####################################################################
@@ -44 +45 @@
         my $fname = shift;
         my $obj;
-        if ($fname =~ s/(.*)\.c$/$1.o/) {
+        if ($opt_waf) {
+                my $ret = `../buildtools/bin/waf $fname 2>&1`;
+                return $ret
+        }
+        if ($fname =~ s/(.*)\..*$/$1.o/) {
                 $obj = "$1.o";
         } else {
@@ -68 +73 @@
         $lines->[$i] = "";
 
-        `/bin/mv -f $fname $fname.misaved` && die "failed to rename $fname";
+        my $mname = $fname . ".misaved";
+
+        unlink($mname);
+        rename($fname, $mname) || die "failed to rename $fname";
         save_lines($fname, $lines);
         
@@ -80 +88 @@
                         } else {
                                 print "$fname: removing $line\n";
+                                unlink($mname);
                                 return;
                         }
@@ -88 +97 @@
 
         $lines->[$i] = $line;
-        `/bin/mv -f $fname.misaved $fname` && die "failed to restore $fname";
+        rename($mname, $fname) || die "failed to restore $fname";
 }
 
@@ -139 +148 @@
                  --remove       remove includes, don't just list them
                  --skip-system  don't remove system/ includes
+                 --waf          use waf target conventions
 ";
 }
@@ -148 +158 @@
             'remove' => \$opt_remove,
             'skip-system' => \$opt_skip_system,
+            'waf' => \$opt_waf,
             );