Changeset 1097

Timestamp:

10/25/10 00:26:55 (3 years ago)

Author:

bruno

Message:

• Fix #36 by adding new targets to pb with sbx2 suffix. They replace in feature the previous cms2 targets which now becomes really an extract from the Configuration Management System, where the former are from the exported content aka sandbox.

Location:

devel/pb

Files:

• bin/pb (modified) (13 diffs)
• lib/ProjectBuilder/CMS.pm (modified) (4 diffs)
• lib/ProjectBuilder/Env.pm (modified) (1 diff)

devel/pb/bin/pb

@@ -142 +142 @@
 =over 4
 
-=item B<cms2build>
+=item B<sbx2build>
 
 Create tar files for the project under your CMS. 
-CMS supported are SVN, CVS and Mercurial
+Current state of the exported content is taken.
+CMS supported are SVN, SVK, CVS, Git and Mercurial
 parameters are packages to build
 if not using default list
 
+=item B<cms2build>
+
+Create tar files for the project under your CMS. 
+Current state of the CMS is taken.
+CMS supported are SVN, SVK, CVS, Git and Mercurial
+parameters are packages to build
+if not using default list
+
 =item B<build2pkg>
 
@@ -157 +166 @@
 cms2build + build2pkg
 
+=item B<sbx2pkg>
+
+sbx2build + build2pkg
+
 =item B<build2ssh>
 
 Send the tar files to a SSH host
+
+=item B<sbx2ssh>
+
+sbx2build + build2ssh
 
 =item B<cms2ssh>
@@ -179 +196 @@
 Create packages in VEs, creating it if needed
 and send those packages to a SSH host once built
+
+=item B<sbx2vm>
+
+sbx2build + build2vm
+
+=item B<sbx2ve>
+
+sbx2build + build2ve
 
 =item B<cms2vm>
@@ -441 +466 @@
 # Act depending on action
 if ($action =~ /^cms2build$/) {
-    pb_cms2build();
+    pb_cms2build("CMS");
+} elsif ($action =~ /^sbx2build$/) {
+    pb_cms2build("SandBox");
 } elsif ($action =~ /^build2pkg$/) {
     pb_build2pkg();
 } elsif ($action =~ /^cms2pkg$/) {
-    pb_cms2build();
+    pb_cms2build("CMS");
+    pb_build2pkg();
+} elsif ($action =~ /^sbx2pkg$/) {
+    pb_cms2build("SandBox");
     pb_build2pkg();
 } elsif ($action =~ /^build2ssh$/) {
     pb_build2ssh();
 } elsif ($action =~ /^cms2ssh$/) {
-    pb_cms2build();
+    pb_cms2build("CMS");
+    pb_build2ssh();
+} elsif ($action =~ /^sbxs2ssh$/) {
+    pb_cms2build("SandBox");
     pb_build2ssh();
 } elsif ($action =~ /^pkg2ssh$/) {
@@ -459 +492 @@
     pb_build2v("vm","build");
 } elsif ($action =~ /^cms2ve$/) {
-    pb_cms2build();
+    pb_cms2build("CMS");
+    pb_build2v("ve","build");
+} elsif ($action =~ /^sbx2ve$/) {
+    pb_cms2build("SandBox");
     pb_build2v("ve","build");
 } elsif ($action =~ /^cms2vm$/) {
-    pb_cms2build();
+    pb_cms2build("CMS");
+    pb_build2v("vm","build");
+} elsif ($action =~ /^sbx2vm$/) {
+    pb_cms2build("SandBox");
     pb_build2v("vm","build");
 } elsif ($action =~ /^launchvm$/) {
@@ -528 +567 @@
     my %pb;             # Structure to store conf info
 
+    die "pb_cms2build requires a parameter: Web, SandBox or CMS" if (not defined $param);
+
     # If Website, then pkg is only the website
-    if ((defined $param) && ($param eq "Web")) {
+    if ($param eq "Web") {
         ($webdir) = pb_conf_get("webdir");
         pb_log(2,"webdir: ".Dumper($webdir)."\n");
@@ -540 +581 @@
     }
 
-    my ($scheme, $uri) = pb_cms_init($pbinit);
+    my ($scheme, $uri) = pb_cms_init($pbinit,$param);
 
     # We need 2 lines here
@@ -586 +627 @@
         my $dir = $defpkgdir->{$pbpkg};
         $dir = $extpkgdir->{$pbpkg} if (not defined $dir);
-        $dir = $webdir->{$ENV{'PBPROJ'}} if ((defined $param) && ($param eq "Web"));
+        $dir = $webdir->{$ENV{'PBPROJ'}} if ($param eq "Web");
         pb_log(2,"def:".Dumper($defpkgdir)." ext: ".Dumper($extpkgdir)." \n");
 
         # Exporting content from CMS
-        my $preserve = pb_cms_export($uri,"$ENV{'PBDIR'}/$dir",$dest);
+        my $sourcedir = undef;
+        my $sourceuri = $uri;
+        if ($param eq "SandBox") {
+            # Point to the local instance
+            $sourcedir = "$ENV{'PBDIR'}/$dir";
+        } else {
+            # Get it from a subdir of the URI with same version as localy but different root
+            $sourceuri = "$ENV{'PBDIR'}/$dir";
+            $sourceuri =~ s|^$ENV{'PBPROJDIR'}/|$uri|;
+        }
+        my $preserve = pb_cms_export($sourceuri,$sourcedir,$dest);
 
         # Generated fake content for test versions to speed up stuff
@@ -617 +668 @@
         my %patches;
 
-        # Get list of distributions for which I need to generate build files
+        # Get list of distributions for which we need to generate build files
         if (defined $pt[0]->{$ENV{'PBPROJ'}}) {
             $tmpl .= $pt[0]->{$ENV{'PBPROJ'}};
         }
         if (defined $pt[1]->{$ENV{'PBPROJ'}}) {
-            # the 2 lists needs to be grouped with a ',' separating them
+            # The 2 lists needs to be grouped with a ',' separating them
             if ($tmpl ne "") {
                 $tmpl .= ",";
@@ -645 +696 @@
     
         # Do not do that for website
-        if ((not defined $param) || ($param ne "Web")) {
+        if ($param ne "Web") {
             pb_log(0,"Build files are being generated for ...\n");
             my %virt;
@@ -768 +819 @@
 
         # Do not do that for website
-        if ((not defined $param) || ($param ne "Web")) {
+        if ($param ne "Web") {
             my %tmp;
+            my $warnflag = 0;
             # Filter potential patches (local + remote)
             pb_log(0,"Delivering and compressing patches ");
@@ -776 +828 @@
                 foreach my $pf (split(/,/,$patches{$v})) {
                     my $pp = basename($pf);
+                    if ($param eq "SandBox") {
+                        $warnflag = 1;
+                    }
                     pb_cms_export($pf,undef,"$dest/pbconf/$v/pbpatch");
                     pb_filter_file_inplace($ptr,"$dest/pbconf/$v/pbpatch/$pp",\%pb);
@@ -786 +841 @@
             }
             pb_log(0,"\n");
+            pb_log(0,"WARNING: Patches are always taken from repository not local export\n") if ($warnflag == 1);
         } else {
             # Instead call News generation

devel/pb/lib/ProjectBuilder/CMS.pm

@@ -57 +57 @@
 
 my $pbinit = shift || undef;
+my $param = shift || undef;
 
 my ($pburl) = pb_conf_get("pburl");
@@ -70 +71 @@
     $ENV{'PBPROJDIR'} = "$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}";
 }
+# Expand potential env variable in it to allow string replacement
+eval { $ENV{'PBPROJDIR'} =~ s/(\$ENV.+\})/$1/eeg };
+
 
 # Computing the default dir for PBDIR.
@@ -101 +105 @@
     $ENV{'PBCMSLOGFILE'}="flat.log";
 } elsif ($scheme =~ /^svn/) {
-    # svnversion more precise than svn info
-    $tmp = `(cd "$ENV{'PBDIR'}" ; $vcscmd"version" .)`;
+    # svnversion more precise than svn info if sbx
+    if ($param eq "CMS") {
+        $tmp = `(LANGUAGE=C $vcscmd info $pburl->{$ENV{'PBPROJ'}} | grep -E '^Revision:' | cut -d: -f2)`;
+        $tmp =~ s/\s+//;
+    } else {
+        $tmp = `(cd "$ENV{'PBDIR'}" ; $vcscmd"version" .)`;
+    }
     chomp($tmp);
     $ENV{'PBREVISION'}=$tmp;
     $ENV{'PBCMSLOGFILE'}="svn.log";
 } elsif ($scheme =~ /^svk/) {
-    $tmp = `(cd "$ENV{'PBDIR'}" ; $vcscmd info . | grep -E '^Revision:' | cut -d: -f2)`;
+    $tmp = `(cd "$ENV{'PBDIR'}" ; LANGUAGE=C $vcscmd info . | grep -E '^Revision:' | cut -d: -f2)`;
     $tmp =~ s/\s+//;
     chomp($tmp);
@@ -267 +276 @@
     } else {
         # Probably not right, should be checked, but that way I'll notice it :-)
+        pb_log(0,"You're in an untested part of project-builder.org, please report any result upstream\n");
         $tmp1 = $uri;
     }

devel/pb/lib/ProjectBuilder/Env.pm

@@ -286 +286 @@
 return if ($action =~ /^clean$/);
 
-if (($action =~ /^cms2/) || ($action =~ /^newver$/) || ($action =~ /pbinit/) || ($action =~ /^newproj$/) || ($action =~ /^announce/) || ($action =~ /^web/)) {
+if (($action =~ /^cms2/) || ($action =~ /^sbx2/) || ($action =~ /^newver$/) || ($action =~ /pbinit/) || ($action =~ /^newproj$/) || ($action =~ /^announce/) || ($action =~ /^web/)) {
 
     #