strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#i107077# do not silently add modules for simple --from switch

Browse source
This commit is contained in:
Vladimir Glazunov 2009-11-23 13:44:44 +01:00
parent 3157f288a4
commit 3a7f656968
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
solenv/bin/build.pl
View file

@ -2135,7 +2135,7 @@ sub print_announce {
$prj_type = $modules_types{$Prj} if (defined $modules_types{$Prj}); $prj_type = $modules_types{$Prj} if (defined $modules_types{$Prj});
my $text; my $text;
if ($prj_type eq 'lnk') { if ($prj_type eq 'lnk') {
if (scalar keys %active_modules && (!defined $active_modules{$Prj})) { if (!defined $active_modules{$Prj}) {
$text = "Skipping module $Prj\n"; $text = "Skipping module $Prj\n";
} else { } else {
$text = "Skipping link to $Prj\n"; $text = "Skipping link to $Prj\n";
@ -2186,7 +2186,7 @@ sub modules_classify {
next; next;
}; };
if (( $module_paths{$module} =~ /\.lnk$/) || ($module_paths{$module} =~ /\.link$/) if (( $module_paths{$module} =~ /\.lnk$/) || ($module_paths{$module} =~ /\.link$/)
|| (scalar keys %active_modules && (!defined $active_modules{$module}))) { || (!defined $active_modules{$module})) {
$modules_types{$module} = 'lnk'; $modules_types{$module} = 'lnk';
next; next;
}; };
@ -2376,8 +2376,10 @@ sub prepare_incompatible_build {
}; };
@modules_built = keys %$deps_hash; @modules_built = keys %$deps_hash;
%add_to_config = %$deps_hash; %add_to_config = %$deps_hash;
generate_config_file(); if ($prepare) {
clear_delivered() if ($prepare); generate_config_file();
clear_delivered();
}
my $old_output_tree = ''; my $old_output_tree = '';
foreach $prj (sort keys %$deps_hash) { foreach $prj (sort keys %$deps_hash) {
if ($prepare) { if ($prepare) {
@ -2866,7 +2868,7 @@ sub generate_html_file {
foreach (@modules_order) { foreach (@modules_order) {
next if ($modules_types{$_} eq 'lnk'); next if ($modules_types{$_} eq 'lnk');
next if (scalar keys %active_modules && (!defined $active_modules{$_})); next if (!defined $active_modules{$_});
my ($errors_info_line, $dirs_info_line, $errors_number, $successes_percent, $errors_percent, $time) = get_html_info($_); my ($errors_info_line, $dirs_info_line, $errors_number, $successes_percent, $errors_percent, $time) = get_html_info($_);
#<one module> #<one module>
print HTML 'document.write(" <tr>");' . "\n"; print HTML 'document.write(" <tr>");' . "\n";