Changeset 27839 for branches/simmosaic_branches/psconfig/pschecklibs

Timestamp:

May 3, 2010, 8:45:22 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simmosaic_branches

Files:

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

branches/simmosaic_branches/psconfig

@@ -2 +2 @@
 psconfig.csh
 psconfig.bash
+build.log

@@ -2 +2 @@
 psconfig.csh
 psconfig.bash
+build.log

branches/simmosaic_branches/psconfig/pschecklibs

@@ -11 +11 @@
 $version = "";
 $build = 0;
+$list_modules = 0;
+my $only = "";
 my %force;
 my %done;                       # Tarballs that have been processed
@@ -35 +37 @@
         shift; shift; next;
     }
+    if ($ARGV[0] eq "-only") {
+        if (@ARGV < 2) { die "-only must be coupled to a library name\n"; }
+        $only = lc($ARGV[1]);
+        shift; shift; next;
+    }
     if ($ARGV[0] eq "-h")     { &usage (); }
     if ($ARGV[0] eq "help")   { &usage (); }
@@ -40 +47 @@
     if ($ARGV[0] eq "--help") { &usage (); }
     if ($ARGV[0] eq "-list")  { &list_distributions(); }
+    if ($ARGV[0] eq "-modules") { $list_modules = 1; shift; next; }
     @tARGV = (@tARGV, $ARGV[0]);
     shift;
@@ -59 +67 @@
 close (FILE);
 
+if ($list_modules) { &list_modules(); }
+
 # set the psconfig version:
 if ("$version" eq "") {
@@ -65 +75 @@
 if ("$version" eq "") {
     $version = "default";
+}
+
+# generate new psconfig.csh if needed
+if (! -e "psconfig.csh" || ! -e "psconfig.bash") {
+    $psconfdir = $ENV{'PSCONFDIR'};
+    if ($psconfdir eq "") { die "PSCONFDIR not found, run psbuild -bootstrap and follow instructions\n"; }
+    vsystem ("cat psconfig.csh.in | sed 's|\@PSCONFDIR@|$psconfdir|' > psconfig.csh");
+    vsystem ("cat psconfig.bash.in | sed 's|\@PSCONFDIR@|$psconfdir|' > psconfig.bash");
 }
 
@@ -101 +119 @@
 unshift @libpath, $libdir;
 
+# XXX a temporary hack for libreadline (this failed... needed to modify libreadline/support/shobj-conf
+# $shlib_libs = $ENV{'SHLIB_LIBS'};
+# unless ($shlib_libs =~ m|-lncurses|) {
+#     $shlib_libs .= " -lncurses";
+# }
+# $ENV{'SHLIB_LIBS'} = $shlib_libs;
+
 # add the path defined by PATH
 @tmppath = split (":", $ENV{'PATH'});
@@ -139 +164 @@
     if (($auto_force ne "Y") && ($auto_force ne "N")) { die "invalid value for auto_force field\n"; }
 
+    if ($only && ($only ne lc($name))) { next; }
 
     if ((defined $force{lc($name)} or defined $force{'all'}) and
@@ -494 +520 @@
 
 sub usage {
-    print STDERR "USAGE: pschecklibs [-version] [-build]\n";
+    print STDERR "USAGE: pschecklibs [-version] [-build] [-only module] [-force module] [-force all]\n";
+    print STDERR "  multiple [-force (module)] options may be specified\n";
+    print STDERR "USAGE: pschecklibs [-list] : show C libraries file\n";
+    print STDERR "USAGE: pschecklibs [-modules] : list available C modules\n";
     exit 2;
 }
@@ -514 +543 @@
 }
 
+sub list_modules {
+
+    foreach $line (@list) {
+        chop $line;
+        if ($line =~ m|^\s*$|) { next; }
+        if ($line =~ m|^\s*\#|) { next; }
+
+        ($type, $name, $altnames, $altpaths, $tarball, $tardir, $auto_force, $configure_opts, $make_opts, $install_opts) = split (" ", $line);
+        if ($type eq "bin") {
+            print STDERR "bin: $name\n";
+        }
+        if ($type eq "lib") {
+            print STDERR "lib: $name\n";
+        }
+    }
+    exit 0;
+}
+
 sub failure {
     system ("ls");

@@ -2 +2 @@
 psconfig.csh
 psconfig.bash
+build.log