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

Don't deliver build.lst to solver and don't look for it there

Browse source
This commit is contained in:
Tor Lillqvist 2011-09-07 10:36:46 +03:00
parent 31cd83043e
commit 129852cede
2 changed files with 0 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
solenv/bin/build.pl
View file

@ -479,7 +479,6 @@ sub get_build_list_path {
};
};
$dead_parents{$module}++;
$build_list_paths{$module} = correct_path(retrieve_build_list($module)) if (!defined $build_list_paths{$module});
return $build_list_paths{$module};
};
@ -2029,31 +2028,6 @@ sub get_tmp_dir {
return $tmp_dir;
};
sub retrieve_build_list {
my $module = shift;
my $old_fh = select(STDOUT);
# Try to get global depencies from solver's build.lst if such exists
my $solver_inc_dir = "$ENV{SOLARVER}/$ENV{OUTPATH}";
$solver_inc_dir .= $ENV{PROEXT} if (defined $ENV{PROEXT});
$solver_inc_dir .= '/inc';
$solver_inc_dir .= "/$module";
$solver_inc_dir = correct_path($solver_inc_dir);
$dead_parents{$module}++;
print "Fetching dependencies for module $module from solver...";
my $build_list_candidate = "$solver_inc_dir/build.lst";
if (-e $build_list_candidate)
{
print " ok\n";
select($old_fh);
return $build_list_candidate;
};
print(" failed\n");
print_error("incomplete dependencies!\n");
return undef;
};
sub prepare_build_from_with_branches {
my ($full_deps_hash, $reversed_full_deps_hash) = @_;
foreach my $prerequisite (keys %$full_deps_hash) {

7
solenv/bin/deliver.pl
View file

@ -1003,13 +1003,6 @@ sub push_default_actions
push(@action_data, ['mkdir', "%_DEST%/res/img"]);
}
# deliver build.lst to $dest/inc/$module
push(@action_data, ['copy', "build.lst %_DEST%/inc/$module/build.lst"]);
if ( $common_build ) {
# ... and to $common_dest/inc/$module
push(@action_data, ['copy', "build.lst %COMMON_DEST%/inc/$module/build.lst"]);
}
# need to copy libstaticmxp.dylib for Mac OS X
if ( $^O eq 'darwin' )
{