Subversion Repositories DevTools

Rev

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

Rev 1534 Rev 1538
Line 35... Line 35...
35 
use File::Basename;
 35 
use File::Basename;
36 
use File::Path;
 36 
use File::Path;
37 
use Cwd;
 37 
use Cwd;
38 
use Carp;
 38 
use Carp;
39 
use DBI;
 39 
use DBI;
40 
use LWP::UserAgent;
 - 
 
41 
use DeployUtils::RmPkgInfo;
 40 
use DeployUtils::RmPkgInfo;
42 
use BuildConfig;
 41 
use BuildConfig;
43 
use Exporter();
 42 
use Exporter();
44 
 
 43 
 
45 
use ArrayHashUtils;
 44 
use ArrayHashUtils;
46 
use JatsError;
 45 
use JatsError;
47 
use JatsSystem;
 46 
use JatsSystem;
48 
 
 47 
 
- 
 
 48 
#
- 
 
 49 
#   The LWP is a part of the Active State Perl, but not the solaris perl
- 
 
 50 
#   If the user has not read the installation doco that insists we use
- 
 
 51 
#   ActiveState perl...
- 
 
 52 
#
- 
 
 53 
my $UserAgentAvailable = eval "require LWP::UserAgent";
- 
 
 54 
 
- 
 
 55 
 
49 
#-------------------------------------------------------------------------------
 56 
#-------------------------------------------------------------------------------
50 
#   Export variables and function into the users name space
 57 
#   Export variables and function into the users name space
51 
#-------------------------------------------------------------------------------
 58 
#-------------------------------------------------------------------------------
52 
our @ISA    = qw(Exporter);
 59 
our @ISA    = qw(Exporter);
53 
our @EXPORT = qw(
 60 
our @EXPORT = qw(
Line 4722... Line 4729...
4722 
#       machine specfic function to do the real work.
 4729 
#       machine specfic function to do the real work.
4723 
#
 4730 
#
4724 
#------------------------------------------------------------------------------
 4731 
#------------------------------------------------------------------------------
4725 
{
 4732 
{
4726 
    Information("createPackage");
 4733 
    Information("createPackage");
4727 
    # correct number of parameters?
 - 
 
4728 
    if ( ($#_+1) != 0 )
 - 
 
4729 
    {
 - 
 
4730 
        Error("Incorrect number of params passed to " .
 - 
 
4731 
              "createPackage() function. ",
 - 
 
4732 
              "Check deploy config.");
 - 
 
4733 
    }
 - 
 
4734 
 
 4734 
 
4735 
    # lets just check to see if we can execute this function on
 4735 
    # lets just check to see if we can execute this function on
4736 
    # this machine.
 4736 
    # this machine.
4737 
    #
 4737 
    #
4738 
    my $createRoutine = 'createPackage_' . $MachType;
 4738 
    my $createRoutine = 'createPackage_' . $MachType;
Line 4862... Line 4862...
4862 
#       Invoke the isbuild.pl utility to build the install shield project
 4862 
#       Invoke the isbuild.pl utility to build the install shield project
4863 
#
 4863 
#
4864 
#------------------------------------------------------------------------------
 4864 
#------------------------------------------------------------------------------
4865 
{
 4865 
{
4866 
    Verbose("createPackage_win32");
 4866 
    Verbose("createPackage_win32");
- 
 
 4867 
 
- 
 
 4868 
    #
- 
 
 4869 
    #   Process any options that may be present
- 
 
 4870 
    #   Don't complain about args we don't understand. They may apply to other
- 
 
 4871 
    #   platforms
- 
 
 4872 
    #
- 
 
 4873 
    my @user_options = ();
- 
 
 4874 
    foreach my $arg ( @_ )
- 
 
 4875 
    {
- 
 
 4876 
        if ( $arg =~ m/^-nonameversion/ || $arg =~ m/^-nameversion/   ) {
- 
 
 4877 
            push @user_options, $arg;
- 
 
 4878 
 
- 
 
 4879 
        } elsif ( $arg =~ m/^-nocode/ || $arg =~ m/^-code/   ) {
- 
 
 4880 
            push @user_options, $arg;
- 
 
 4881 
 
- 
 
 4882 
        } else {
- 
 
 4883 
            Message ( "createPackage_win32: Unknown option: $_");
- 
 
 4884 
        }
- 
 
 4885 
    }
- 
 
 4886 
 
4867 
    #
 4887 
    #
4868 
    #   Locate MergeModules in external packages
 4888 
    #   Locate MergeModules in external packages
4869 
    #   These will be used by the InstallShield compiler
 4889 
    #   These will be used by the InstallShield compiler
4870 
    #
 4890 
    #
4871 
    my @mm_dirs;
 4891 
    my @mm_dirs;
Line 4947... Line 4967...
4947 
    my $rv = system ( $ENV{GBE_PERL}, $prog,
 4967 
    my $rv = system ( $ENV{GBE_PERL}, $prog,
4948 
                            "-project=../$PkgName.ism",
 4968 
                            "-project=../$PkgName.ism",
4949 
                            "-version=$PkgVersionUser",
 4969 
                            "-version=$PkgVersionUser",
4950 
                            "-out=$ReleaseDir",
 4970 
                            "-out=$ReleaseDir",
4951 
                            "-workdir=$InterfaceDir",
 4971 
                            "-workdir=$InterfaceDir",
- 
 
 4972 
                            @user_options,
4952 
                            map { "-mergemodule=$_" } @mm_dirs
 4973 
                            map { "-mergemodule=$_" } @mm_dirs
4953 
                             );
 4974 
                             );
4954 
    Error ("InstallShield Builder Error" ) if ( $rv );
 4975 
    Error ("InstallShield Builder Error" ) if ( $rv );
4955 
    return 1;
 4976 
    return 1;
4956 
}
 4977 
}
Line 6656... Line 6677...
6656 
 
 6677 
 
6657 
    # let's update the release contents now
 6678 
    # let's update the release contents now
6658 
    #
 6679 
    #
6659 
    generateProductContents();
 6680 
    generateProductContents();
6660 
 
 6681 
 
- 
 
 6682 
    #
- 
 
 6683 
    #   Is the interface available
- 
 
 6684 
    #
- 
 
 6685 
    unless ( $UserAgentAvailable )
- 
 
 6686 
    {
- 
 
 6687 
        Warning("Unable to retrieve Release Manager Release Notes: LWP module missing");
- 
 
 6688 
        return 0;
- 
 
 6689 
    }
6661 
 
 6690 
 
6662 
    Information("Retrieving Release Notes From Release Manager...Please wait...");
 6691 
    Information("Retrieving Release Notes From Release Manager...Please wait...");
6663 
 
 6692 
 
6664 
    my $user_agent = LWP::UserAgent->new( timeout => 30 );
 6693 
    my $user_agent = LWP::UserAgent->new( timeout => 30 );
6665 
    my $response = $user_agent->get('http://erg:8002/ManagerSuite/Release_Manager/_adhoc_release_notes.asp?pv_id='. $RmPkgDetails->pv_id(),
6694 
    my $response = $user_agent->get('http://erg:8002/ManagerSuite/Release_Manager/_adhoc_release_notes.asp?pv_id='. $RmPkgDetails->pv_id(),