Makefile | 4 ++-- solenv/bin/build.pl | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-)
New commits: commit 23791c1c013313f80b743b61bc7500d3c730aa02 Author: David Tardon <[email protected]> Date: Mon Apr 30 07:57:41 2012 +0200 dmake build is always partial Change-Id: I180bd296e3834c624174b7dce08af5b745bfc1b6 diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl index 4ed356d..e634b7c 100755 --- a/solenv/bin/build.pl +++ b/solenv/bin/build.pl @@ -1844,7 +1844,7 @@ sub run_job { #gbuild_target = $ENV{gb_TAILBUILDTARGET}; } $gbuild_flags .= ' ' . $ENV{GMAKE_OPTIONS}; - $job_to_do = "make -f Makefile $gbuild_flags $gbuild_target"; + $job_to_do = "make -f Makefile $gbuild_flags $gbuild_target gb_PARTIALBUILD=T"; my $make_path = $path; $make_path =~ s!/prj$!!; chdir $make_path; commit 08e9190113a22155321496ef1c9fcf8793e5b8cb Author: David Tardon <[email protected]> Date: Mon Apr 30 07:56:10 2012 +0200 export GMAKE_OPTIONS for use in build.pl Change-Id: Ied9a8d0763864a497a9b802d90be95ecdaafc3b0 diff --git a/Makefile b/Makefile index 36434eb..3360eb1 100644 --- a/Makefile +++ b/Makefile @@ -18,9 +18,9 @@ endif include $(SRCDIR)/config_$(gb_Side).mk ifeq ($(verbose),) -GMAKE_OPTIONS:=-rs +export GMAKE_OPTIONS:=-rs else -GMAKE_OPTIONS:=-r +export GMAKE_OPTIONS:=-r endif gbuild_modules:= \ commit 824520b5a4e59785968d859f5a103d8f8881a0ad Author: David Tardon <[email protected]> Date: Mon Apr 30 07:25:08 2012 +0200 run make from top directory Change-Id: If93cca6d8e12baae3369bcba62287d96072f1c93 diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl index e529c9c..4ed356d 100755 --- a/solenv/bin/build.pl +++ b/solenv/bin/build.pl @@ -1844,8 +1844,12 @@ sub run_job { #gbuild_target = $ENV{gb_TAILBUILDTARGET}; } $gbuild_flags .= ' ' . $ENV{GMAKE_OPTIONS}; - $job_to_do = "make -f ../Makefile $gbuild_flags $gbuild_target"; - print "gbuild module $registered_name: $job_to_do\n"; + $job_to_do = "make -f Makefile $gbuild_flags $gbuild_target"; + my $make_path = $path; + $make_path =~ s!/prj$!!; + chdir $make_path; + getcwd(); + print "gbuild module $make_path: $job_to_do\n"; } } else _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
