Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/psconfig

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• psconfig (modified) (1 prop)
• psconfig/psbuild (modified) (5 diffs)
• psconfig/pschecklibs (modified) (1 diff)
• psconfig/tagsets/ipp-2.7.perl (modified) (1 diff)
• psconfig/tagsets/ipp-2.8.libs (modified) (3 diffs)
• psconfig/tagsets/ipp-2.8.perl (modified) (1 diff)

branches/cnb_branches/cnb_branch_20090301/psconfig/psbuild

@@ -13 +13 @@
 $stop = "";
 $verbose = 0;
-$use_svn = 1;
 $svn_trunk = "";
+$offline = 0;
 
 $extlibs = "none";
@@ -90 +90 @@
         &bootstrap ();
     }
-    if ($ARGV[0] eq "-skip-svn") {
-        $use_svn = 0;
-        shift; next;
+    if ($ARGV[0] eq "-offline") {
+        $offline = 1;
+        shift; next;
     }
     if ($ARGV[0] eq "-env") {
@@ -167 +167 @@
 sub build_distribution {
 
-    # set environment variables used to supply SVN info to the compilation
-
-    if ($use_svn) {
-        # example dump from svn info:
-        # pikake: svn info
-        # Path: .
-        # URL: https://svn.pan-starrs.ifa.hawaii.edu/repo/ipp/branches/eam_branches/eam_branch_20090303/ppImage
-        # Repository Root: https://svn.pan-starrs.ifa.hawaii.edu/repo/ipp
-        # Repository UUID: 60eb6cdc-a59c-4636-a4e0-dba66a9721fd
-        # Revision: 23158
-        # Node Kind: directory
-        # Schedule: normal
-        # Last Changed Author: price
-        # Last Changed Rev: 23125
-        # Last Changed Date: 2009-03-03 15:41:16 -1000 (Tue, 03 Mar 2009)
-        
-        $svn_version = `svnversion`; chomp $svn_version;
-        @svn_info = `svn info`;
-
-        # get the svn_root first:
-        foreach $line (@svn_info) {
-            if ($line =~ m|^Repository Root:|) {
-                ($svn_root) = $line =~ m|^Repository Root:\s*(\S*)|;
-                last;
-            }
-        }
-
-        # now get the branch and UUID values
-        foreach $line (@svn_info) {
-            if ($line =~ m|^URL:|) {
-                ($svn_branch) = $line =~ m|^URL:\s*$svn_root/*(\S*)|;
-            }
-            if ($line =~ m|^Repository UUID:|) {
-                ($svn_source) = $line =~ m|^Repository UUID:\s*(\S*)|;
-            }
-        }
-        
-        $ENV{SVN_VERSION} = $svn_version;
-        $ENV{SVN_BRANCH}  = $svn_branch;
-        $ENV{SVN_SOURCE}  = $svn_source;
-    } else {
-        # alternatively, grab these from the following files:
-        if (! -e "SVNINFO") { 
-            print "missing SVNINFO file for repository info, skipping\n";
-        } else {
-            @svn_info = `cat SVNINFO`;
-            foreach $line (@svn_info) {
-                ($name, $value) = split (" ", $line);
-                $ENV{$name} = $value;
-            }
-        }
-    }
-    print "SVN_VERSION $ENV{SVN_VERSION}\n";
-    print "SVN_BRANCH  $ENV{SVN_BRANCH}\n";
-    print "SVN_SOURCE  $ENV{SVN_SOURCE}\n";
-
     # use psconfig.csh to set needed build aliases
     if ($extlibs eq "check") {
@@ -279 +223 @@
     if ($optimize) { $psopts = "$psopts --enable-optimize"; }
     if ($profile)  { $psopts = "$psopts --enable-profile --disable-shared --enable-static"; }
+    $psopts .= " --disable-version" if $offline;
 
     $homedir = `pwd`; chomp $homedir;
@@ -299 +244 @@
 
         if ($svn_trunk && (!-d $workdir || !-r $workdir || !-x $workdir)) {
-            # try trunk instead
+            # try trunk instead
             print STDERR "$module[$i] missing from local path, trying trunk path\n";
-            $workdir = "$svn_trunk/$module[$i]";
+            $workdir = "$svn_trunk/$module[$i]";
         }
 

branches/cnb_branches/cnb_branch_20090301/psconfig/pschecklibs

@@ -25 +25 @@
     if ($ARGV[0] eq "-force") {
         if (@ARGV < 2) { die "-force must be coupled to a library name\n"; }
-        $force{lc($ARGV[1])} = 1;
+        if (lc($ARGV[1]) eq 'build') {
+            $force{'autoconf'} = 1;
+            $force{'automake'} = 1;
+            $force{'libtool'} = 1;
+            $force{'pkg-config'} = 1;
+        } else {
+            $force{lc($ARGV[1])} = 1;
+        }
         shift; shift; next;
     }

branches/cnb_branches/cnb_branch_20090301/psconfig/tagsets/ipp-2.7.perl

@@ -81 +81 @@
   77    Filesys::Df                     Filesys-Df-0.92.tar.gz                  0.92
   78    SQL::Interp                     SQL-Interp-1.06.tar.gz
+  79    Log::Dispatch::Email::MailSend  Log-Dispatch-2.22.tar.gz
 

branches/cnb_branches/cnb_branch_20090301/psconfig/tagsets/ipp-2.8.libs

@@ -18 +18 @@
 #   make install options
 
+
+# Build tools
+bin autoconf             NONE           NONE   autoconf-2.63.tar.gz     autoconf-2.63    N NONE NONE NONE
+bin automake             NONE           NONE   automake-1.10.tar.gz     automake-1.10    N NONE NONE NONE
+bin libtool              NONE           NONE   libtool-2.2.6a.tar.gz    libtool-2.2.6    N NONE NONE NONE
+bin pkg-config           NONE           NONE   pkg-config-0.23.tar.gz   pkg-config-0.23  N NONE NONE NONE
+
 lib libm                 NONE           NONE   NONE                     NONE             N NONE NONE NONE
 lib libX11               NONE           NONE   NONE                     NONE             N NONE NONE NONE
@@ -27 +34 @@
 lib libjpeg              NONE           jpeg   jpegsrc.v6b-p1.tar.gz    jpeg-6b          N --enable-shared NONE install-lib
 lib libcfitsio           NONE           NONE   cfitsio3100-pap.tar.gz   cfitsio3100-pap  N --enable-shared shared NONE
-#lib libmysqlclient      NONE           mysql  mysql-5.0.27.tar.gz      mysql-5.0.27     N NONE NONE NONE
 lib libmysqlclient       NONE           mysql  mysql-5.0.51a.tar.gz     mysql-5.0.51a    N NONE NONE NONE
 lib libgsl               NONE           NONE   gsl-1.11.tar.gz          gsl-1.11         N NONE NONE NONE
 lib libfftw3f            NONE           NONE   fftw-3.0.1.tar.gz        fftw-3.0.1       N --enable-float,--enable-shared,--disable-fortran NONE NONE
-#lib libfftw3            NONE           NONE   fftw-3.0.1.tar.gz        fftw-3.0.1       N --enable-shared,--disable-fortran NONE NONE
-# paul claims we are not currently using double-point FFTs anywhere
 
-bin pkg-config           NONE           NONE   pkg-config-0.22.tar.gz   pkg-config-0.22  N NONE NONE NONE
 
 inc X11/Xatom.h          NONE           NONE   NONE                     NONE             N NONE NONE NONE 
@@ -55 +58 @@
 inc gsl/gsl_rng.h        NONE           NONE   gsl-1.11.tar.gz          gsl-1.11         N NONE NONE NONE 
 inc inttypes.h           NONE           NONE   NONE                     NONE             N NONE NONE NONE 
-inc jpeglib.h            NONE           jpeg   jpegsrc.v6b.tar.gz       jpeg-6b          N --enable-shared NONE install-lib
+inc jpeglib.h            NONE           jpeg   jpegsrc.v6b-p1.tar.gz    jpeg-6b          N --enable-shared NONE install-lib
 inc limits.h             NONE           NONE   NONE                     NONE             N NONE NONE NONE 
 inc malloc.h             NONE           NONE   NONE                     NONE             N NONE NONE NONE 

branches/cnb_branches/cnb_branch_20090301/psconfig/tagsets/ipp-2.8.perl

@@ -81 +81 @@
   77    Filesys::Df                     Filesys-Df-0.92.tar.gz                  0.92
   78    SQL::Interp                     SQL-Interp-1.06.tar.gz
-
+  79    Log::Dispatch::Email::MailSend  Log-Dispatch-2.22.tar.gz