[Libreoffice-commits] .: 5 commits - Module_ooo.mk Repository.mk solenv/bin solenv/gbuild
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Sun Mar 27 17:46:01 PDT 2011
Module_ooo.mk | 43 ++++++++++++------
Repository.mk | 1
solenv/bin/subsequenttests | 97 +-----------------------------------------
solenv/gbuild/JavaClassSet.mk | 2
solenv/gbuild/Module.mk | 4 +
5 files changed, 37 insertions(+), 110 deletions(-)
New commits:
commit 1e870d258539a17202de4446c811c44312dd7775
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Mar 28 02:44:49 2011 +0200
remove old build system cruft from subsequenttests
diff --git a/solenv/bin/subsequenttests b/solenv/bin/subsequenttests
index 52bdbe2..f5159a1 100755
--- a/solenv/bin/subsequenttests
+++ b/solenv/bin/subsequenttests
@@ -53,60 +53,18 @@ while (@ARGV) {
}
if (!$n) {
print STDERR "unknown argument \"$arg\"\n";
- print STDERR "usage: $0 [-kn] [-P<n>] [-- <args>]\n";
- print STDERR " -k continue with other dmake invocations upon\n";
- print STDERR " failure\n";
+ print STDERR "usage: $0 [-kn] [-P<n>]\n";
+ print STDERR " -k continue upon failure\n";
print STDERR " -n write directories that would be processed\n";
- print STDERR " to standard output\n";
- print STDERR " -P<n> number of parallel dmake invocations\n";
- print STDERR " <args> are passed to dmake invocations\n";
+ print STDERR " to standard output (defunct) \n";
+ print STDERR " -P<n> number of parallel invocations\n";
exit(1);
}
}
}
-my @testpaths = ();
my $module;
my $gbuildpath = "$ENV{'SOLARSRC'}/GNUmakefile.mk";
-foreach $prjdir (`find -L $ENV{'SOLARSRC'} -mindepth 2 -maxdepth 2 -type d -name prj`) {
- chomp($prjdir);
- my $buildlst = "$prjdir/build.lst";
- my %deps = ();
- open(BUILDLST, $buildlst) or next;
- while (<BUILDLST>) {
- next unless
- /^\s*\w+\s+(\S+)\s+nmake\s+-\s+all\s+(\S+)(\s+(:?\S+\s+)*)NULL\s*$/;
- my ($dir, $id, $ids) = ($1, $2, $3);
- $dir =~ s|\\|/|g;
- $dir =~ s|^[^/]+||;
- my $makefile = $prjdir . '/../' . $dir . '/makefile.mk';
- open(MAKEFILE, $makefile) or die("cannot open $makefile");
- while (<MAKEFILE>) {
- if (/\bOOO_SUBSEQUENT_TESTS\b/) {
- push(@testpaths, `readlink -f $prjdir/../$dir`);
- $deps{$id} = $ids;
- last;
- }
- }
- close(MAKEFILE);
- }
- close(BUILDLST);
- my $id1;
- foreach $id1 (keys(%deps)) {
- my ($id2, $ids);
- while (($id2, $ids) = each(%deps)) {
- $ids !~ /\s\Q$id1\E\s/ or die("$module: $id2 depends on $id1");
- }
- }
-}
-
-if ($dry_run) {
- foreach $path (@testpaths) {
- print "$path\n";
- }
- print "$gbuildpath\n";
- exit(0);
-}
my @failedpaths = ();
my @gbuildargs = ("-j$max_running", "-s");
@@ -117,53 +75,6 @@ push(@gbuildargs, "--file=$gbuildpath");
push(@gbuildargs, "subsequentcheck");
if (system($ENV{'GNUMAKE'}, @gbuildargs) != 0) {
push(@failedpaths,$gbuildpath);
- @testpaths = () unless $keep_going;
-}
-
-my $cmd = 'dmake';
-foreach (@ARGV) {
- s/'/'\''/g;
- $cmd .= " '" . $_ . "'";
}
-$cmd .= ' 2>&1 |';
-my %pids = ();
-my $running = 0;
-my $counter = 0;
-while (@testpaths || $running > 0) {
- while (@testpaths && $running < $max_running) {
- my $testpath = shift(@testpaths);
- chomp($testpath);
- ++$counter;
- print("$counter: make $testpath\n");
- my $pid = fork();
- defined($pid) or die("$counter: $!");
- if ($pid == 0) {
- chdir($testpath) or die("$counter: $!");
- $ENV{'OOO_SUBSEQUENT_TESTS'} = 'TRUE';
- open(OUTPUT, $cmd) or die("$counter: $!");
- while (<OUTPUT>) {
- s/\r?\n$//;
- print("$counter: $_\n");
- }
- close(OUTPUT);
- exit($? == 0 ? 0 : 1);
- }
- $pids{$pid} = $testpath;
- ++$running;
- }
- my $pid = wait();
- $pid != -1 or die($!);
- my $testpath = delete($pids{$pid});
- defined($testpath) or die("unmatched PID $pid");
- if ($? != 0) {
- push(@failedpaths, $testpath);
- @testpaths = () unless $keep_going;
- }
- --$running;
-}
-my $failedpath;
-foreach $failedpath (@failedpaths) {
- print STDERR "failed in $failedpath\n";
-}
exit(scalar(@failedpaths) == 0 ? 0 : 1);
commit db043b4937953b0141fbd9b80251b1791aa2ab86
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Mar 28 02:29:43 2011 +0200
activate subsequentcheck modules globally
diff --git a/Module_ooo.mk b/Module_ooo.mk
index a788830..9835771 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -28,21 +28,34 @@
$(eval $(call gb_Module_Module,ooo))
$(eval $(call gb_Module_add_moduledirs,ooo,\
- comphelper \
- editeng \
- framework \
- padmin \
- sfx2 \
- sot \
- svl \
- svtools \
- svx \
- sw \
- toolkit \
- tools \
- unoxml \
- xmloff \
- vbahelper \
+ comphelper \
+ editeng \
+ framework \
+ padmin \
+ sfx2 \
+ sot \
+ svl \
+ svtools \
+ svx \
+ sw \
+ toolkit \
+ tools \
+ unoxml \
+ xmloff \
+ vbahelper \
+))
+
+# these have only migrated subsequentcheck for now
+$(eval $(call gb_Module_add_moduledirs,ooo,\
+ chart2 \
+ configmgr \
+ dbaccess \
+ forms \
+ linguistic \
+ qadevOOo \
+ sal \
+ ucb \
+ unotools \
))
# vim: set noet ts=4 sw=4:
commit 90fb560dd7cb8f6de229b31f04737869c1cf60aa
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Mar 28 02:28:57 2011 +0200
register test library
diff --git a/Repository.mk b/Repository.mk
index 516fb36..0afb79b 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -97,6 +97,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
))
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+ test \
cppunit \
icuuc \
rdf \
commit 98703389a6d24b9aa2825969fe491fbbea5c1432
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Mar 28 02:28:01 2011 +0200
handle empty JavaClassSets gracefully
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index 33d3b32..a7dd1ba 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -31,7 +31,7 @@ gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER)
define gb_JavaClassSet__command
$(call gb_Helper_abbreviate_dirs_native,\
mkdir -p $(dir $(1)) && \
- $(gb_JavaClassSet_JAVACCOMMAND) -cp "$(CLASSPATH)" -d $(call gb_JavaClassSet_get_classdir,$(2)) $(3) && \
+ $(if $(3),$(gb_JavaClassSet_JAVACCOMMAND) -cp "$(CLASSPATH)" -d $(call gb_JavaClassSet_get_classdir,$(2)) $(3) &&) \
touch $(1))
endef
commit 4130016c38545719923e0badb2a7ccc4e5016205
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Mar 28 02:27:12 2011 +0200
do not depend on an uptodate build for subsequentcheck for now
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 9554853..eebbb1c 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -99,7 +99,9 @@ check :
$(call gb_Output_announce_title,all tests checked.)
$(call gb_Output_announce_bell)
-subsequentcheck : all
+# removing the dependency on all for now until we can make a full build with gbuild
+#subsequentcheck : all
+subsequentcheck :
$(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),SCK,6)
$(call gb_Output_announce_title,all subsequent tests checked.)
$(call gb_Output_announce_bell)
More information about the Libreoffice-commits
mailing list