[smolder-commits] SF.net SVN: smolder: [311] trunk
Brought to you by:
michael_peters
Menu
▾
▴
[smolder-commits] SF.net SVN: smolder: [311] trunk
|
From: <mic...@us...> - 2006-07-20 23:11:56
|
Revision: 311 Author: michael_peters Date: 2006-07-20 16:11:39 -0700 (Thu, 20 Jul 2006) ViewCVS: http://svn.sourceforge.net/smolder/?rev=311&view=rev Log Message: ----------- removing mod_ssl source and build since we arent using it Modified Paths: -------------- trunk/bin/smolder_build trunk/docs/Changes.pod trunk/lib/Smolder/Platform.pm Removed Paths: ------------- trunk/src/Apache-MOD_PERL/mod_ssl-2.8.25-1.3.34.tar.gz Property Changed: ---------------- trunk/ Property changes on: trunk ___________________________________________________________________ Name: svk:merge - 6cb60ec2-19fc-4f48-ba02-516b4c84136d:/local/smolder:4942 + 6cb60ec2-19fc-4f48-ba02-516b4c84136d:/local/smolder:4993 Modified: trunk/bin/smolder_build =================================================================== --- trunk/bin/smolder_build 2006-07-20 16:09:09 UTC (rev 310) +++ trunk/bin/smolder_build 2006-07-20 23:11:39 UTC (rev 311) @@ -120,7 +120,6 @@ # a few useful constants my $APACHE = 'Apache-MOD_PERL/apache_1.3.34.tar.gz'; -my $MOD_SSL = 'Apache-MOD_PERL/mod_ssl-2.8.25-1.3.34.tar.gz'; my $MOD_PERL = 'Apache-MOD_PERL/mod_perl-1.29.tar.gz'; my $MOD_AUTH_TKT = 'Apache-MOD_PERL/mod_auth_tkt-2.0.0b7.tar.gz'; my $LIBAPREQ = 'libapreq'; @@ -267,16 +266,10 @@ die "Can't find Mod_auth_tkt dir '$mod_auth_tkt_dir'." unless -d $mod_auth_tkt_dir; - my $mod_ssl_gz = catfile( $SRC_DIR, $MOD_SSL ); - system("tar zxf $mod_ssl_gz") == 0 or die "Couldn't unpack file: $?"; - my ($mod_ssl_dir) = $mod_ssl_gz =~ m{/([^/]+)\.tar\.gz$}; - die "Can't find Mod_ssl dir '$mod_ssl_dir'." unless -d $mod_ssl_dir; - $pkg->build_apache_modperl( apache_dir => $apache_dir, mod_perl_dir => $mod_perl_dir, mod_auth_tkt_dir => $mod_auth_tkt_dir, - mod_ssl_dir => $mod_ssl_dir, ); # build libapreq now that mod_perl is in place Modified: trunk/docs/Changes.pod =================================================================== --- trunk/docs/Changes.pod 2006-07-20 16:09:09 UTC (rev 310) +++ trunk/docs/Changes.pod 2006-07-20 23:11:39 UTC (rev 311) @@ -18,6 +18,8 @@ =item * Runtime errors sometimes being lost - Sam Tregar, M. Peters +=item * Removed un-used mod_ssl sources and build - M. Peters + =back =head2 0.2 Modified: trunk/lib/Smolder/Platform.pm =================================================================== --- trunk/lib/Smolder/Platform.pm 2006-07-20 16:09:09 UTC (rev 310) +++ trunk/lib/Smolder/Platform.pm 2006-07-20 23:11:39 UTC (rev 311) @@ -724,44 +724,31 @@ apache_dir => $dir, modperl_dir => $dir, mod_auth_tkt_dir => $dir, - mod_ssl_dir => $dir ) =cut sub build_apache_modperl { my ( $pkg, %arg ) = @_; - my ( $apache_dir, $mod_perl_dir, $mod_auth_tkt_dir, $mod_ssl_dir ) = - @arg{qw(apache_dir mod_perl_dir mod_auth_tkt_dir mod_ssl_dir)}; + my ( $apache_dir, $mod_perl_dir, $mod_auth_tkt_dir ) = + @arg{qw(apache_dir mod_perl_dir mod_auth_tkt_dir)}; _load_expect(); print "\n\n************************************************\n\n", - " Building Apache/mod_ssl/mod_perl/mod_auth_tkt", + " Building Apache/mod_perl/mod_auth_tkt", "\n\n************************************************\n\n"; # gather params my $apache_params = $pkg->apache_build_parameters(%arg); my $mod_perl_params = $pkg->mod_perl_build_parameters(%arg); - my $mod_ssl_params = $pkg->mod_ssl_build_parameters(%arg); my $old_dir = cwd; - print "\n\n************************************************\n\n", " Building mod_ssl", - "\n\n************************************************\n\n"; - - # build mod_ssl - chdir($mod_ssl_dir) or die "Unable to chdir($mod_ssl_dir): $!"; - my $cmd = "./configure --with-apache=../$apache_dir $mod_ssl_params"; - print "Calling '$cmd'\n"; - system($cmd ) == 0 - or die "Unable to configure mod_ssl: $!"; - chdir($old_dir); - print "\n\n************************************************\n\n", " Building mod_perl", "\n\n************************************************\n\n"; # build mod_perl chdir($mod_perl_dir) or die "Unable to chdir($mod_perl_dir): $!"; - $cmd = "$^X Makefile.PL $mod_perl_params"; + my $cmd = "$^X Makefile.PL $mod_perl_params"; print "Calling '$cmd'...\n"; my $command = $pkg->expect_questions( @@ -787,8 +774,6 @@ or die "Apache make failed: $?"; system("make install") == 0 or die "Apache make install failed: $?"; - system("make certificate TYPE=DUMMY") == 0 - or die "Apache make failed: $?"; # clean up unneeded apache directories my $root = $ENV{SMOLDER_ROOT}; @@ -827,7 +812,6 @@ return "--prefix=${root}/apache " . "--activate-module=src/modules/perl/libperl.a " . "--disable-shared=perl " - . "--enable-module=ssl --enable-shared=ssl " . "--enable-module=rewrite --enable-shared=rewrite " . "--enable-module=proxy --enable-shared=proxy " . "--enable-module=mime_magic --enable-shared=mime_magic " @@ -862,19 +846,6 @@ . "PERL_DEBUG=1 APACI_ARGS='--without-execstrip' EVERYTHING=1"; } -=head2 mod_ssl_build_parameters - -Returns a string containing the parameters passed to configure. - - mod_ssl_build_parameters(apache_dir => $dir) - -=cut - -sub mod_ssl_build_parameters { - my ( $pkg, %arg ) = @_; - return "--enable-shared=ssl --apache=../$arg{apache_dir}"; -} - =head2 build_swishe Given the directory where swish-e will be installed to, and assuming Deleted: trunk/src/Apache-MOD_PERL/mod_ssl-2.8.25-1.3.34.tar.gz =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |