diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-04-28 13:00:58 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-04-29 03:50:46 +0200 |
| commit | 6963de9536cfca1145685a611a6c88c5160d9a1c (patch) | |
| tree | 5a98d8c4bb0911f5a97cf05f51eed77f19bb211c | |
| parent | dont mix gbuild and dmake in one module (diff) | |
| download | core-6963de9536cfca1145685a611a6c88c5160d9a1c.tar.gz core-6963de9536cfca1145685a611a6c88c5160d9a1c.zip | |
build gbuild directly from build.pl and fix libcmis and respect GMAKE_OPTIONS
| -rw-r--r-- | libcmis/prj/build.lst | 2 | ||||
| -rw-r--r-- | libcmis/prj/makefile.mk | 1 | ||||
| -rwxr-xr-x | solenv/bin/build.pl | 21 | ||||
| -rw-r--r-- | solenv/gbuild/templates/makefile.mk | 1 |
4 files changed, 20 insertions, 5 deletions
diff --git a/libcmis/prj/build.lst b/libcmis/prj/build.lst index 68de49ed05cd..6743f8968e32 100644 --- a/libcmis/prj/build.lst +++ b/libcmis/prj/build.lst @@ -1,3 +1,3 @@ lc libcmis : BOOST:boost CURL:curl LIBXML2:libxml2 soltools NULL lc libcmis usr1 - all lc_mkout NULL -lc libcmis nmake - all lc_libcmis NULL +lc libcmis nmake - all lc_libcmis NULL diff --git a/libcmis/prj/makefile.mk b/libcmis/prj/makefile.mk deleted file mode 100644 index 0997622e00f6..000000000000 --- a/libcmis/prj/makefile.mk +++ /dev/null @@ -1 +0,0 @@ -.INCLUDE : gbuildbridge.mk diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl index e5e009f6f8ad..e529c9cdef37 100755 --- a/solenv/bin/build.pl +++ b/solenv/bin/build.pl @@ -1828,7 +1828,25 @@ sub run_job { if ( $source_config->is_gbuild($jobs_hash{$registered_name}->{MODULE}) ) { - mkpath("$workdir/Logs"); + if ( $job eq 'deliver' ) + { + return 0; + } + else + { + return 1 if (! $path =~ /prj$/ ); + mkpath("$workdir/Logs"); + my $gbuild_flags = '-j' . $ENV{GMAKE_MODULE_PARALLELISM}; + my $gbuild_target = 'all slowcheck'; + if ($registered_name =~ /tail_build\/prj$/ ) + { + $gbuild_flags = '-j' . $ENV{GMAKE_PARALLELISM}; + #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"; + } } else { @@ -1837,7 +1855,6 @@ sub run_job { system("$perl $mkout"); }; } - open (MAKE, "$job_to_do 2>&1 |") or return 8; open (LOGFILE, "> $log_file") or return 8; while (<MAKE>) { print LOGFILE $_; print $_ } diff --git a/solenv/gbuild/templates/makefile.mk b/solenv/gbuild/templates/makefile.mk deleted file mode 100644 index 0997622e00f6..000000000000 --- a/solenv/gbuild/templates/makefile.mk +++ /dev/null @@ -1 +0,0 @@ -.INCLUDE : gbuildbridge.mk |