Changeset 623 for trunk

Timestamp:

Oct 16, 2002, 8:08:34 PM (22 years ago)

Author:

joergs

Message:

build of src.rpm (without extracting into directory)

File:

• trunk/technical/common/build/buildall.pl (modified) (6 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.14 2002/10/10 15:01:08 joergs Exp $
+# $Id: buildall.pl,v 1.15 2002/10/16 18:08:34 joergs Exp $
 # Philipp Storz, SuSE Linux AG 
 # pstorz@suse.de
+
 use Getopt::Std;
+use File::stat;
+use File::Basename;
 
 
@@ -59 +62 @@
     write;
   }
-print "\n\n\nATTENTION: the srpms from the directory external/SuSE and external/cpan must have been extracted before!\n";
-print "To build srpms execute the extract_srpm.sh script in either directory!\n\n\n";
+
 print 'Are all the srpms extracted and all options OK? (y/n)';
 
@@ -87 +89 @@
   tr/\//\_/;
   $logfilename = $_.".$ArrayofBuilds[$i][1].log";
+
+
+  my $build_log="| tee $logfilename";
+  my $build_cmd="cd $mypath && $build";
+
+  # open a xterm to display build output
+  if ($opt_x)
+  {
+  system "xterm -T \"build log for PACKET: $mypath    ARCH:$ArrayofBuilds[$i][1] \" -e less +F $workdir/$mypath/$logfilename &";
   print "++++++++++++++++++++++++++++++++++++++++++\n";
-  print "executing command: cd $mypath; $build 2>&1 > $logfilename\n";
+  $build_log=">$logfilename 2>&1";
+  }
+
+  # if mypath is not a directory, so it is a src.rpm (hopefully)
+  if( ! -d $mypath ) {
+    my $base    = basename($mypath);
+    my $dir     = dirname($mypath);
+        $build_cmd      = "cd $dir && $build $base-*rpm";
+  }
+
+  print "++++++++++++++++++++++++++++++++++++++++++\n";
   print "BUILD_DIST ist $ENV{'BUILD_DIST'}\n";
   print "BUILD_MODE ist $ENV{'BUILD_MODE'}\n";
-  
-  print "writing logfile to $logfilename \n\n\n";
+  print "executing build command:\n";
+  print "$build_cmd $build_log\n";
   print "you can watch building with following command: \n";
   $workdir=`pwd`;
   chomp $workdir;
-  print "less +F $workdir/$mypath/$logfilename\n";
+  print "less +F $workdir/$mypath/$logfilename\n\n";
 
+  $retval = system "$build_cmd $build_log";
 
-if ($opt_x)
-  {
-  system "xterm -T \"build log for PACKET: $mypath    ARCH:$ArrayofBuilds[$i][1] \" -e less +F $workdir/$mypath/$logfilename &";
-  print "++++++++++++++++++++++++++++++++++++++++++\n";
-  $retval = system "cd $mypath && $build >$logfilename 2>&1";
-  }
-  else
-  {
-    $retval = system "cd $mypath && $build | tee $logfilename";
-  }
-
-
- if ($retval == 0)
+  if ( $retval == 0 )
    {
      $ArrayofBuilds[$i][3]= "SUCCESS $ArrayofBuilds[$i][0]: OK";
@@ -118 +128 @@
      print"******                                                      ******\n";
    }
- else
+  else
    {
      $ArrayofBuilds[$i][3]="ERROR  $ArrayofBuilds[$i][0]: *FAILED*\n";
@@ -125 +135 @@
      print"******                                                      ******\n";
    }
-
 }
 
@@ -145 +154 @@
   }
 
-
-
-
 print "buildall.pl terminated\n";