[Libreoffice-commits] .: 2 commits - solenv/bin

[Tor Lillqvist]

 solenv/bin/build.pl   |   54 +++++++++-----------------------------------------
 solenv/bin/deliver.pl |   10 ---------
 2 files changed, 10 insertions(+), 54 deletions(-)

New commits:
commit edabdcae9affcee5b940c09e96421d899c10d6d5
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed Sep 7 10:58:39 2011 +0300

    We don't need any .lnk or .link stuff, do we?

diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 7d629da..865e4d1 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 2033727..63c0c77 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();
commit 129852cede1461480c11d6e5db3385d5ea72e1a0
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed Sep 7 10:36:46 2011 +0300

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

diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index df779db..7d629da 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -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) {
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index aba4004..2033727 100755
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@@ -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' )
     {