mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build gbuild directly from build.pl and fix libcmis and respect GMAKE_OPTIONS

Browse Source
This commit is contained in:
Bjoern Michaelsen
2012-04-28 13:00:58 +02:00
parent 6a0972ced8
commit 6963de9536
4 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libcmis/prj/build.lst
View File

@@ -1,3 +1,3 @@
lc libcmis : BOOST:boost CURL:curl LIBXML2:libxml2 soltools NULL lc libcmis : BOOST:boost CURL:curl LIBXML2:libxml2 soltools NULL
lc libcmis usr1 - all lc_mkout NULL lc libcmis usr1 - all lc_mkout NULL
lc libcmis nmake - all lc_libcmis NULL lc libcmis nmake - all lc_libcmis NULL

1
libcmis/prj/makefile.mk
View File

@@ -1 +0,0 @@
.INCLUDE : gbuildbridge.mk

21
solenv/bin/build.pl
View File

@@ -1828,7 +1828,25 @@ sub run_job {
if ( $source_config->is_gbuild($jobs_hash{$registered_name}->{MODULE}) ) 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 else
{ {
@@ -1837,7 +1855,6 @@ sub run_job {
system("$perl $mkout"); system("$perl $mkout");
}; };
} }
open (MAKE, "$job_to_do 2>&1 |") or return 8; open (MAKE, "$job_to_do 2>&1 |") or return 8;
open (LOGFILE, "> $log_file") or return 8; open (LOGFILE, "> $log_file") or return 8;
while (<MAKE>) { print LOGFILE $_; print $_ } while (<MAKE>) { print LOGFILE $_; print $_ }

1
solenv/gbuild/templates/makefile.mk
View File

@@ -1 +0,0 @@
.INCLUDE : gbuildbridge.mk