diff options
Diffstat (limited to 'solenv/bin/modules/SourceConfig.pm')
| -rwxr-xr-x | solenv/bin/modules/SourceConfig.pm | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/solenv/bin/modules/SourceConfig.pm b/solenv/bin/modules/SourceConfig.pm index dfaa797d8f48..c7aacc1b0efb 100755 --- a/solenv/bin/modules/SourceConfig.pm +++ b/solenv/bin/modules/SourceConfig.pm @@ -78,6 +78,14 @@ sub new { } else { $source_root = $ENV{SOURCE_ROOT_DIR}; }; + if ( defined $ENV{USE_GBUILD} and "$ENV{USE_GBUILD}" ne "" ) + { + $self->{POSSIBLE_BUILD_LIST} = ('gbuild.lst', 'build.lst', 'build.xlist'); # build lists names + } + else + { + $self->{POSSIBLE_BUILD_LIST} = ('build.lst', 'build.xlist'); # build lists names + } $source_root = Cwd::realpath($source_root); $self->{SOURCE_ROOT} = $source_root; $self->{DEBUG} = 0; @@ -94,6 +102,7 @@ sub new { $self->{REMOVE_REPOSITORIES} = {}; $self->{NEW_REPOSITORIES} = []; $self->{WARNINGS} = []; + $self->{GBUILD} = 0; $self->{REPORT_MESSAGES} = []; $self->{CONFIG_FILE_CONTENT} = []; if (defined $self->{USER_SOURCE_ROOT}) { @@ -173,11 +182,14 @@ sub get_module_build_list { if (defined ${$self->{MODULE_BUILD_LIST_PATHS}}{$module}) { return ${$self->{MODULE_BUILD_LIST_PATHS}}{$module}; } else { - my @possible_build_lists = ('build.lst', 'build.xlist'); # build lists names - foreach (@possible_build_lists) { - my $possible_path = ${$self->{MODULE_PATHS}}{$module} . "/prj/$_"; + my @possible_build_lists = $self->{POSSIBLE_BUILD_LIST}; # build lists names + foreach my $build_list (@possible_build_lists) { + my $possible_path = ${$self->{MODULE_PATHS}}{$module} . "/prj/$build_list"; if (-e $possible_path) { ${$self->{MODULE_BUILD_LIST_PATHS}}{$module} = $possible_path; + if ( $build_list eq "gbuild.lst" ) { + $self->{GBUILD} = 1; + }; return $possible_path; }; }; |