@@ -1,42 +1,34 @@ #!/usr/bin/env perl -use strict ; -use warnings ; +use strict; +use warnings; -use Config ; -use File::Spec ; -use Data::Dumper ; +use Config; +use File::Spec; +use Data::Dumper; -use BuildStem ; +use BuildStem; -my $version_from = File::Spec->catfile( - File::Spec->curdir, 'lib', 'Stem.pm' -); +my $version_from = File::Spec->catfile( File::Spec->curdir, 'lib', 'Stem.pm' ); my $build = BuildStem->new( - module_name => 'Stem', - dist_version_from => $version_from, - requires => { - YAML => 0, - }, - dist_abstract => - 'An asynchronous message passing framework for Perl', - license => 'gpl', - dynamic_config => 1, + module_name => 'Stem', + dist_version_from => $version_from, + requires => { YAML => 0, }, + dist_abstract => 'An asynchronous message passing framework for Perl', + license => 'gpl', + dynamic_config => 1, recursive_test_files => 1, needs_compiler => 0, recommends => { - DBI => 0, - Event => 0, + DBI => 0, + Event => 0, }, - create_makefile_pl => 'passthrough' + create_makefile_pl => 'passthrough' ); - - -$build->is_unixish() or - die "Stem currently only installs properly on *nix-like platforms.\n"; - +$build->is_unixish() + or die "Stem currently only installs properly on *nix-like platforms.\n"; ### ask about the config path and where to install bundled config files @@ -53,14 +45,13 @@ how to do this. EOT -$build->config_data( +$build->config_data( conf_path => scalar $build->prompt( "Please enter a list of directory paths separated by ':'\n", - '.:~/.stem/conf:/usr/local/stem/conf' + '.:~/.stem/conf:/usr/local/stem/conf' ) ); - print <<'EOT'; Where would you like to install the config files bundled with Stem? @@ -69,24 +60,22 @@ appended. If this directory does not exist, it will be created. EOT -$build->config_data( +$build->config_data( conf_dir => scalar $build->prompt( "Please enter a directory path:\n", - '/usr/local/stem/conf' + '/usr/local/stem/conf' ) ); ### add the conf_dir to the conf_path, if necessary { - my $conf_path = $build->config_data( 'conf_path' ); - my $conf_dir = $build->config_data( 'conf_dir' ); + my $conf_path = $build->config_data('conf_path'); + my $conf_dir = $build->config_data('conf_dir'); if ( $conf_path =~ /(^|:)\Q$conf_dir\E(:|$)/ ) { $build->config_data( conf_path => "$conf_path:$conf_dir" ); } } - - ### ask about building the demo scripts print <<'EOT'; @@ -97,57 +86,48 @@ to the system, even after you install the rest of Stem. EOT -$build->config_data( - build_demos => scalar $build->y_n( - "Do you want to build the demos?\n", 'y' - ) -); - +$build->config_data( build_demos => + scalar $build->y_n( "Do you want to build the demos?\n", 'y' ) ); -if ( $build->config_data( 'build_demos' ) ) { +if ( $build->config_data('build_demos') ) { - - ### Try to find telnet - my $telnet_path = $build->find_binary( 'telnet' ) || '' ; - while ( ! -x $telnet_path && ! $build->_is_unattended() ) { - print <<'EOT'; + ### Try to find telnet + my $telnet_path = $build->find_binary('telnet') || ''; + while ( !-x $telnet_path && !$build->_is_unattended() ) { + print <<'EOT'; telnet was not found on this system. the demo programs won't run properly without telnet. Please enter a valid path to telnet, or a single <space> to give up trying. EOT - $telnet_path = $build->prompt( - "Enter the path to telnet " - . "(or another compatible telnet client)", - '/usr/bin/telnet' - ) ; - last if $telnet_path =~ s/^\w+$//; - } - $build->config_data( telnet_path => $telnet_path || undef ) ; - - - + $telnet_path = $build->prompt( + "Enter the path to telnet " + . "(or another compatible telnet client)", + '/usr/bin/telnet' + ); + last if $telnet_path =~ s/^\w+$//; + } + $build->config_data( telnet_path => $telnet_path || undef ); - # Try to find xterm - my $xterm_path = $build->find_binary( 'xterm' ) || '' ; - while ( ! -x $xterm_path && ! $build->_is_unattended() ) { - print <<'EOT'; + ### Try to find xterm + my $xterm_path = $build->find_binary('xterm') || ''; + while ( !-x $xterm_path && !$build->_is_unattended() ) { + print <<'EOT'; xterm was not found on this system. the demo programs won't run properly without xterm. Please enter a valid path to xterm or a single <space> to give up trying. EOT - $xterm_path = $build->prompt( - "Enter the path to xterm " - . "(or another compatible terminal emulator)", - '/usr/bin/xterm' - ) ; - last if $xterm_path =~ s/^\w+$//; - } - $build->config_data( xterm_path => $xterm_path || undef ) ; - + $xterm_path = $build->prompt( + "Enter the path to xterm " + . "(or another compatible terminal emulator)", + '/usr/bin/xterm' + ); + last if $xterm_path =~ s/^\w+$//; + } + $build->config_data( xterm_path => $xterm_path || undef ); ### Only build ssfe if we have a working C compiler if ( $build->have_c_compiler() ) { @@ -163,45 +143,34 @@ it will be installed in the demo/ directory. You may copy it to a place in your $PATH is you wish. EOT - $build->config_data( - build_ssfe => scalar $build->y_n( - "Do you want to build ssfe for the demos?\n", 'y' - ) - ); + $build->config_data( build_ssfe => + scalar $build->y_n( "Do you want to build ssfe for the demos?\n", + 'y' ) ); } } - - - -### NOTE: find out whether or not each of the following +### NOTE: find out whether or not each of the following ### config_data settings are actually being *used* for anything -my $script_dest = $build->install_destination('script') ; -my $run_stem_path = File::Spec->catfile( $script_dest, 'run_stem' ) ; -$build->config_data( run_stem_path => $run_stem_path ) ; - - +my $script_dest = $build->install_destination('script'); +my $run_stem_path = File::Spec->catfile( $script_dest, 'run_stem' ); +$build->config_data( run_stem_path => $run_stem_path ); +my $bin_path = $build->install_destination('bin'); +$build->config_data( bin_path => $bin_path ); -my $bin_path = $build->install_destination('bin') ; -$build->config_data( bin_path => $bin_path ) ; - -$build->config_data( perl_path => $build->config( 'perlpath' ) ) ; +$build->config_data( perl_path => $build->config('perlpath') ); # Several different prefixes... which one to use?? #$build->config_data( prefix => $build->prefix() ) ; -$build->config_data( prefix => $build->config( 'install_base' ) ) ; - - -$build->config_data( config_done => 1 ) ; +$build->config_data( prefix => $build->config('install_base') ); +$build->config_data( config_done => 1 ); #print Dumper \%{ $build->config_data() }; +$build->create_build_script(); -$build->create_build_script() ; - -exit ; +exit; -1 ; +1; Build.PL @@ -29,7 +29,7 @@ sub ACTION_build { } -# yes, hard coded, will fix some other time +# yes, hard coded paths are bad, will fix some other time sub build_ssfe { my ( $self ) = @_; print "Compiling ssfe\n"; @@ -40,6 +40,7 @@ sub build_ssfe { +# handle demo scripts differently from other binaries. sub build_demo_scripts { my ( $self ) = @_; BuildStem.pm @@ -52,7 +52,7 @@ some examples) but most Stem applications will use the startup script use strict ; use vars qw( $VERSION ) ; -$VERSION = 0.12 ; +$VERSION = 0.13 ; use Stem::Util ; use Stem::Class ; lib/Stem.pm @@ -64,7 +64,7 @@ my %loop_to_class = ( my $loop_class = _get_loop_class() ; -INIT{ init_loop() ; } +init_loop() ; sub init_loop { lib/Stem/Event.pm a14fe3a734c90ffff501b9e04b4713e9060c7dd8 Steve Scaffidi sscaffidi@gmail.com http://github.com/Hercynium/stem/commit/197cb60940f21e2c5a0bc8c7e6add01c5ad5b9d3 197cb60940f21e2c5a0bc8c7e6add01c5ad5b9d3 2009-10-06T10:20:50-07:00 2009-10-06T10:20:50-07:00 formatting cleanup and removed unnecessary INIT block 360de672523bbf2d48fa9f3d8edf6094e87e3145 Steve Scaffidi sscaffidi@gmail.com