From 39e6732f2396be04b6fbc7ce30c7ab1f3c98a78c Mon Sep 17 00:00:00 2001 From: aquanight Date: Sun, 27 Jan 2008 14:32:20 +0000 Subject: Some configure cleanups: like using perl functions/modules instead of system() (symlink, clear, mv, mkdir -p), clean up tmpfile for eval(), use \e instead of \033, and use a heredoc for the big banner on starting configure git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8761 e03df62e-2008-0410-955e-edbf42e46eb7 --- make/configure.pm | 48 ++++++++++++++++++++++++------------------------ make/utilities.pm | 47 ++++++++++++++++++++++++----------------------- 2 files changed, 48 insertions(+), 47 deletions(-) (limited to 'make') diff --git a/make/configure.pm b/make/configure.pm index 203afc0ea..31ef77395 100644 --- a/make/configure.pm +++ b/make/configure.pm @@ -26,7 +26,7 @@ my $no_svn = 0; sub yesno { my ($flag,$prompt) = @_; - print "$prompt [\033[1;32m$main::config{$flag}\033[0m] -> "; + print "$prompt [\e[1;32m$main::config{$flag}\e[0m] -> "; chomp(my $tmp = ); if ($tmp eq "") { $tmp = $main::config{$flag} } if (($tmp eq "") || ($tmp =~ /^y/i)) @@ -149,7 +149,7 @@ sub promptnumeric($$) while (!$continue) { print "Please enter the maximum $prompt?\n"; - print "[\033[1;32m$main::config{$configitem}\033[0m] -> "; + print "[\e[1;32m$main::config{$configitem}\e[0m] -> "; chomp(my $var = ); if ($var eq "") { @@ -171,7 +171,7 @@ sub promptstring_s($$) my ($prompt,$default) = @_; my $var; print "$prompt\n"; - print "[\033[1;32m$default\033[0m] -> "; + print "[\e[1;32m$default\e[0m] -> "; chomp($var = ); $var = $default if $var eq ""; print "\n"; @@ -180,27 +180,27 @@ sub promptstring_s($$) sub dumphash() { - print "\n\033[1;32mPre-build configuration is complete!\033[0m\n\n"; - print "\033[0mBase install path:\033[1;32m\t\t$main::config{BASE_DIR}\033[0m\n"; - print "\033[0mConfig path:\033[1;32m\t\t\t$main::config{CONFIG_DIR}\033[0m\n"; - print "\033[0mModule path:\033[1;32m\t\t\t$main::config{MODULE_DIR}\033[0m\n"; - print "\033[0mLibrary path:\033[1;32m\t\t\t$main::config{LIBRARY_DIR}\033[0m\n"; - print "\033[0mMax connections:\033[1;32m\t\t$main::config{MAX_CLIENT}\033[0m\n"; - print "\033[0mMax nickname length:\033[1;32m\t\t$main::config{NICK_LENGT}\033[0m\n"; - print "\033[0mMax channel length:\033[1;32m\t\t$main::config{CHAN_LENGT}\033[0m\n"; - print "\033[0mMax mode length:\033[1;32m\t\t$main::config{MAXI_MODES}\033[0m\n"; - print "\033[0mMax ident length:\033[1;32m\t\t$main::config{MAX_IDENT}\033[0m\n"; - print "\033[0mMax quit length:\033[1;32m\t\t$main::config{MAX_QUIT}\033[0m\n"; - print "\033[0mMax topic length:\033[1;32m\t\t$main::config{MAX_TOPIC}\033[0m\n"; - print "\033[0mMax kick length:\033[1;32m\t\t$main::config{MAX_KICK}\033[0m\n"; - print "\033[0mMax name length:\033[1;32m\t\t$main::config{MAX_GECOS}\033[0m\n"; - print "\033[0mMax away length:\033[1;32m\t\t$main::config{MAX_AWAY}\033[0m\n"; - print "\033[0mGCC Version Found:\033[1;32m\t\t$main::config{GCCVER}.x\033[0m\n"; - print "\033[0mCompiler program:\033[1;32m\t\t$main::config{CC}\033[0m\n"; - print "\033[0mIPv6 Support:\033[1;32m\t\t\t$main::config{IPV6}\033[0m\n"; - print "\033[0mIPv6 to IPv4 Links:\033[1;32m\t\t$main::config{SUPPORT_IP6LINKS}\033[0m\n"; - print "\033[0mGnuTLS Support:\033[1;32m\t\t\t$main::config{USE_GNUTLS}\033[0m\n"; - print "\033[0mOpenSSL Support:\033[1;32m\t\t$main::config{USE_OPENSSL}\033[0m\n\n"; + print "\n\e[1;32mPre-build configuration is complete!\e[0m\n\n"; + print "\e[0mBase install path:\e[1;32m\t\t$main::config{BASE_DIR}\e[0m\n"; + print "\e[0mConfig path:\e[1;32m\t\t\t$main::config{CONFIG_DIR}\e[0m\n"; + print "\e[0mModule path:\e[1;32m\t\t\t$main::config{MODULE_DIR}\e[0m\n"; + print "\e[0mLibrary path:\e[1;32m\t\t\t$main::config{LIBRARY_DIR}\e[0m\n"; + print "\e[0mMax connections:\e[1;32m\t\t$main::config{MAX_CLIENT}\e[0m\n"; + print "\e[0mMax nickname length:\e[1;32m\t\t$main::config{NICK_LENGT}\e[0m\n"; + print "\e[0mMax channel length:\e[1;32m\t\t$main::config{CHAN_LENGT}\e[0m\n"; + print "\e[0mMax mode length:\e[1;32m\t\t$main::config{MAXI_MODES}\e[0m\n"; + print "\e[0mMax ident length:\e[1;32m\t\t$main::config{MAX_IDENT}\e[0m\n"; + print "\e[0mMax quit length:\e[1;32m\t\t$main::config{MAX_QUIT}\e[0m\n"; + print "\e[0mMax topic length:\e[1;32m\t\t$main::config{MAX_TOPIC}\e[0m\n"; + print "\e[0mMax kick length:\e[1;32m\t\t$main::config{MAX_KICK}\e[0m\n"; + print "\e[0mMax name length:\e[1;32m\t\t$main::config{MAX_GECOS}\e[0m\n"; + print "\e[0mMax away length:\e[1;32m\t\t$main::config{MAX_AWAY}\e[0m\n"; + print "\e[0mGCC Version Found:\e[1;32m\t\t$main::config{GCCVER}.x\e[0m\n"; + print "\e[0mCompiler program:\e[1;32m\t\t$main::config{CC}\e[0m\n"; + print "\e[0mIPv6 Support:\e[1;32m\t\t\t$main::config{IPV6}\e[0m\n"; + print "\e[0mIPv6 to IPv4 Links:\e[1;32m\t\t$main::config{SUPPORT_IP6LINKS}\e[0m\n"; + print "\e[0mGnuTLS Support:\e[1;32m\t\t\t$main::config{USE_GNUTLS}\e[0m\n"; + print "\e[0mOpenSSL Support:\e[1;32m\t\t$main::config{USE_OPENSSL}\e[0m\n\n"; } sub is_dir diff --git a/make/utilities.pm b/make/utilities.pm index 06105e215..f280a2798 100644 --- a/make/utilities.pm +++ b/make/utilities.pm @@ -27,7 +27,7 @@ our @EXPORT = qw(make_rpath pkgconfig_get_include_dirs pkgconfig_get_lib_dirs pk # such as pcre_config, take out the -L # directive and return an rpath for it. -# \033[1;32msrc/Makefile\033[0m +# \e[1;32msrc/Makefile\e[0m my %already_added = (); @@ -41,18 +41,18 @@ sub promptstring($$$$$) GetOptions ("$commandlineswitch=s" => \$opt_commandlineswitch); if (defined $opt_commandlineswitch) { - print "\033[1;32m$opt_commandlineswitch\033[0m\n"; + print "\e[1;32m$opt_commandlineswitch\e[0m\n"; $var = $opt_commandlineswitch; } else { - die "Could not detect $package! Please specify the $prompt via the command line option \033[1;32m--$commandlineswitch=\"/path/to/file\"\033[0m"; + die "Could not detect $package! Please specify the $prompt via the command line option \e[1;32m--$commandlineswitch=\"/path/to/file\"\e[0m"; } } else { print "\nPlease enter the $prompt?\n"; - print "[\033[1;32m$default\033[0m] -> "; + print "[\e[1;32m$default\e[0m] -> "; chomp($var = ); } if ($var eq "") @@ -72,7 +72,7 @@ sub make_rpath($;$) my $libpath = $1; if (!exists $already_added{$libpath}) { - print "Adding extra library path to \033[1;32m$module\033[0m ... \033[1;32m$libpath\033[0m\n"; + print "Adding extra library path to \e[1;32m$module\e[0m ... \e[1;32m$libpath\e[0m\n"; $already_added{$libpath} = 1; } $output .= "-Wl,--rpath -Wl,$libpath -L$libpath " unless defined $main::opt_disablerpath; @@ -100,15 +100,15 @@ sub pkgconfig_get_include_dirs($$$;$) my $key = "default_includedir_$packagename"; if (exists $main::config{$key}) { - print "Locating include directory for package \033[1;32m$packagename\033[0m for module \033[1;32m$module\033[0m... "; + print "Locating include directory for package \e[1;32m$packagename\e[0m for module \e[1;32m$module\e[0m... "; my $ret = $main::config{$key}; - print "\033[1;32m$ret\033[0m (cached)\n"; + print "\e[1;32m$ret\e[0m (cached)\n"; return $ret; } extend_pkg_path(); - print "Locating include directory for package \033[1;32m$packagename\033[0m for module \033[1;32m$module\033[0m... "; + print "Locating include directory for package \e[1;32m$packagename\e[0m for module \e[1;32m$module\e[0m... "; my $v = `pkg-config --modversion $packagename 2>/dev/null`; my $ret = `pkg-config --cflags $packagename 2>/dev/null`; @@ -122,7 +122,7 @@ sub pkgconfig_get_include_dirs($$$;$) chomp($find); if ((defined $find) && ($find ne "") && ($find ne $packagename)) { - print "(\033[1;32mFound via search\033[0m) "; + print "(\e[1;32mFound via search\e[0m) "; $foo = "-I$1"; } else @@ -163,7 +163,7 @@ sub pkgconfig_get_include_dirs($$$;$) $main::config{$key} = "$ret -DVERSION_$packagename=\"$v\""; $main::config{$key} =~ s/^\s+//g; $ret = $main::config{$key}; - print "\033[1;32m$ret\033[0m (version $v)\n"; + print "\e[1;32m$ret\e[0m (version $v)\n"; } $ret =~ s/^\s+//g; return $ret; @@ -198,7 +198,7 @@ sub pkgconfig_check_version($$;$) extend_pkg_path(); - print "Checking version of package \033[1;32m$packagename\033[0m is >= \033[1;32m$version\033[0m... "; + print "Checking version of package \e[1;32m$packagename\e[0m is >= \e[1;32m$version\e[0m... "; my $v = `pkg-config --modversion $packagename 2>/dev/null`; if (defined $v) @@ -209,19 +209,19 @@ sub pkgconfig_check_version($$;$) { if (vcheck($v,$version) == 1) { - print "\033[1;32mYes (version $v)\033[0m\n"; + print "\e[1;32mYes (version $v)\e[0m\n"; return 1; } else { - print "\033[1;32mNo (version $v)\033[0m\n"; + print "\e[1;32mNo (version $v)\e[0m\n"; return 0; } } # If we didnt find it, we cant definitively say its too old. # Return ok, and let pkgconflibs() or pkgconfincludes() pick up # the missing library later on. - print "\033[1;32mNo (not found)\033[0m\n"; + print "\e[1;32mNo (not found)\e[0m\n"; return 1; } @@ -232,15 +232,15 @@ sub pkgconfig_get_lib_dirs($$$;$) my $key = "default_libdir_$packagename"; if (exists $main::config{$key}) { - print "Locating library directory for package \033[1;32m$packagename\033[0m for module \033[1;32m$module\033[0m... "; + print "Locating library directory for package \e[1;32m$packagename\e[0m for module \e[1;32m$module\e[0m... "; my $ret = $main::config{$key}; - print "\033[1;32m$ret\033[0m (cached)\n"; + print "\e[1;32m$ret\e[0m (cached)\n"; return $ret; } extend_pkg_path(); - print "Locating library directory for package \033[1;32m$packagename\033[0m for module \033[1;32m$module\033[0m... "; + print "Locating library directory for package \e[1;32m$packagename\e[0m for module \e[1;32m$module\e[0m... "; my $v = `pkg-config --modversion $packagename 2>/dev/null`; my $ret = `pkg-config --libs $packagename 2>/dev/null`; @@ -254,7 +254,7 @@ sub pkgconfig_get_lib_dirs($$$;$) chomp($find); if ((defined $find) && ($find ne "") && ($find ne $packagename)) { - print "(\033[1;32mFound via search\033[0m) "; + print "(\e[1;32mFound via search\e[0m) "; $foo = "-L$1"; } else @@ -290,7 +290,7 @@ sub pkgconfig_get_lib_dirs($$$;$) else { chomp($v); - print "\033[1;32m$ret\033[0m (version $v)\n"; + print "\e[1;32m$ret\e[0m (version $v)\n"; my $key = "default_libdir_$packagename"; $main::config{$key} = $ret; $main::config{$key} =~ s/^\s+//g; @@ -322,7 +322,7 @@ sub translate_functions($$) } while ($line =~ /exec\("(.+?)"\)/) { - print "Executing program for module \033[1;32m$module\033[0m ... \033[1;32m$1\033[0m\n"; + print "Executing program for module \e[1;32m$module\e[0m ... \e[1;32m$1\e[0m\n"; my $replace = `$1`; die $replace if ($replace =~ /Configuration failed/); chomp($replace); @@ -334,17 +334,18 @@ sub translate_functions($$) } while ($line =~ /eval\("(.+?)"\)/) { - print "Evaluating perl code for module \033[1;32m$module\033[0m ... "; + print "Evaluating perl code for module \e[1;32m$module\e[0m ... "; my $tmpfile; do { $tmpfile = tmpnam(); } until sysopen(TF, $tmpfile, O_RDWR|O_CREAT|O_EXCL|O_NOFOLLOW, 0700); - print "(Created and executed \033[1;32m$tmpfile\033[0m)\n"; + print "(Created and executed \e[1;32m$tmpfile\e[0m)\n"; print TF $1; close TF; my $replace = `perl $tmpfile`; chomp($replace); + unlink($tmpfile); $line =~ s/eval\("(.+?)"\)/$replace/; } while ($line =~ /pkgconflibs\("(.+?)","(.+?)","(.+?)"\)/) @@ -356,7 +357,7 @@ sub translate_functions($$) { if (pkgconfig_check_version($1, $2, $module) != 1) { - die "Version of package $1 is too old. Please upgrade it to version \033[1;32m$2\033[0m or greater and try again."; + die "Version of package $1 is too old. Please upgrade it to version \e[1;32m$2\e[0m or greater and try again."; } # This doesnt actually get replaced with anything $line =~ s/pkgconfversion\("(.+?)","(.+?)"\)//; -- cgit v1.2.3