Thread: [smolder-commits] SF.net SVN: smolder:[897] trunk/lib/Smolder/Build.pm
Brought to you by:
michael_peters
From: <mic...@us...> - 2009-03-30 00:29:49
|
Revision: 897 http://smolder.svn.sourceforge.net/smolder/?rev=897&view=rev Author: michael_peters Date: 2009-03-30 00:29:45 +0000 (Mon, 30 Mar 2009) Log Message: ----------- make sure we dont re-run the build-code target by making it a no-op Modified Paths: -------------- trunk/lib/Smolder/Build.pm Modified: trunk/lib/Smolder/Build.pm =================================================================== --- trunk/lib/Smolder/Build.pm 2009-03-30 00:21:36 UTC (rev 896) +++ trunk/lib/Smolder/Build.pm 2009-03-30 00:29:45 UTC (rev 897) @@ -71,7 +71,16 @@ } my $method = "SUPER::ACTION_$action"; - $self->$method(@_); + { + # make sure depends_on('code') doesn't get run since we've already taken care of it + local *Module::Build::TAPArchive::depends_on = sub { + my ($self, @args) = @_; + if($args[0] && $args[0] ne 'code') { + return $self->SUPER::depends_on(@args); + } + }; + $self->$method(@_); + } # finish() seems to hang, so just kill it $subprocess->kill_kill; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mic...@us...> - 2009-03-30 10:50:39
|
Revision: 910 http://smolder.svn.sourceforge.net/smolder/?rev=910&view=rev Author: michael_peters Date: 2009-03-30 10:50:35 +0000 (Mon, 30 Mar 2009) Log Message: ----------- increment the tries Modified Paths: -------------- trunk/lib/Smolder/Build.pm Modified: trunk/lib/Smolder/Build.pm =================================================================== --- trunk/lib/Smolder/Build.pm 2009-03-30 10:34:33 UTC (rev 909) +++ trunk/lib/Smolder/Build.pm 2009-03-30 10:50:35 UTC (rev 910) @@ -73,6 +73,7 @@ warn "Waiting for Smolder to start...\n"; while (!_is_smolder_running() && $tries < 7) { sleep(3); + $tries++; } my $method = "SUPER::ACTION_$action"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mic...@us...> - 2009-03-30 11:26:05
|
Revision: 911 http://smolder.svn.sourceforge.net/smolder/?rev=911&view=rev Author: michael_peters Date: 2009-03-30 11:25:58 +0000 (Mon, 30 Mar 2009) Log Message: ----------- make sure we have a DB before running the tests and dont rely on smolder to create it on startup in case it doesnt start up Modified Paths: -------------- trunk/lib/Smolder/Build.pm Modified: trunk/lib/Smolder/Build.pm =================================================================== --- trunk/lib/Smolder/Build.pm 2009-03-30 10:50:35 UTC (rev 910) +++ trunk/lib/Smolder/Build.pm 2009-03-30 11:25:58 UTC (rev 911) @@ -66,6 +66,10 @@ $ENV{SMOLDER_CONF} = $tmp_conf->filename; $ENV{SMOLDER_TEST_HARNESS_ARCHIVE} = 1; + # make sure we create a DB first. Smolder will do this when it starts, + # but we still want to run some tests even if we fail to start smolder + $self->depends_on('db'); + # start the smolder server my ($in, $out, $err); my $subprocess = start(["$cwd/bin/smolder"], \$in, \$out, \$err); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mic...@us...> - 2009-03-30 14:08:21
|
Revision: 918 http://smolder.svn.sourceforge.net/smolder/?rev=918&view=rev Author: michael_peters Date: 2009-03-30 14:08:16 +0000 (Mon, 30 Mar 2009) Log Message: ----------- make sure PERL5LIB is set before running the smolder server; also eval the test run so that when it dies we can still clean up our smolder server Modified Paths: -------------- trunk/lib/Smolder/Build.pm Modified: trunk/lib/Smolder/Build.pm =================================================================== --- trunk/lib/Smolder/Build.pm 2009-03-30 14:05:13 UTC (rev 917) +++ trunk/lib/Smolder/Build.pm 2009-03-30 14:08:16 UTC (rev 918) @@ -60,6 +60,8 @@ . "DataDir '" . $tmp_dir->dirname . "'\n"; +$conf .= "\nLogFile /home/mpeters/development/smolder/logs/smolder.log\n"; + my $tmp_conf = File::Temp->new(template => 'smolder-XXXXXX', suffix => '.conf', dir => tmpdir); print $tmp_conf $conf; close $tmp_conf; @@ -72,7 +74,8 @@ # start the smolder server my ($in, $out, $err); - my $subprocess = start(["$cwd/bin/smolder"], \$in, \$out, \$err); + $ENV{PERL5LIB} = catdir($cwd, 'blib', 'lib'); + my $subprocess = start([catfile($cwd, 'bin', 'smolder')], \$in, \$out, \$err); my $tries = 0; warn "Waiting for Smolder to start...\n"; while (!_is_smolder_running() && $tries < 7) { @@ -81,7 +84,7 @@ } my $method = "SUPER::ACTION_$action"; - { + eval { # make sure depends_on('code') doesn't get run since we've already taken care of it local *Module::Build::TAPArchive::depends_on = sub { @@ -91,7 +94,7 @@ } }; $self->$method(@_); - } + }; # finish() seems to hang, so just kill it $subprocess->kill_kill; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mic...@us...> - 2009-03-30 20:45:14
|
Revision: 923 http://smolder.svn.sourceforge.net/smolder/?rev=923&view=rev Author: michael_peters Date: 2009-03-30 20:45:12 +0000 (Mon, 30 Mar 2009) Log Message: ----------- removing this since it was just for my debuggin Modified Paths: -------------- trunk/lib/Smolder/Build.pm Modified: trunk/lib/Smolder/Build.pm =================================================================== --- trunk/lib/Smolder/Build.pm 2009-03-30 20:43:41 UTC (rev 922) +++ trunk/lib/Smolder/Build.pm 2009-03-30 20:45:12 UTC (rev 923) @@ -60,8 +60,6 @@ . "DataDir '" . $tmp_dir->dirname . "'\n"; -$conf .= "\nLogFile /home/mpeters/development/smolder/logs/smolder.log\n"; - my $tmp_conf = File::Temp->new(template => 'smolder-XXXXXX', suffix => '.conf', dir => tmpdir); print $tmp_conf $conf; close $tmp_conf; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mic...@us...> - 2009-03-31 18:21:53
|
Revision: 930 http://smolder.svn.sourceforge.net/smolder/?rev=930&view=rev Author: michael_peters Date: 2009-03-31 18:21:46 +0000 (Tue, 31 Mar 2009) Log Message: ----------- load IPC::Run conditionally in case configure_requires isnt respected Modified Paths: -------------- trunk/lib/Smolder/Build.pm Modified: trunk/lib/Smolder/Build.pm =================================================================== --- trunk/lib/Smolder/Build.pm 2009-03-31 18:18:16 UTC (rev 929) +++ trunk/lib/Smolder/Build.pm 2009-03-31 18:21:46 UTC (rev 930) @@ -5,7 +5,6 @@ use File::Temp; use Cwd qw(cwd); use File::Spec::Functions qw(catdir catfile tmpdir curdir rel2abs abs2rel splitdir); -use IPC::Run qw(start finish pump); use LWP::UserAgent; use WWW::Mechanize; use File::Find (); @@ -14,6 +13,11 @@ my $HOSTNAME = 'localhost.localdomain'; my $PORT = '112234'; +BEGIN { + eval { require IPC::Run }; + die "IPC::Run needed to run Smolder build: $@" if $@; +} + =head1 NAME Smolder::Build @@ -73,7 +77,7 @@ # start the smolder server my ($in, $out, $err); $ENV{PERL5LIB} = catdir($cwd, 'blib', 'lib'); - my $subprocess = start([catfile($cwd, 'bin', 'smolder')], \$in, \$out, \$err); + my $subprocess = IPC::Run::start([catfile($cwd, 'bin', 'smolder')], \$in, \$out, \$err); my $tries = 0; warn "Waiting for Smolder to start...\n"; while (!_is_smolder_running() && $tries < 7) { @@ -94,7 +98,6 @@ $self->$method(@_); }; - # finish() seems to hang, so just kill it $subprocess->kill_kill; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mic...@us...> - 2009-04-02 01:26:26
|
Revision: 934 http://smolder.svn.sourceforge.net/smolder/?rev=934&view=rev Author: michael_peters Date: 2009-04-02 01:26:25 +0000 (Thu, 02 Apr 2009) Log Message: ----------- comment and tidying Modified Paths: -------------- trunk/lib/Smolder/Build.pm Modified: trunk/lib/Smolder/Build.pm =================================================================== --- trunk/lib/Smolder/Build.pm 2009-04-02 01:24:08 UTC (rev 933) +++ trunk/lib/Smolder/Build.pm 2009-04-02 01:26:25 UTC (rev 934) @@ -274,8 +274,8 @@ File::Find::find( sub { - return if /^\./; # skip special files - return if $File::Find::dir =~ /\.svn/; + return if /^\./; # skip special files + return if $File::Find::dir =~ /\.svn/; # skip svn droppings return if -d; my $name = $_; my @new_dirs = splitdir($File::Find::dir); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |