Changeset 23790 for trunk/psconfig/psbuild

Timestamp:

Apr 9, 2009, 6:06:36 PM (17 years ago)

Author:

Paul Price

Message:

Fixed version information in builds: determined separately (and singly!) for each component

File:

• trunk/psconfig/psbuild (modified) (5 diffs)

trunk/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]";
         }