Changeset 516 in ProjectBuilder

Timestamp:

Aug 7, 2008, 2:24:42 PM (16 years ago)

Author:

Bruno Cornec

Message:

Remove everthing related to gettext for 0.9.3. Will have to look closer at which modules are really to be used for that (Locale::gettext or libintl)

File:

• 0.9.3/pb/bin/pb (modified) (9 diffs)

0.9.3/pb/bin/pb

@@ -22 +22 @@
 use ProjectBuilder::Version;
 use ProjectBuilder::Base;
-use ProjectBuilder::Display;
 use ProjectBuilder::Conf;
 use ProjectBuilder::Distribution;
@@ -351 +350 @@
     }
 pb_log_init($pbdebug, $pbLOG);
-pb_display_init("text","");
 
 # Handle root of the project if defined
@@ -608 +606 @@
                 next if (not -f $f);
                 if (not open(PATCH,$f)) {
-                    pb_display("Unable to open existing external patch file content $f\n");
+                    print "Unable to open existing external patch file content $f\n" ;
                     next;
                 }
@@ -1778 +1776 @@
 my $insfb = "rm -rf File-Basedir* ; wget http://search.cpan.org/CPAN/authors/id/P/PA/PARDUS/File-BaseDir-0.03.tar.gz ; tar xvfz File-BaseDir-0.03.tar.gz ; cd File-BaseDir* ; perl Makefile.PL ; make ; make install ; cd .. ; rm -rf File-BaseDir*";
 my $insms = "rm -rf Mail-Sendmail* ; wget http://search.cpan.org/CPAN/authors/id/M/MI/MIVKOVIC/Mail-Sendmail-0.79.tar.gz ; tar xvfz Mail-Sendmail-0.79.tar.gz ; cd Mail-Sendmail* ; perl Makefile.PL ; make ; make install ; cd .. ; rm -rf Mail-Sendmail*";
-my $inslg = "rm -rf gettext* ; wget http://search.cpan.org/CPAN/authors/id/P/PV/PVANDRY/gettext-1.05.tar.gz ; tar xvfz gettext-1.05.tar.gz ; cd gettext* ; perl Makefile.PL ; make ; make install ; cd .. ; rm -rf gettext*";
 my $cmtdm = "Installing Date-Manip perl module";
 my $cmtmb = "Installing Module-Build perl module";
@@ -1784 +1781 @@
 my $cmtfb = "Installing File-Basedir perl module";
 my $cmtms = "Installing Perl-Sendmail perl module";
-my $cmtlg = "Installing Perl-Locale-gettext perl module";
 my $cmtall = "Installing required modules";
 
@@ -1797 +1793 @@
     }
 
-    pb_system("yum -y $opt install rpm-build wget patch ntp sudo perl-DateManip perl-File-MimeInfo perl-ExtUtils-MakeMaker perl-Mail-Sendmail perl-Locale-gettext",$cmtall);
+    pb_system("yum -y $opt install rpm-build wget patch ntp sudo perl-DateManip perl-File-MimeInfo perl-ExtUtils-MakeMaker perl-Mail-Sendmail",$cmtall);
     if ($dver eq 4) {
         pb_system("$insmb","$cmtmb");
         pb_system("$insfm","$cmtfm");
         pb_system("$insfb","$cmtfb");
-        pb_system("$inslg","$cmtlg");
     }
 } elsif (( $dfam eq "rh" ) || ($ddir eq "sles") || (($ddir eq "suse") && (($dver eq "10.1") || ($dver eq "10.0"))) || ($ddir eq "slackware")) {
@@ -1812 +1807 @@
     pb_system("$insfb","$cmtfb");
     pb_system("$insms","$cmtms");
-    pb_system("$inslg","$cmtlg");
 } elsif ($ddir eq "suse") { 
     # New OpenSuSE
@@ -1818 +1812 @@
     pb_system("$insfm","$cmtfm");
     pb_system("$insfb","$cmtfb");
-    pb_system("export TERM=linux ; liste=\"\" ; for i in make wget patch sudo perl-DateManip perl-File-HomeDir perl-Mail-Sendmail perl-Locale-gettext xntp; do rpm -q \$i 1> /dev/null 2> /dev/null ; if [ \$\? != 0 ]; then liste=\"\$liste \$i\"; fi; done; echo \"Liste: \$liste\" ; if [ \"\$liste\" != \"\" ]; then yast2 -i \$liste ; fi","$cmtall");
+    pb_system("export TERM=linux ; liste=\"\" ; for i in make wget patch sudo perl-DateManip perl-File-HomeDir perl-Mail-Sendmail xntp; do rpm -q \$i 1> /dev/null 2> /dev/null ; if [ \$\? != 0 ]; then liste=\"\$liste \$i\"; fi; done; echo \"Liste: \$liste\" ; if [ \"\$liste\" != \"\" ]; then yast2 -i \$liste ; fi","$cmtall");
 } elsif ( $dfam eq "md" ) {
-        pb_system("urpmi.update -a ; urpmi --auto rpm-build wget sudo patch ntp-client perl-File-MimeInfo perl-Mail-Sendmail perl-Locale-gettext","$cmtall");
+        pb_system("urpmi.update -a ; urpmi --auto rpm-build wget sudo patch ntp-client perl-File-MimeInfo perl-Mail-Sendmail","$cmtall");
         if (($ddir eq "mandrake") && ($dver eq "10.1")) {
             pb_system("$insdm","$cmtdm");
-            pb_system("$inslg","$cmtlg");
         } else {
             pb_system("urpmi --auto perl-DateManip","$cmtdm");
-            pb_system("urpmi --auto perl-Locale-gettext","$cmtdm");
         }
 } elsif ( $dfam eq "du" ) {
@@ -1833 +1825 @@
         pb_system("$insfb","$cmtfb");
         pb_system("$insfm","$cmtfm");
-        pb_system("apt-get -y install wget patch ssh sudo debian-builder dh-make fakeroot ntpdate libmodule-build-perl libdate-manip-perl libmail-sendmail-perl liblocale-gettext-perl","$cmtall");
+        pb_system("apt-get -y install wget patch ssh sudo debian-builder dh-make fakeroot ntpdate libmodule-build-perl libdate-manip-perl libmail-sendmail-perl","$cmtall");
     } else  {
-        pb_system("apt-get update; apt-get -y install wget patch openssh-server dpkg-dev sudo debian-builder dh-make fakeroot ntpdate libfile-mimeinfo-perl libmodule-build-perl libdate-manip-perl libmail-sendmail-perl liblocale-gettext-perl","$cmtall");
+        pb_system("apt-get update; apt-get -y install wget patch openssh-server dpkg-dev sudo debian-builder dh-make fakeroot ntpdate libfile-mimeinfo-perl libmodule-build-perl libdate-manip-perl libmail-sendmail-perl","$cmtall");
     }
 } elsif ( $dfam eq "gen" ) {
         #system "emerge -u system";
-        pb_system("emerge wget sudo ntp DateManip File-MimeInfo Mail-Sendmail Locale-gettext","$cmtall");
+        pb_system("emerge wget sudo ntp DateManip File-MimeInfo Mail-Sendmail","$cmtall");
 } else {
     pb_log(0,"No pkg to install\n");