Repository: incubator-trafficcontrol Updated Branches: refs/heads/master 9e0e80881 -> f4a93a8d2
[TC-228] - bin and lib file updates - remove install/bin/build_trafficops_perl_library - remove mysql perl deps in install/lib/BuildPerlDeps.pm Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/7180ab58 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/7180ab58 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/7180ab58 Branch: refs/heads/master Commit: 7180ab5884e5b42663a073dd4750f67c8f89779c Parents: 5cf6fae Author: Jeff Martin <[email protected]> Authored: Tue Apr 11 16:58:39 2017 -0400 Committer: Dan Kirkwood <[email protected]> Committed: Tue Apr 11 15:42:58 2017 -0600 ---------------------------------------------------------------------- .../install/bin/build_trafficops_perl_library | 149 ------------------- traffic_ops/install/lib/BuildPerlDeps.pm | 2 +- 2 files changed, 1 insertion(+), 150 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/7180ab58/traffic_ops/install/bin/build_trafficops_perl_library ---------------------------------------------------------------------- diff --git a/traffic_ops/install/bin/build_trafficops_perl_library b/traffic_ops/install/bin/build_trafficops_perl_library deleted file mode 100755 index 684916d..0000000 --- a/traffic_ops/install/bin/build_trafficops_perl_library +++ /dev/null @@ -1,149 +0,0 @@ -#!/usr/bin/perl -# -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -use strict; -use warnings; -use Getopt::Std; -use InstallUtils; - -our ($opt_i); - -my @dependencies = ( - "expat-devel", "mod_ssl", "mkisofs", "libpcap", "libpcap-devel", "libcurl", - "libcurl-devel", "mysql-server", "mysql-devel", "openssl", "cpan", "gcc", - "make", "pkgconfig", "automake", "autoconf", "libtool", "gettext" -); -my $msg = << 'EOF'; - -This script will build and package the required Traffic Ops perl modules. -In order to complete this operation, Development tools such as the gcc -compiler will be installed on this machine. - -EOF - -sub promptUser { - my ( $promptString, $defaultValue, $noEcho ) = @_; - - if ($defaultValue) { - print $promptString, " [", $defaultValue, "]: "; - } - else { - print $promptString, ": "; - } - - if ( defined $noEcho && $noEcho ) { - my $response = read_password(''); - if ( ( !defined $response || $response eq '' ) && ( defined $defaultValue && $defaultValue ne '' ) ) { - $response = $defaultValue; - } - return $response; - } - else { - $| = 1; - $_ = <STDIN>; - chomp; - - if ("$defaultValue") { - return $_ ? $_ : $defaultValue; - } - else { - return $_; - } - return $_; - } -} - -sub trim { - my $str = shift; - - $str =~ s/^\s+//; - $str =~ s/^\s+$//; - - return $str; -} - -my $result; - -################################# -## MAIN ## -################################# - -$ENV{PERL_MM_USE_DEFAULT} = 1; -$ENV{PERL_MM_NONINTERACTIVE} = 1; -$ENV{AUTOMATED_TESTING} = 1; - -getopts('i'); - -InstallUtils::execCommand( "/usr/bin/tput", "clear" ); - -if ( $ENV{USER} ne "root" ) { - print "WARNING: You must run this script as the root user.\n"; - exit 0; -} - -print $msg; - -promptUser( "Hit ENTER to continue", "" ); - -chdir("/opt/traffic_ops/app"); - -if ( defined $opt_i && $opt_i == 1 ) { - if ( !-x "/usr/bin/yum" ) { - print "WARNING: You must install 'yum'.\n"; - exit 0; - } - - print "\nInstalling dependencies.\n"; - $result = InstallUtils::execCommand( "/usr/bin/yum", "install", @dependencies ); - if ( $result != 0 ) { - print "WARNING: dependency installation failed, look through the output and correct the problem.\n"; - exit 0; - } - print "\nBuilding perl modules\n"; - - $result = InstallUtils::execCommand( "/usr/bin/cpan", "-if", "YAML" ); - if ( $result != 0 ) { - print "WARNING: Failed to install YAML, look through the output and correct the problem.\n"; - exit 0; - } - - $result = InstallUtils::execCommand( "/usr/bin/cpan", "-if", "MIYAGAWA/Carton-v1.0.15.tar.gz" ); - if ( $result != 0 ) { - print "WARNING: Failed to install Carton, look through the output and correct the problem.\n"; - exit 0; - } -} - -$result = InstallUtils::execCommand( "/usr/local/bin/carton", "install" ); -if ( $result != 0 ) { - print "WARNING: Failure to build required perl modules, check the output and correct the problem.\n"; - exit 0; -} - -if ( !-s "/opt/traffic_ops/lib/perl5" ) { - print "Linking perl libraries...\n"; - if ( !-d "/opt/traffic_ops/lib" ) { - mkdir("/opt/traffic_ops/lib"); - } - symlink( "/opt/traffic_ops/app/local/lib/perl5", "/opt/traffic_ops/lib/perl5" ); - InstallUtils::execCommand( "/bin/chown", "-R", "trafops:trafops", "/opt/traffic_ops/lib" ); -} -print "Installing perl scripts\n"; -chdir("/opt/traffic_ops/app/local/bin"); -my $rc = InstallUtils::execCommand( "/bin/cp", "-R", ".", "/opt/traffic_ops/app/bin" ); -if ( $rc != 0 ) { - print "WARNING: Failed to copy perl scripts to /opt/traffic_ops/app/bin.\n"; -} http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/7180ab58/traffic_ops/install/lib/BuildPerlDeps.pm ---------------------------------------------------------------------- diff --git a/traffic_ops/install/lib/BuildPerlDeps.pm b/traffic_ops/install/lib/BuildPerlDeps.pm index 2bf5eed..98229e9 100644 --- a/traffic_ops/install/lib/BuildPerlDeps.pm +++ b/traffic_ops/install/lib/BuildPerlDeps.pm @@ -30,7 +30,7 @@ sub build { my $opt_i = shift; my $cpanLogFile = shift; - my @dependencies = ( "expat-devel", "mod_ssl", "mkisofs", "libpcap", "libpcap-devel", "libcurl", "libcurl-devel", "mysql-server", "mysql-devel", "openssl", "openssl-devel", "cpan", "gcc", "make", "pkgconfig", "automake", "autoconf", "libtool", "gettext", "libidn-devel" ); + my @dependencies = ( "expat-devel", "mod_ssl", "mkisofs", "libpcap", "libpcap-devel", "libcurl", "libcurl-devel", "openssl", "openssl-devel", "cpan", "gcc", "make", "pkgconfig", "automake", "autoconf", "libtool", "gettext", "libidn-devel" ); my $msg = << 'EOF';
