Changeset 626 for trunk

Timestamp:

Oct 17, 2002, 3:12:57 PM (22 years ago)

Author:

joergs

Message:

jetzt richtige Zusammenfassung.
Cleanup.
use strict

File:

• trunk/technical/common/build/buildall.pl (modified) (10 diffs)

trunk/technical/common/build/buildall.pl

@@ -2 +2 @@
 # automatisches buildskript fuer smartclient
 # liest die konfiguration aus der mit -b übergebenen Datei
-# $Id: buildall.pl,v 1.15 2002/10/16 18:08:34 joergs Exp $
+# $Id: buildall.pl,v 1.16 2002/10/17 13:12:57 joergs Exp $
 # Philipp Storz, SuSE Linux AG 
 # pstorz@suse.de
 
+use strict;
 use Getopt::Std;
 use File::stat;
 use File::Basename;
 
+my $wert1;
+my $wert2;
+my $wert3;
 
 format TABELLE =
@@ -17 +21 @@
 
 
-# Programmoptionen: -b (buildlist) 
+# Programmoptionen: 
+#       -b (buildlist) 
+#       -x (buildlog im seperaten xtern
+
+my $workdir=`pwd`;
+chomp $workdir;
 
 my $smartclient_root="../../";   # Pfad, zu dem die Pfade in buildlist stehen
 my $build = "build.sh";
-our ($opt_b);
+our ($opt_b, $opt_x);
 my @ArrayofBuilds;
-getopts('b:');
+getopts('b:x');
 
 
@@ -38 +47 @@
 while (<BUILDLIST>) #Buildlist parsen
   {
+        my $dir;
+        my $arch;
+        my $opt;
     next if (/^\#.*$/);
-#    if (/([\w\/]+)\s*:([\/\w\-\+\.]+)\s+:((\s*\-\-\w*)*)$/)
+        # if (/([\w\/]+)\s*:([\/\w\-\+\.]+)\s+:((\s*\-\-\w*)*)$/)
     if (/(\S+)\s*:(\S+)\s*:(\S+)\s*$/)
       {
         ($dir, $arch, $opt) = ($1, $2, $3);
         chomp ($arch);
-        @build=($dir, $arch, $opt);
+        my @build=($dir, $arch, $opt);
         push @ArrayofBuilds, [@build];
       }
@@ -56 +68 @@
 write;
 print "\n";
-for $i (0 .. $#ArrayofBuilds)
+for my $i (0 .. $#ArrayofBuilds)
   {
     ($wert1,$wert2,$wert3)= ($ArrayofBuilds[$i][0],$ArrayofBuilds[$i][1],$ArrayofBuilds[$i][2]);
@@ -65 +77 @@
 print 'Are all the srpms extracted and all options OK? (y/n)';
 
-$answer =<STDIN>;
+my $answer=<STDIN>;
 chomp ($answer);
 if ($answer ne "y") {die("canceled")};
 
-for $i (0 .. $#ArrayofBuilds)
+my $mypath;
+for my $i (0 .. $#ArrayofBuilds)
   {
   print("$ArrayofBuilds[$i][0]\t\t$ArrayofBuilds[$i][1]\t\t$ArrayofBuilds[$i][2]\n");
@@ -88 +101 @@
   print "$_ \n";
   tr/\//\_/;
-  $logfilename = $_.".$ArrayofBuilds[$i][1].log";
+  my $logfilename = "$workdir/$mypath/$_.$ArrayofBuilds[$i][1].log";
 
-
-  my $build_log="| tee $logfilename";
   my $build_cmd="cd $mypath && $build";
 
@@ -97 +108 @@
   if ($opt_x)
   {
-  system "xterm -T \"build log for PACKET: $mypath    ARCH:$ArrayofBuilds[$i][1] \" -e less +F $workdir/$mypath/$logfilename &";
-  print "++++++++++++++++++++++++++++++++++++++++++\n";
-  $build_log=">$logfilename 2>&1";
+    system "xterm -T \"build log for PACKET: $mypath    ARCH:$ArrayofBuilds[$i][1] \" -e less +F $logfilename &";
+    print "++++++++++++++++++++++++++++++++++++++++++\n";
   }
 
@@ -106 +116 @@
     my $base    = basename($mypath);
     my $dir     = dirname($mypath);
-        $build_cmd      = "cd $dir && $build $base-*rpm";
+        $build_cmd      = "cd $dir && $build $base-[0-9]*rpm";
   }
 
@@ -113 +123 @@
   print "BUILD_MODE ist $ENV{'BUILD_MODE'}\n";
   print "executing build command:\n";
-  print "$build_cmd $build_log\n";
+  print "$build_cmd\n";
   print "you can watch building with following command: \n";
-  $workdir=`pwd`;
-  chomp $workdir;
-  print "less +F $workdir/$mypath/$logfilename\n\n";
+  print "less +F $logfilename\n\n";
 
-  $retval = system "$build_cmd $build_log";
-
+  open( LOG_FD, ">$logfilename" );
+  open( PIPE, "$build_cmd 2>&1 |" );
+  while( <PIPE> ) {
+        if( ! $opt_x ) {
+          print;
+        }
+        print LOG_FD;
+  }
+  close PIPE; my $retval=$?;
+  close LOG_FD;
+  
   if ( $retval == 0 )
    {
@@ -146 +163 @@
 print "\n";
 
-for $i (0 .. $#ArrayofBuilds)
+for my $i (0 .. $#ArrayofBuilds)
   {
     ($wert1,$wert2,$wert3)= ($ArrayofBuilds[$i][0],$ArrayofBuilds[$i][1],$ArrayofBuilds[$i][3]);