Changeset 31162

Timestamp:

Apr 4, 2011, 1:21:33 PM (15 years ago)

Author:

eugene

Message:

updates from eam branch (tweaks for Darwin)

Location:

trunk/psconfig

Files:

• pscheckmods (modified) (2 diffs)
• psconfig.bash.in (modified) (1 diff)
• psconfig.csh.in (modified) (4 diffs)
• tagsets/ipp-3.0.dist (copied) (copied from branches/eam_branches/ipp-20110213/psconfig/tagsets/ipp-3.0.dist )
• tagsets/ipp-3.0.libs (copied) (copied from branches/eam_branches/ipp-20110213/psconfig/tagsets/ipp-3.0.libs )
• tagsets/ipp-3.0.perl (copied) (copied from branches/eam_branches/ipp-20110213/psconfig/tagsets/ipp-3.0.perl )

trunk/psconfig/pscheckmods

@@ -1 +1 @@
 #!/usr/bin/env perl
 
+$VERBOSE = 0;
+if (@ARGV > 2 && $ARGV[0] eq "-v") {
+    $VERBOSE = 1;
+    shift @ARGV;
+}
 if (@ARGV != 2) { die "USAGE: pscheckmods (module) (version)\n"; }
 
-# print STDERR "checking in @INC\n";
+if ($VERBOSE) { print STDERR "checking in @INC\n"; }
+
+# &detailed_require ($ARGV[0]);
 
 $x = eval "require $ARGV[0]; 1";
 if (! $x) { 
-    # print "$ARGV[0]: missing\n";
-    exit 1;
+    if (! $VERBOSE) { exit 1; }
+    print "$ARGV[0]: missing\n";
+    &detailed_require ($ARGV[0]);
 }
-# print "x: $x\n";
+if ($VERBOSE) { print "x: $x\n"; }
 
 $version = eval "\$$ARGV[0]::VERSION";
@@ -21 +29 @@
 
 exit 0;
+
+sub detailed_require {
+    my ($filename) = @_;
+    $filename =~ s|::|/|g;
+    $filename = "$filename.pm";
+    print "$filename\n";
+    if (exists $INC{$filename}) {
+        return 1 if $INC{$filename};
+        die "Compilation failed in require";
+    }
+    my ($realfilename,$result);
+  ITER: {
+      foreach $prefix (@INC) {
+          $realfilename = "$prefix/$filename";
+          print "$realfilename\n";
+          if (-f $realfilename) {
+              $INC{$filename} = $realfilename;
+              $result = do $realfilename;
+              last ITER;
+          }
+      }
+      die "Can't find $filename in \@INC";
+    }
+    if ($@) {
+        $INC{$filename} = undef;
+        die $@;
+    } elsif (!$result) {
+        delete $INC{$filename};
+        die "$filename did not return true value";
+    } else {
+        return $result;
+    }
+}

trunk/psconfig/psconfig.bash.in

@@ -1 +1 @@
 # this script sets the PS IPP build environment for BASH shell users
 
-if [ -z $PSCONFIG_DIR ]; then
-  # PSCONFIG_DIR=/home/eugene/src/panstarrs/ipp/psconfig
+if [ -z $PSCONFDIR ]; then
   PSCONFDIR=@PSCONFDIR@
 fi

trunk/psconfig/psconfig.csh.in

@@ -22 +22 @@
 set show_pkg_config_path = 0
 set show_aclocal_flags = 0
+set use_fink = 0
 set args = ""
 while ($#argv) 
@@ -88 +89 @@
       set show_aclocal_flags = 1
       breaksw;
+    case --use-fink
+      set use_fink = 1
+      breaksw;
     case -*:
       echo "unknown option $1"
@@ -323 +327 @@
  case darwin:
  case darwin_x86:
-   set xtralibs = ( $xtralibs "/sw/lib" )
-   set xtrapath = ( $xtrapath "/sw/include" )
+   if ($use_fink) then
+     set xtralibs = ( $xtralibs "/sw/lib" )
+     set xtrapath = ( $xtrapath "/sw/include" )
+   endif
    breaksw;
 
@@ -550 +556 @@
   echo "       psconfig --cpath"
   echo "       psconfig --aclocal_flags"
+  echo "       psconfig --use-fink"
   echo
   echo "       psconfig --list    : list currently availabe configuration versions"