diff options
author | Tor Lillqvist <tlillqvist@suse.com> | 2011-09-07 10:58:39 +0300 |
---|---|---|
committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-09-07 11:58:20 +0300 |
commit | edabdcae9affcee5b940c09e96421d899c10d6d5 (patch) | |
tree | 06948bd5e9c6dbf247274a943d60675560f5b317 /solenv | |
parent | 129852cede1461480c11d6e5db3385d5ea72e1a0 (diff) |
We don't need any .lnk or .link stuff, do we?
Diffstat (limited to 'solenv')
-rwxr-xr-x | solenv/bin/build.pl | 28 | ||||
-rwxr-xr-x | solenv/bin/deliver.pl | 3 |
2 files changed, 10 insertions, 21 deletions
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl index 7d629dac5677..865e4d1ea347 100755 --- a/solenv/bin/build.pl +++ b/solenv/bin/build.pl @@ -463,20 +463,17 @@ sub schedule_rebuild { sub get_build_list_path { my $module = shift; return $build_list_paths{$module} if (defined $build_list_paths{$module}); - my @possible_dirs = ($module, $module. '.lnk', $module. '.link'); return $build_list_paths{$module} if (defined $build_list_paths{$module}); - foreach (@possible_dirs) { - my $possible_dir_path = $module_paths{$_}.'/prj/'; - if (-d $possible_dir_path) + my $possible_dir_path = $module_paths{$module}.'/prj/'; + if (-d $possible_dir_path) + { + my $possible_build_list_path = correct_path($possible_dir_path . "build.lst"); + if (-f $possible_build_list_path) { - my $possible_build_list_path = correct_path($possible_dir_path . "build.lst"); - if (-f $possible_build_list_path) - { - $build_list_paths{$module} = $possible_build_list_path; - return $possible_build_list_path; - }; - print_error("There's no build list for $module"); - }; + $build_list_paths{$module} = $possible_build_list_path; + return $possible_build_list_path; + }; + print_error("There's no build.lst for $module"); }; $dead_parents{$module}++; return $build_list_paths{$module}; @@ -1081,8 +1078,6 @@ sub check_platform { sub remove_from_dependencies { my ($exclude_prj, $i, $prj, $dependencies); $exclude_prj = shift; - my $exclude_prj_orig = ''; - $exclude_prj_orig = $` if (($exclude_prj =~ /\.lnk$/o) || ($exclude_prj =~ /\.link$/o)); $dependencies = shift; foreach $prj (keys %$dependencies) { my $prj_deps_hash = $$dependencies{$prj}; @@ -2112,11 +2107,8 @@ sub prepare_build_all_cont { $border_prj = $build_all_cont if ($build_all_cont); $border_prj = $build_since if ($build_since); while ($prj = pick_prj_to_build($deps_hash)) { - my $orig_prj = ''; - $orig_prj = $` if ($prj =~ /\.lnk$/o); - $orig_prj = $` if ($prj =~ /\.link$/o); if (($border_prj ne $prj) && - ($border_prj ne $orig_prj)) { + ($border_prj ne '')) { remove_from_dependencies($prj, $deps_hash); next; } else { diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl index 20337271070e..63c0c7744631 100755 --- a/solenv/bin/deliver.pl +++ b/solenv/bin/deliver.pl @@ -440,9 +440,6 @@ sub init_globals { ($module, $repository, $base_dir, $dlst_file) = get_base(); - # for CWS: - $module =~ s/\.lnk$//; - print "Module=$module, Base_Dir=$base_dir, d.lst=$dlst_file\n" if $is_debug; $umask = umask(); |