Changeset 23594 for branches/cnb_branches/cnb_branch_20090301/psconfig

Timestamp:

Mar 29, 2009, 6:15:31 PM (17 years ago)

Author:

beaumont

Message:

merged with head

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• psconfig (modified) (1 prop)
• psconfig/psbuild (modified) (3 diffs)
• psconfig/psconfig.csh.in (modified) (1 diff)
• psconfig/tagsets/ipp-2.8.dist (modified) (2 diffs)

branches/cnb_branches/cnb_branch_20090301/psconfig/psbuild

@@ -14 +14 @@
 $verbose = 0;
 $use_svn = 1;
+$svn_trunk = "";
 
 $extlibs = "none";
@@ -34 +35 @@
     if ($ARGV[0] eq "-extperl") {
         $extperl = $ARGV[1];
+        shift; shift; next;
+    }
+    if ($ARGV[0] eq "-trunk") {
+        $svn_trunk = $ARGV[1];
         shift; shift; next;
     }
@@ -293 +298 @@
         print "\033]0; ** psbuild: $module[$i] ** \007";
 
+        if ($svn_trunk && (!-d $workdir || !-r $workdir || !-x $workdir)) {
+            # try trunk instead
+            print STDERR "$module[$i] missing from local path, trying trunk path\n";
+            $workdir = "$svn_trunk/$module[$i]";
+        }
+
         if (!-d $workdir || !-r $workdir || !-x $workdir) {
             print STDERR "WARNING: no directory for component $module[$i], skipping\n";

branches/cnb_branches/cnb_branch_20090301/psconfig/psconfig.csh.in

@@ -410 +410 @@
 
 if ("$PSCONFIG" == "none") then
-  alias  psconfigure configure
-  alias  psautogen autogen.sh
+  alias  psconfigure ./configure
+  alias  psautogen ./autogen.sh
   alias  psperlbuild perl Build.PL
 else

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

@@ -33 +33 @@
   YNNYY  Nebulous/nebclient     ipp-2-8          -0
   YNNYY  Nebulous               ipp-2-8          -0
+  YNNYY  Nebulous-Server        ipp-2-8          -0
   YYYYY  PS-IPP-Metadata-Config ipp-2-8          -0
   YYYYY  PS-IPP-Config          ipp-2-8          -0     
@@ -68 +69 @@
   YYYYY  DataStore              ipp-2-8          -0
 
+  YNNNN  extsrc/gpcsw           ipp-2-8          -0
+
 # there are externally required C libraries and perl modules (see INSTALL)