[ooo-build-commit] .: patches/dev300

[Petr Mladek]

 patches/dev300/piece-build.diff |   25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

New commits:
commit e279cf545c4b0d83d0af0433c5ad6a457c99341d
Author: Petr Mladek <pmladek at walk.suse.cz>
Date:   Fri Sep 3 20:15:42 2010 +0200

    Fix build.pl to work in the split build
    
    * patches/dev300/piece-build.diff: we do not need to call the complex
      RepositoryHelper stuff; get_stand_dir just need to return current dir

diff --git a/patches/dev300/piece-build.diff b/patches/dev300/piece-build.diff
index f2bf236..2e01152 100644
--- a/patches/dev300/piece-build.diff
+++ b/patches/dev300/piece-build.diff
@@ -23,16 +23,25 @@
          if (scalar keys %active_modules) {
              $active_modules{$initial_module}++;
              $modules_types{$initial_module} = 'mod';
-@@ -1149,6 +1149,9 @@ sub get_stand_dir {
-     if ($StandDir eq $initial_dir) {
-         print_error('Found no project to build');
+@@ -1151,6 +1151,18 @@ sub get_stand_dir {
+         $ENV{mk_tmp} = '';
+         die "No environment set\n";
      };
 +    if ($build_all_dirs) {
-+    return "$StandDir/";
-+    }
-     $initial_module = substr($initial_dir, length($StandDir) + 1);
-     if ($initial_module =~ /\\|\//) {
-         $initial_module = File::Basename::dirname($initial_module);
++	# build all modules => it is enough to return curent directory; no other things need to be computed
++	# the below code is similar to the one in RepositoryHelper:new
++	if ( defined $ENV{PWD} ) {
++    	    $StandDir = $ENV{PWD};
++	} elsif (defined $ENV{_cwd}) {
++    	    $StandDir = $ENV{_cwd};
++        } else {
++    	    $StandDir = cwd();
++	}
++	return $StandDir;
++    };
+     my $repository_helper = RepositoryHelper->new();
+     my $StandDir = $repository_helper->get_repository_root();
+     my $initial_dir = $repository_helper->get_initial_directory();
 @@ -1472,6 +1483,8 @@ sub get_options {
                                  and $build_all_cont = $1            and next;
          $arg =~ /^-a:(\S+)$/ and $build_all_parents = 1