Changeset 23197 for branches/cnb_branches/cnb_branch_20090215/psconfig/pschecklibs

Timestamp:

Mar 5, 2009, 11:13:29 AM (17 years ago)

Author:

beaumont

Message:

Finished ppStack visualization. Unified the way in which visualizations are invoked, plotting windows are closed, etc

Location:

branches/cnb_branches/cnb_branch_20090215

Files:

• . (modified) (1 prop)
• psconfig/pschecklibs (modified) (7 diffs)

branches/cnb_branches/cnb_branch_20090215/psconfig/pschecklibs

@@ -11 +11 @@
 $version = "";
 $build = 0;
-%force;
+my %force;
+my %done;                       # Tarballs that have been processed
 @tARGV = ();
 for (; @ARGV > 0; ) {
@@ -132 +133 @@
 
 
-    if ((defined $force{lc($name)} or defined $force{'all'}) and lc($tarball) ne "none") {
+    if ((defined $force{lc($name)} or defined $force{'all'}) and
+        not defined $done{$tarball} and lc($tarball) ne "none") {
         # remove it for the list so we can check for -force for a library
         # not in the list
         &buildlib ($name, $tarball, $tardir, $configure_opts, $make_opts, $install_opts);
+        $done{$tarball} = 1;
         delete($force{lc($name)});
         next;
@@ -157 +160 @@
 
     if ($auto_force eq "Y") {
-        print "$name will be built\n";
+        print "$name will be built\n";
     }
 
     if ($found) {
-        if ($found eq "runtime-only") {
-            print "runtime $name ($found)\n";
-            push @faillibs, "$name";
-        } else {
-            print "pass $name ($found)\n";
-        }
+        if ($found eq "runtime-only") {
+            print "runtime $name ($found)\n";
+            push @faillibs, "$name";
+        } else {
+            print "pass $name ($found)\n";
+        }
         next;
     } else {
@@ -174 +177 @@
 
     if ($auto_force eq "Y") {
-        print "$name will be built\n";
+        print "$name will be built\n";
     }
 
@@ -187 +190 @@
 my $bad_force;
 foreach $k (keys %force) {
+    next if lc($k) eq 'all';
     print STDERR "\nERROR: -force $k requested but $k isn't in the list of libraries\n";
     $bad_force = 1;
@@ -254 +258 @@
     if ($?) { &failure($name, "failure in configure"); }
 
+    my $make = "make";          # Command for make
+    $make .= ' ' . $ENV{'PSCONFIG_MAKEOPTS'} if defined $ENV{'PSCONFIG_MAKEOPTS'};
+
     if ($make_opts eq "NONE") {
-        vsystem ("make");
+        vsystem ($make);
     } else {
         $make_opts = join (' ', split (',', $make_opts));
-        vsystem ("make $make_opts");
+        vsystem ("$make $make_opts");
     }
     if ($?) { &failure($name, "failure in make"); }
 
     if ($install_opts eq "NONE") {
-        vsystem ("make install");
+        vsystem ("$make install");
     } else {
         $install_opts = join (' ', split (',', $install_opts));
-        vsystem ("make install $install_opts");
+        vsystem ("$make install $install_opts");
     }
     if ($?) { &failure($name, "failure in make install"); }
@@ -315 +322 @@
         # versions libraries if we find only a .so.N without a matching
         # .so, we link this in the installed libdir
-        # XXX this was probably a mistake to allow some systems to build without supplied libs
-        if (1) {
-            foreach $topdir ( @libpath ) {
-                foreach $subdir ( @subdirs ) {
-                    if ($subdir eq ".") {
-                        $path = $topdir;
-                    } else {
-                        $path = "$topdir/$subdir";
-                    }
-                    if (! -e $path) { next; }
-                    @libnames = <$path/$tryname.$dlltype*>;
-                    if (@libnames > 0) {
-                        $libname = @libnames[-1];
-                        $needdev = 1;
-                        # print " *** need developer version of $name\n";
-                        return "runtime-only";
-
-                        # XXX old option: link in existing library
-                        # symlink $libname, "$libdir/$f.$dlltype";
-                        # if ($?) { exit 1; }
-                        # return $libname;
-                    }
-                }
-            }
-        }
+        # XXX this was probably a mistake to allow some systems to build without supplied libs
+        if (1) {
+            foreach $topdir ( @libpath ) {
+                foreach $subdir ( @subdirs ) {
+                    if ($subdir eq ".") {
+                        $path = $topdir;
+                    } else {
+                        $path = "$topdir/$subdir";
+                    }
+                    if (! -e $path) { next; }
+                    @libnames = <$path/$tryname.$dlltype*>;
+                    if (@libnames > 0) {
+                        $libname = @libnames[-1];
+                        $needdev = 1;
+                        # print " *** need developer version of $name\n";
+                        return "runtime-only";
+
+                        # XXX old option: link in existing library
+                        # symlink $libname, "$libdir/$f.$dlltype";
+                        # if ($?) { exit 1; }
+                        # return $libname;
+                    }
+                }
+            }
+        }
     }
     return 0;