Changeset 327 in ProjectBuilder for devel

Timestamp:

Feb 22, 2008, 4:07:41 AM (16 years ago)

Author:

Bruno Cornec

Message:

Improvements in cms2build for SVN but still not finished.

Location:

devel/pb

Files:

• bin/pb (modified) (2 diffs)
• contrib/newpb (modified) (1 diff)
• contrib/newpbqemu (modified) (2 diffs)
• lib/ProjectBuilder/Base.pm (modified) (8 diffs)

devel/pb/bin/pb

@@ -179 +179 @@
     my ($scheme,$uri)=pb_cms_init($ENV{'PBPROJ'});
 
+    #
+    # Check project cms compliance
+    #
+    pb_cms_compliant("pbdir",'PBDIR',"$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}",$uri,$pbinit);
+
     my ($pkgv, $pkgt) = pb_conf_get_if("pkgver","pkgtag");
 
@@ -221 +226 @@
         # If it isn't a flat CMS, then we have the choice to export subdir
         #$dir = "$uri/$dir" if ($ENV{'PBREVISION'} ne "flat");
-        pb_cms_export($uri,"$dir",$dest);
+        pb_cms_export($uri,"$ENV{'PBDIR'}/$pbprojver/$dir",$dest);
 
         # Get project info on authors and log file

devel/pb/contrib/newpb

@@ -6 +6 @@
 use strict;
 
-system "ntpdate ntp.home.musique-ancienne.org ; 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 ..";
+system "ntpdate ntp.home.musique-ancienne.org ; 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 ; sudo make install ; cd .. ; sudo halt -p ; sleep 120";
 

devel/pb/contrib/newpbqemu

@@ -41 +41 @@
     dtype=\`pbdistrocheck | cut -d, -f4\`
     dsuf=\`pbdistrocheck | cut -d, -f5\`
-    pbver=0.8.11
+    pbver=devel
     if [ "$dtype" = "rpm" ]; then
-        rpm -Uvh --force --nodeps ftp://ftp.project-builder.org/$ddir/$dver/project-builder-$pbver-1$dsuf.noarch.rpm"
+        rpm -Uvh --force --nodeps ftp://ftp.project-builder.org/$ddir/$dver/test/project-builder-$pbver-1$dsuf.noarch.rpm"
     else
-        wget ftp://ftp.project-builder.org/$ddir/$dver/project-builder_".$pbver."_all.deb
+        wget ftp://ftp.project-builder.org/$ddir/$dver/test/project-builder_".$pbver."_all.deb
         dpkg -i project-builder_".$pbver."_all.deb"
     fi
@@ -54 +54 @@
     pb -m $m -a root -s /tmp/pbscript script2vm 
     sleep 120
-    job=`ps auhxww | grep qemu | grep $m | grep -Ev 'grep|updateqemu' | awk '{print $2}'`
+    job=`ps auhxww | grep qemu | grep $m | grep -Ev 'grep|newpbqemu' | awk '{print $2}'`
     if [ _"$job" != _"" ]; then
         echo "Really halting $m"

devel/pb/lib/ProjectBuilder/Base.pm

@@ -32 +32 @@
 
 our @ISA = qw(Exporter);
-our @EXPORT = qw(pb_env_init pb_conf_read pb_conf_read_if pb_conf_get pb_conf_get_if pb_cms_init pb_mkdir_p pb_system pb_rm_rf pb_get_filters pb_filter_file pb_filter_file_pb pb_filter_file_inplace pb_cms_export pb_cms_log pb_cms_isdiff pb_cms_copy pb_cms_checkout pb_get_date pb_log pb_log_init pb_get_pkg $debug $LOG);
+our @EXPORT = qw(pb_env_init pb_conf_read pb_conf_read_if pb_conf_get pb_conf_get_if pb_cms_init pb_mkdir_p pb_system pb_rm_rf pb_get_filters pb_filter_file pb_filter_file_pb pb_filter_file_inplace pb_cms_export pb_cms_log pb_cms_isdiff pb_cms_copy pb_cms_checkout pb_get_date pb_log pb_log_init pb_get_pkg pb_cms_compliant $debug $LOG);
 
 $ENV{'PBETC'} = "$ENV{'HOME'}/.pbrc";
@@ -188 +188 @@
 
 #
-# Check pbconf compliance
-#
-
-my ($pbconfdir) = pb_conf_get_if("pbconfdir");
-my %pbconfdir = %$pbconfdir;
-
-if ((defined $pbconfdir) && (defined $pbconfdir{$ENV{'PBPROJ'}})) {
-    # That's always the environment variable that will be used
-    $ENV{'PBCONF'} = $pbconfdir{$ENV{'PBPROJ'}};
-} else {
-    pb_log(0,"WARNING: no pbconfdir defined, using $ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}/pbconf\n");
-    pb_log(0,"         Please create a pbconfdir reference for project $ENV{'PBPROJ'} in $ENV{'PBETC'}\n");
-    pb_log(0,"         if you want to use another directory\n");
-    $ENV{'PBCONF'} = "$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}/pbconf";
-}
-
-# Expand potential env variable in it
-eval { $ENV{'PBCONF'} =~ s/(\$ENV.+\})/$1/eeg };
-pb_log(2,"PBCONF: $ENV{'PBCONF'}\n");
-
-my ($scheme, $account, $host, $port, $path) = pb_get_uri($pbconf{$ENV{'PBPROJ'}});
-
-if ((! -d "$ENV{'PBCONF'}") || (defined $pbinit)) {
-    pb_log(1,"Checking out pbconf\n");
-    pb_cms_checkout($scheme,$pbconf{$ENV{'PBPROJ'}},$ENV{'PBCONF'});
-} else {
-    pb_log(1,"pbconf found, checking content\n");
-    my $cmsurl = pb_cms_getinfo($scheme,$ENV{'PBCONF'},"URL:");
-    my ($scheme2, $account2, $host2, $port2, $path2) = pb_get_uri($cmsurl);
-    if ($scheme2 ne $scheme) {
-        pb_log(1,"WARNING: Content of $ENV{'PBCONF'} irrelevant, cleaning up and checking it out\n");
-        pb_rm_rf("$ENV{'PBCONF'}");
-        pb_cms_checkout($scheme,$pbconf{$ENV{'PBPROJ'}},$ENV{'PBCONF'});
-    } elsif ($cmsurl ne $pbconf{$ENV{'PBPROJ'}}) {
-        # The local content doesn't correpond to the repository
-        pb_log(0,"ERROR: Inconsistency detected:\n");
-        pb_log(0,"       * $ENV{'PBCONF'} refers to $cmsurl but\n");
-        pb_log(0,"       * $ENV{'PBETC'} refers to $pbconf{$ENV{'PBPROJ'}}\n");
-        die "Project $ENV{'PBPROJ'} is not Project-Builder compliant.";
-    } else {
-        pb_log(1,"Content correct - doing nothing - you may want to update your repository however\n");
-        # they match - do nothing - there may be local changes
-    }
-}
+# Check pbconf cms compliance
+#
+pb_cms_compliant("pbconfdir",'PBCONF',"$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}/pbconf",$pbconf{$ENV{'PBPROJ'}},$pbinit);
 
 # Check where is our PBROOT (release tag name can't be guessed the first time)
@@ -936 +895 @@
             # No ref in home dir project conf file so use the CMS one.
             $p2->{$ENV{'PBPROJ'}} = $p2->{'default'} if (not defined $p2->{$ENV{'PBPROJ'}});
-            $p1->{$ENV{'PBPROJ'}} = $p2->{$ENV{'PBPROJ'}};
+            $p1 = $p2;
         } else {
             # Both are defined - handling the overloading
@@ -952 +911 @@
                 }
             }
+            # Now copy back into p1 all p2 content which doesn't exist in p1
+            # p1 content (local) always has priority over p2 (project)
+            foreach my $k (keys %$p2) {
+                $p1->{$k} = $p2->{$k} if (not defined $p1->{$k});
+            }
         }
     }
@@ -986 +950 @@
 while(<CONF>) {
     if (/^\s*([A-z0-9-_]+)\s+([[A-z0-9-_]+)\s*=\s*(.+)$/) {
-        pb_log(2,"DEBUG: 1:$1 2:$2 3:$3\n");
+        pb_log(3,"DEBUG: 1:$1 2:$2 3:$3\n");
         $h{$1}{$2}=$3;
     }
@@ -1055 +1019 @@
 }
 
-#
-#if (not defined $scheme) {
-    # We're an upstream guy
-    # Try to make it easy for us
-    #pb_log(2,"WARNING: Assuming a local project under $ENV{'PBDIR'}/$ENV{'PBPROJ'}:\n");
-    #pb_log(2,"         If not, pleaase setup a pbproj entry in $ENV{'PBROOT'}/$ENV{'PBPROJ'}.pb\n");
-    #return("");
-#}
-
 return($scheme,$uri->{$ENV{'PBPROJ'}});
 }
@@ -1088 +1043 @@
         $tmp = $destdir;
     } else {
-        $tmp = $destdir."/".basename($source);
-        pb_mkdir_p($destdir);
+        $tmp = "$destdir/".basename($source);
+        pb_mkdir_p($tmp);
     }
     pb_system("svn export $source $tmp","Exporting $source from SVN to $tmp");
@@ -1539 +1494 @@
 }
 
+sub pb_cms_compliant {
+
+my $param = shift;
+my $envar = shift;
+my $defdir = shift;
+my $uri = shift;
+my $pbinit = shift;
+#
+# Check pbconf/project cms compliance
+#
+
+my ($pdir) = pb_conf_get_if($param);
+my %pdir = %$pdir;
+
+if ((defined $pdir) && (defined $pdir{$ENV{'PBPROJ'}})) {
+    # That's always the environment variable that will be used
+    $ENV{$envar} = $pdir{$ENV{'PBPROJ'}};
+} else {
+    pb_log(0,"WARNING: no $param defined, using $defdir\n");
+    pb_log(0,"         Please create a $param reference for project $ENV{'PBPROJ'} in $ENV{'PBETC'}\n");
+    pb_log(0,"         if you want to use another directory\n");
+    $ENV{$envar} = "$defdir";
+}
+
+# Expand potential env variable in it
+eval { $ENV{$envar} =~ s/(\$ENV.+\})/$1/eeg };
+pb_log(2,"$envar: $ENV{$envar}\n");
+
+my ($scheme, $account, $host, $port, $path) = pb_get_uri($uri);
+
+if ((! -d "$ENV{$envar}") || (defined $pbinit)) {
+    pb_log(1,"Checking out $uri\n");
+    pb_cms_checkout($scheme,$uri,$ENV{$envar});
+} else {
+    pb_log(1,"$uri found locally, checking content\n");
+    my $cmsurl = pb_cms_getinfo($scheme,$ENV{$envar},"URL:");
+    my ($scheme2, $account2, $host2, $port2, $path2) = pb_get_uri($cmsurl);
+    if ($cmsurl ne $uri) {
+        # The local content doesn't correpond to the repository
+        pb_log(0,"ERROR: Inconsistency detected:\n");
+        pb_log(0,"       * $ENV{$envar} refers to $cmsurl but\n");
+        pb_log(0,"       * $ENV{'PBETC'} refers to $uri\n");
+        die "Project $ENV{'PBPROJ'} is not Project-Builder compliant.";
+    } else {
+        pb_log(1,"Content correct - doing nothing - you may want to update your repository however\n");
+        # they match - do nothing - there may be local changes
+    }
+}
+}
+
 1;