Changeset 23352 for branches/cnb_branches/cnb_branch_20090301/psconfig

Timestamp:

Mar 17, 2009, 12:08:50 PM (17 years ago)

Author:

beaumont

Message:

merged with head

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• psconfig/psbuild (modified) (6 diffs)
• psconfig/pschecklibs (modified) (1 diff)
• psconfig/tagsets/ipp-2.8.dist (copied) (copied from trunk/psconfig/tagsets/ipp-2.8.dist )
• psconfig/tagsets/ipp-2.8.libs (copied) (copied from trunk/psconfig/tagsets/ipp-2.8.libs )
• psconfig/tagsets/ipp-2.8.perl (copied) (copied from trunk/psconfig/tagsets/ipp-2.8.perl )

branches/cnb_branches/cnb_branch_20090301/psconfig/psbuild

@@ -13 +13 @@
 $stop = "";
 $verbose = 0;
+$use_svn = 1;
 
 $extlibs = "none";
@@ -83 +84 @@
     if ($ARGV[0] eq "-bootstrap") {
         &bootstrap ();
+    }
+    if ($ARGV[0] eq "-skip-svn") {
+        $use_svn = 0;
+        shift; next;
     }
     if ($ARGV[0] eq "-env") {
@@ -157 +162 @@
 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") {
         $status = vsystem ("pschecklibs");
@@ -247 +307 @@
 
         if (-e "Build.PL") {
-            vsystem ("$psperlbuild");
-            if ($?) { &failure($module[$i], "failure in perl Build.PL"); }
-
-            vsystem ("./Build");
-            if ($?) { &failure($module[$i], "failure in Build"); }
-
-            vsystem ("./Build install");
-            if ($?) { &failure($module[$i], "failure in Build install"); }
+            $status = vsystem ("$psperlbuild");
+            if ($status) { &failure($module[$i], "failure in perl Build.PL"); }
+
+            $status = vsystem ("./Build");
+            if ($status) { &failure($module[$i], "failure in Build"); }
+
+            $status = vsystem ("./Build install");
+            if ($status) { &failure($module[$i], "failure in Build install"); }
 
             next;
@@ -272 +332 @@
         if ($developer && $rebuild_this && ! -e "configure" && -e "autogen.sh") {
             $skip_configure = 1;
-            vsystem ("$psautogen $psopts");
-            if ($?) { &failure($module[$i], "failure in psautogen"); }
+            $status = vsystem ("$psautogen $psopts");
+            if ($status) { &failure($module[$i], "failure in psautogen"); }
         }
 
         if ($rebuild_this && -e "configure" && !$skip_configure) {
-            vsystem ("$psconfigure $psopts");
-            if ($?) { &failure($module[$i], "failure in psconfigure"); }
+            $status = vsystem ("$psconfigure $psopts");
+            if ($status) { &failure($module[$i], "failure in psconfigure"); }
         }
 
@@ -288 +348 @@
 
         if ($clean) {
-            vsystem ("$make clean");
-            if ($?) { &failure($module[$i], "failure in make clean"); }
+            $status = vsystem ("$make clean");
+            if ($status) { &failure($module[$i], "failure in make clean"); }
         }
 
-        vsystem ("$make");
-        if ($?) { &failure($module[$i], "failure in make"); }
-
-        vsystem ("$make install");
-        if ($?) { &failure($module[$i], "failure in make install"); }
+        $status = vsystem ("$make");
+        if ($status) { &failure($module[$i], "failure in make"); }
+
+        $status = vsystem ("$make install");
+        if ($status) { &failure($module[$i], "failure in make install"); }
 
         print "*** done with $module[$i] ***\n";

branches/cnb_branches/cnb_branch_20090301/psconfig/pschecklibs

@@ -487 +487 @@
 
 sub usage {
-    print STDERR "USAGE: pscheckperl [-version] [-build]\n";
+    print STDERR "USAGE: pschecklibs [-version] [-build]\n";
     exit 2;
 }