Subversion Repositories DevTools

Rev

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

Rev 5709 Rev 5848
Line 54... Line 54...
54
my $opt_java;
54
my $opt_java;
55
my $opt_export_vars = 1;
55
my $opt_export_vars = 1;
56
my $result;
56
my $result;
57
my $opt_logfile;
57
my $opt_logfile;
58
my $notaBuildMachine = 0;
58
my $notaBuildMachine = 0;
-
 
59
my @opt_buildfilter;
59
 
60
 
60
#
61
#
61
#   Grab a copy of ALL the environment variable that will be used
62
#   Grab a copy of ALL the environment variable that will be used
62
#   This will simplify the script a great deal
63
#   This will simplify the script a great deal
63
#
64
#
Line 137... Line 138...
137
            "time"              => \$opt_time,
138
            "time"              => \$opt_time,
138
            "b|buildfile=s"     => \&opts_buildfile,
139
            "b|buildfile=s"     => \&opts_buildfile,
139
            "java=s"            => \$opt_java,
140
            "java=s"            => \$opt_java,
140
            "version=s",        => \&opts_version,
141
            "version=s",        => \&opts_version,
141
            "platform:s",       => sub{ opts_extend( \$GBE_PLATFORM, @_ )},
142
            "platform:s",       => sub{ opts_extend( \$GBE_PLATFORM, @_ )},
142
            "buildfilter:s"     => sub{ opts_extend( \$GBE_BUILDFILTER, @_ )},
143
            "buildfilter:s"     => \@opt_buildfilter,
143
            "abt:s"             => sub{ opts_extend( \$GBE_ABT, @_ )},
144
            "abt:s"             => sub{ opts_extend( \$GBE_ABT, @_ )},
144
            "exportvars!"       => \$opt_export_vars,
145
            "exportvars!"       => \$opt_export_vars,
145
            "logfile=s",        => \$opt_logfile,
146
            "logfile=s",        => \$opt_logfile,
146
            );
147
            );
147
 
148
 
Line 841... Line 842...
841
                $GBE_BUILDFILTER = join (' ', split( /[,\s]+/, join(',', @bf)));
842
                $GBE_BUILDFILTER = join (' ', split( /[,\s]+/, join(',', @bf)));
842
                Verbose ("Local BuildFilter: $GBE_BUILDFILTER");
843
                Verbose ("Local BuildFilter: $GBE_BUILDFILTER");
843
            }
844
            }
844
        }
845
        }
845
    }
846
    }
-
 
847
 
846
    
848
    #
-
 
849
    #   Base buildfilter will be Machine or Sandbox
-
 
850
    #   Now merge in user specified build filters
-
 
851
    #
-
 
852
    map opts_extend( \$GBE_BUILDFILTER, '', $_ ) , @opt_buildfilter;
847
}
853
}
848
 
854
 
849
########################################################################
855
########################################################################
850
#
856
#
851
#   Ensure that the user has been set
857
#   Ensure that the user has been set