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

#i111346#: fix mechanism for fetching external tar balls from a pre-defined local path

Browse source
This commit is contained in:
Jens-Heiner Rechtien 2010-05-04 18:44:42 +02:00
parent aa71d04d5a
commit 0b0d59213a
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
solenv/bin/cws.pl
View file

@ -2206,6 +2206,7 @@ sub do_fetch
my $ooo_svn_server = $config->get_ooo_svn_server();
my $so_svn_server = $config->get_so_svn_server();
my $prebuild_dir = $config->get_prebuild_binaries_location();
my $external_tarball_source = $prebuild_dir;
# Check early for platforms so we can bail out before anything time consuming is done
# in case of a missing platform
my @platforms;
@ -2368,10 +2369,10 @@ sub do_fetch
}
}
if ( !$onlysolver ) {
if ( !$onlysolver && defined($external_tarball_source) ) {
my $source_root_dir = "$workspace/$masterws";
my $external_tarball_source = "$prebuild_dir/$masterws/ext_sources";
if ( -e "$source_root_dir/ooo/ooo.lst" && defined($prebuild_dir) && -d $external_tarball_source ) {
$external_tarball_source .= "/$masterws/ext_sources";
if ( -e "$source_root_dir/ooo/ooo.lst" && -d $external_tarball_source ) {
fetch_external_tarballs($source_root_dir, $external_tarball_source);
}
}