Changeset 291 in ProjectBuilder

Timestamp:

Dec 20, 2007, 11:10:49 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Removes AppConfig dependency by using just a perl regexp instead.
• Interface to the version field has also changed

Location:

devel

Files:

• pb/bin/pb (modified) (3 diffs)
• pb/contrib/pbsetupqemu (modified) (2 diffs)
• pb/lib/ProjectBuilder/Base.pm (modified) (6 diffs)
• pbconf/pb.pb (modified) (2 diffs)
• pbconf/project-builder/rpm/project-builder.spec (modified) (1 diff)

devel/pb/bin/pb

@@ -14 +14 @@
 use Data::Dumper;
 use English;
-use AppConfig qw(:argcount :expand);
 use File::Basename;
 use File::Copy;
@@ -401 +400 @@
             foreach my $f (@specfile) {
                 if ($f =~ /\.spec$/) {
-                    pb_system("rpmbuild --define \"packager $pbpackager\" --define \"_topdir $ENV{'PBBUILDDIR'}\" -ba $f","Building package with $f under $ENV{'PBBUILDDIR'}");
+                    pb_system("rpmbuild --define \'packager $pbpackager\' --define \"_topdir $ENV{'PBBUILDDIR'}\" -ba $f","Building package with $f under $ENV{'PBBUILDDIR'}");
                     last;
                 }
@@ -569 +568 @@
             # This is a test pkg => target dir is under test
             $tdir .= "/test";
+        }
     } else {
         return;

devel/pb/contrib/pbsetupqemu

@@ -82 +82 @@
     #chomp($topbuilddir);
 
-    if ( $dver <= 4 ) {
-        # FC4 - AppConfig unavailable
-        system "yum -y $opt install neon newt-devel slang-devel autoconf automake libtool gcc rpm-build wget gcc-c++ docbook-utils-pdf ImageMagick man patch cdrecord mkisofs perl-DateManip ntp sudo ; rm -rf AppConfig-* ; rm -rf AppConfig* ; wget http://search.cpan.org/CPAN/authors/id/A/AB/ABW/AppConfig-1.66.tar.gz ; tar xvfz AppConfig-1.66.tar.gz ; cd AppConfig* ; perl Makefile.PL ; make ; make install ; cd ..";
-    } else {
-        # FC5/6/7
-        system "yum -y $opt install neon newt-devel slang-devel autoconf automake libtool gcc rpm-build wget gcc-c++ docbook-utils-pdf ImageMagick man patch cdrecord mkisofs ntp sudo perl-AppConfig perl-DateManip";
-    }
+    system "yum -y $opt install neon newt-devel slang-devel autoconf automake libtool gcc rpm-build wget gcc-c++ docbook-utils-pdf ImageMagick man patch cdrecord mkisofs ntp sudo perl-DateManip";
 } elsif (( $dfam eq "rh" ) || ($ddir eq "sles") || (($ddir eq "suse") && (($dver eq "10.1") || ($dver eq "10.0"))) || (($ddir eq "mandrake") && ($dver eq "10.1"))) {
     # Suppose pkg are installed already
     system "rpm -e lsb 2>&1 > /dev/null";
-    system "rm -rf AppConfig-* ; wget http://search.cpan.org/CPAN/authors/id/A/AB/ABW/AppConfig-1.66.tar.gz ; tar xvfz AppConfig-1.66.tar.gz ; cd AppConfig* ; perl Makefile.PL ; make ; make install ; cd .. ; rm -rf DateManip* ; wget http://search.cpan.org/CPAN/authors/id/S/SB/SBECK/Date-Manip-5.46.tar.gz ; tar xvfz Date-Manip-5.46.tar.gz ; cd Date-Manip* ; perl Makefile.PL ; make ; make install ; cd .. ";
+    system "rm -rf DateManip* ; wget http://search.cpan.org/CPAN/authors/id/S/SB/SBECK/Date-Manip-5.46.tar.gz ; tar xvfz Date-Manip-5.46.tar.gz ; cd Date-Manip* ; perl Makefile.PL ; make ; make install ; cd .. ";
 } elsif ($ddir eq "suse") { 
     # New OpenSuSE
-    system "export TERM=linux ; liste=\"\" ; for i in neon newt-devel slang-devel autoconf automake libtool make gcc wget gcc-c++ docbook-utils ImageMagick man patch mkisofs sudo perl-DateManip perl-AppConfig perl-File-HomeDir 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";
+    system "export TERM=linux ; liste=\"\" ; for i in neon newt-devel slang-devel autoconf automake libtool make gcc wget gcc-c++ docbook-utils ImageMagick man patch mkisofs sudo perl-DateManip perl-File-HomeDir 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";
 } elsif ( $dfam eq "md" ) {
     if (( $dver eq "2006.0" ) || ( $dver eq "10.2" )) {
         # mondo not available
-        system "urpmi.update -a ; urpmi --auto neon newt-devel slang-devel glibc-static-devel autoconf automake libtool gcc rpm-build wget gcc-c++ docbook-utils-pdf ImageMagick sudo man patch mkisofs cdrecord ntp-client perl-AppConfig perl-DateManip";
+        system "urpmi.update -a ; urpmi --auto neon newt-devel slang-devel glibc-static-devel autoconf automake libtool gcc rpm-build wget gcc-c++ docbook-utils-pdf ImageMagick sudo man patch mkisofs cdrecord ntp-client perl-DateManip";
     } else {
-        system "urpmi.update -a ; urpmi --auto neon newt-devel slang-devel glibc-static-devel autoconf automake libtool gcc rpm-build wget gcc-c++ sudo docbook-utils-pdf ImageMagick man patch mondo mkisofs cdrecord ntp-client perl-AppConfig perl-DateManip";
+        system "urpmi.update -a ; urpmi --auto neon newt-devel slang-devel glibc-static-devel autoconf automake libtool gcc rpm-build wget gcc-c++ sudo docbook-utils-pdf ImageMagick man patch mondo mkisofs cdrecord ntp-client perl-DateManip";
     }
 } elsif ( $dfam eq "du" ) {
     if (( $dver eq "3.1" ) && ($ddir eq "debian")) {
-        system "apt-get update; apt-get -y install autoconf automake libtool g++ wget patch mondo groff imagemagick docbook-utils docbook2x docbook-to-man ssh dpkg-dev sudo debian-builder dh-make fakeroot libnewt-dev ntpdate libncurses5-dev libdate-manip-perl libappconfig-perl";
+        system "apt-get update; apt-get -y install autoconf automake libtool g++ wget patch mondo groff imagemagick docbook-utils docbook2x docbook-to-man ssh dpkg-dev sudo debian-builder dh-make fakeroot libnewt-dev ntpdate libncurses5-dev libdate-manip-perl";
     } elsif (( $dver eq "7.10" ) && ($ddir eq "ubuntu")) {
-        system "apt-get update; apt-get -y install autoconf automake libtool g++ wget patch groff imagemagick docbook-utils docbook2x docbook-to-man openssh-server dpkg-dev sudo debian-builder dh-make fakeroot libnewt-dev ntpdate libncurses5-dev libdate-manip-perl libappconfig-perl wodim genisoimage afio buffer";
+        system "apt-get update; apt-get -y install autoconf automake libtool g++ wget patch groff imagemagick docbook-utils docbook2x docbook-to-man openssh-server dpkg-dev sudo debian-builder dh-make fakeroot libnewt-dev ntpdate libncurses5-dev libdate-manip-perl wodim genisoimage afio buffer";
     } else  {
-        system "apt-get update; apt-get -y install autoconf automake libtool g++ wget patch mondo groff imagemagick docbook-utils docbook2x docbook-to-man openssh-server dpkg-dev sudo debian-builder dh-make fakeroot libnewt-dev ntpdate libncurses5-dev libdate-manip-perl libappconfig-perl";
+        system "apt-get update; apt-get -y install autoconf automake libtool g++ wget patch mondo groff imagemagick docbook-utils docbook2x docbook-to-man openssh-server dpkg-dev sudo debian-builder dh-make fakeroot libnewt-dev ntpdate libncurses5-dev libdate-manip-perl";
     }
 } elsif ( $dfam eq "gen" ) {
-        #system "emerge -u system ; emerge neon newt slang autoconf automake subversion libtool gcc wget vim man groff lynx grub afio buffer sudo ntp AppConfig DateManip";
+        #system "emerge -u system ; emerge neon newt slang autoconf automake subversion libtool gcc wget vim man groff lynx grub afio buffer sudo ntp DateManip";
 } else {
     print "No pkg to install\n";
@@ -140 +134 @@
 system "/usr/sbin/ntpdate ntp.home.musique-ancienne.org";
 
-# Patch AppConfig 
-my $module=`find /usr/*/perl5 -type f -name File.pm | grep AppConfig/File.pm`;
-chomp($module);
-$found = 0;
-open(PBFILE,$module) || die "Unable to open $module";
-while (<PBFILE>) {
-    $found = 1 if (/Fix a bug if the variable is a hash/);
-}
-close(PBFILE);
-
-if ( $found == 0 ) {
-    chdir basename($module);
-    open(PBFILE,$module) || die "Unable to open $module";
-    my $module1 = $module."new";
-    open(PBOUT," > $module1") || die "Unable to open $module1";
-    while (<PBFILE>) {
-            s/^use AppConfig;/use AppConfig qw(:argcount);/;
-            if (/# variables prefixed '-' are reset to their default values/) {
-print PBOUT << 'EOF';
-                 # Fix a bug if the variable is a hash - 1 has been created as a key
-                 if ($nargs eq AppConfig::ARGCOUNT_HASH) {
-                     delete $state->{ VARIABLE }->{ $variable }{1};
-                 }
-
-EOF
-            }
-            print PBOUT "$_";
-    }
-    close(PBFILE);
-    close(PBOUT);
-    rename($module1,$module);
-}
-
 system "rm -rf project-builder-* ; wget --passive-ftp ftp://ftp.mondorescue.org/src/project-builder-latest.tar.gz ; tar xvfz project-builder-latest.tar.gz ; cd project-builder-* ; perl Makefile.PL ; make ; make install ; cd ..";
 

devel/pb/lib/ProjectBuilder/Base.pm

@@ -11 +11 @@
 use File::Path;
 use File::Temp qw /tempdir/;
-use AppConfig qw(ARGCOUNT_HASH);
 use Data::Dumper;
 
@@ -127 +126 @@
         }
     }
-    die "Invalid version name $ENV{'PBVER'} in $ENV{'PBCONF'}/$proj.pb" if (($ENV{'PBVER'} !~ /[0-9.]+/) && (not exists $version{$ENV{'PBVER'}}));
+    die "Invalid version name $ENV{'PBVER'} in $ENV{'PBCONF'}/$proj.pb" if (($ENV{'PBVER'} !~ /[0-9.]+/) && (not defined $version) && ($ENV{'PBVER'} =~ /$version{$proj}/));
     
     if (not defined $ENV{'PBTAG'}) {
@@ -754 +753 @@
 }
 
-sub pb_no_err {
-}
-
 # Function which returns a pointer on a hash
 # corresponding to a declaration (arg2) in a conf file (arg1)
@@ -765 +761 @@
 my $trace;
 my @ptr;
+my %h;
 
 my $debug = 0;
 
-if ($debug > 0) {
-    $trace = 1;
-} else {
-    $trace = 0;
-}
-
-
-my $config = AppConfig->new({
-                            # Auto Create variables mentioned in Conf file
-                            CREATE => 1,
-                            DEBUG => $trace,
-                            ERROR => \&pb_no_err,
-                            GLOBAL => {
-                                # Each conf item is a hash
-                                ARGCOUNT => ARGCOUNT_HASH,
-                            },
-                        });
-$config->file($conffile);
+open(CONF,$conffile) || die "Unable to open $conffile";
+while(<CONF>) {
+    if (/^\s*([A-z0-9-_]+)\s+([[A-z0-9-_]+)\s*=\s*(.+)$/) {
+        print "DEBUG: 1:$1 2:$2 3:$3\n" if ($debug >= 1);
+        $h{$1}{$2}=$3;
+    }
+}
+close(CONF);
+
 for my $param (@param) {
-    push @ptr,$config->get($param);
-}
-print "DEBUG: params: ".Dumper(@param)." ".Dumper(@ptr)."\n" if ($debug >= 1);
+    push @ptr,$h{$param};
+}
+print "DEBUG: h:".Dumper(%h)." param:".Dumper(@param)." ptr:".Dumper(@ptr)."\n" if ($debug >= 1);
 return(@ptr);
 }
@@ -1030 +1018 @@
 my $ptr; # returned value pointer on the hash of filters
 my %ptr;
+my %h;
 
 # Global filter files first, then package specificities
@@ -1062 +1051 @@
     print $LOG "DEBUG ffiles: ".Dumper(\@ffiles)."\n" if ($debug >= 1);
 
-    my $config = AppConfig->new({
-        # Auto Create variables mentioned in Conf file
-        CREATE => 1,
-        DEBUG => 0,
-        GLOBAL => {
-            # Each conf item is a hash
-            ARGCOUNT => AppConfig::ARGCOUNT_HASH
+    foreach my $f (@ffiles) {
+        open(CONF,$f) || next;
+        while(<CONF>)  {
+            if (/^\s*([A-z0-9-_]+)\s+([[A-z0-9-_]+)\s*=\s*(.+)$/) {
+                $h{$1}{$2}=$3;
+            }
         }
-    });
-
-    $config->file(@ffiles);
-    $ptr = $config->get("filter");
-    print $LOG "DEBUG f:".Dumper($ptr)."\n" if ($debug >= 1);
+        close(CONF);
+
+        $ptr = $h{"filter"};
+        print $LOG "DEBUG f:".Dumper($ptr)."\n" if ($debug >= 1);
+    }
 } else {
     $ptr = { };

devel/pbconf/pb.pb

@@ -66 +66 @@
 #pkgver project-builder = devel
 #pkgtag project-builder = 1
-pkgver nil
-pkgtag nil
 
 # Is it a test version
-testver pb
+testver pb = true
 
 # Hash of default package/package directory
@@ -79 +77 @@
 
 # Hash of valid version names
-version devel
-version stable
+version pb = devel,stable
 
 # List of files per pkg on which to apply filters

devel/pbconf/project-builder/rpm/project-builder.spec

@@ -16 +16 @@
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 BuildArch:  noarch
-Requires:   perl >= 5.8.4, perl-DateManip, perl-AppConfig, PBDEP
+Requires:   perl >= 5.8.4, perl-DateManip, PBDEP
 Provides:   perl(ProjectBuilder::Changelog), perl(ProjectBuilder::Base), perl(ProjectBuilder::Distribution), perl(ProjectBuilder::Version)