Subversion Repositories DevTools

Rev

Rev 1564 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1564 Rev 1566
Line 355... Line 355...
355 
        Verbose ("Release Index      : " . $index );
 355 
        Verbose ("Release Index      : " . $index );
356 
        Verbose ("  Name             : " . $release->Name );
 356 
        Verbose ("  Name             : " . $release->Name );
357 
        Verbose ("  BuildLocation    : " . $release->BuildLocation );
 357 
        Verbose ("  BuildLocation    : " . $release->BuildLocation );
358 
        Verbose ("  SingleEXEFileName: " . ( $release->SingleEXEFileName || 'None Specified' ) );
 358 
        Verbose ("  SingleEXEFileName: " . ( $release->SingleEXEFileName || 'None Specified' ) );
359 
 
 359 
 
360 
 
 - 
 
361 
        #
 360 
        #
362 
        #   Build the Project
 361 
        #   Build the Project
363 
        #   Not working at the moment !!!!
 362 
        #   Not working at the moment !!!!
364 
        #
 363 
        #
365 
        if ( $opt_build )
 364 
        if ( $opt_build )
Line 445... Line 444...
445 
 
 444 
 
446 
            $product->SetProperty('SetupFileName', $setup_name );
 445 
            $product->SetProperty('SetupFileName', $setup_name );
447 
            Message( "SetupFileName: " . $product->SetupFileName );
 446 
            Message( "SetupFileName: " . $product->SetupFileName );
448 
 
 447 
 
449 
            #
 448 
            #
- 
 
 449 
            #   Determine the directory IS will use for logging
- 
 
 450 
            #   Note: $logdir has spaces in the name and requires special care
- 
 
 451 
            #
- 
 
 452 
            my $logdir = $release->BuildLocation . "/ishield package/Release/LogFiles";
- 
 
 453 
            $logdir =~ tr~\\/~/~s;
- 
 
 454 
 
- 
 
 455 
            #
- 
 
 456 
            #   Delete old log files
- 
 
 457 
            #
- 
 
 458 
            if ( opendir (my $ld, $logdir) )
- 
 
 459 
            {
- 
 
 460 
                my @dirlist = readdir $ld;
- 
 
 461 
                closedir $ld;
- 
 
 462 
 
- 
 
 463 
                foreach my $logfile ( @dirlist )
- 
 
 464 
                {
- 
 
 465 
                    next unless ( $logfile =~ m~\.txt$~i );
- 
 
 466 
                    unlink  $logdir . '/' . $logfile;
- 
 
 467 
                }
- 
 
 468 
            }
- 
 
 469 
 
- 
 
 470 
            #
450 
            #   Perform the build and report errors and warnings
 471 
            #   Perform the build and report errors and warnings
451 
            #
 472 
            #
452 
            $release->Build;
 473 
            $release->Build;
453 
            $result_code = $release->BuildErrorCount;
 474 
            $result_code = $release->BuildErrorCount;
454 
            Message ("Build Error Count  : " . $release->BuildErrorCount );
 475 
            Message ("Build Error Count  : " . $release->BuildErrorCount );
455 
            Message ("Build Warning Count: " . $release->BuildWarningCount );
 476 
            Message ("Build Warning Count: " . $release->BuildWarningCount );
456 
 
 477 
 
457 
            #
 478 
            #
- 
 
 479 
            #   Display log file ( if an error has been seen )
- 
 
 480 
            #   There should be only ONE log file
- 
 
 481 
            #   Reconfigure error reporting system to simplify logging
- 
 
 482 
            #
- 
 
 483 
            if ( $result_code || IsVerbose(1) )
- 
 
 484 
            {
- 
 
 485 
                if ( opendir (my $ld, $logdir) )
- 
 
 486 
                {
- 
 
 487 
                    my @dirlist = readdir $ld;
- 
 
 488 
                    closedir $ld;
- 
 
 489 
 
- 
 
 490 
                    foreach my $logfile ( @dirlist )
- 
 
 491 
                    {
- 
 
 492 
                        next unless ( $logfile =~ m~\.txt$~i );
- 
 
 493 
                        Message ("Dumping InstallShield Log File: $logfile");
- 
 
 494 
                        my $estate = ErrorReConfig ('name' => 'ISLOG');
- 
 
 495 
                        if ( open (my $lf, "<", $logdir . '/' . $logfile) )
- 
 
 496 
                        {
- 
 
 497 
                            while ( <$lf> )
- 
 
 498 
                            {
- 
 
 499 
                                $_ =~ s~\s+$~~;
- 
 
 500 
                                Message ( $_ );
- 
 
 501 
                            }
- 
 
 502 
                            close $lf;
- 
 
 503 
                        }
- 
 
 504 
                        else
- 
 
 505 
                        {
- 
 
 506 
                            Warning ("Can't open file: $logfile",  "Reason: $!" );
- 
 
 507 
                        }
- 
 
 508 
                    }
- 
 
 509 
                }
- 
 
 510 
                else
- 
 
 511 
                {
- 
 
 512 
                    Warning( "InstallShield Log dir not found: $logdir")
- 
 
 513 
                }
- 
 
 514 
            }
- 
 
 515 
 
- 
 
 516 
            #
458 
            #   Transfer the result file to the user
 517 
            #   Transfer the result file to the user
459 
            #
 518 
            #
460 
            if ( $result_code == 0 && $opt_outpath )
 519 
            if ( $result_code == 0 && $opt_outpath )
461 
            {
 520 
            {
462 
                Message("Transfer output file: $opt_outpath");
 521 
                Message("Transfer output file: $opt_outpath");