Changeset 366 in ProjectBuilder

Timestamp:

Apr 8, 2008, 12:28:44 AM (16 years ago)

Author:

Bruno Cornec

Message:

• We need to handle 2 repo in newvm, with the right URL. Should be fixed now
• Update the right pbcl file

Files:

• devel/pb/bin/pb (modified) (3 diffs)
• pbconf/devel/pbcl (deleted)
• pbconf/devel/project-builder/pbcl (modified) (1 diff)

devel/pb/bin/pb

@@ -1162 +1162 @@
     die "-V Version parameter needed" if ((not defined $newver) || ($newver eq ""));
 
-    my ($scheme,$uri)=pb_cms_init($pbinit);
+    # Need this call for PBDIR
+    my ($scheme2,$uri) = pb_cms_init($pbinit);
+
+    my ($pbconf) = pb_conf_read("$ENV{'PBETC'}","pbconfurl");
+    $uri = $pbconf->{$ENV{'PBPROJ'}};
+    my ($scheme, $account, $host, $port, $path) = pb_get_uri($uri);
 
     # Checking CMS repositories status
     my ($pburl) = pb_conf_get("pburl");
-    my ($scheme2, $account, $host, $port, $path) = pb_get_uri($pburl->{$ENV{'PBPROJ'}});
+    ($scheme2, $account, $host, $port, $path) = pb_get_uri($pburl->{$ENV{'PBPROJ'}});
 
     if ($scheme !~ /^svn/) {
@@ -1184 +1189 @@
 
     my $newurl = "$uri/".dirname($tmp)."/$newver";
-    my $oldver= basename("$uri/$tmp");
+    # Should probably use projver in the old file
+    my $oldver= basename($tmp);
 
     # Checking pbcl files
-    foreach my $f (<$ENV{'PBCONFDIR'}/*/pbcl>) {
+    foreach my $f (<$ENV{'PBROOTDIR'}/*/pbcl>) {
         open(PBCL,$f) || die "Unable to open $f";
         my $foundnew = 0;
@@ -1197 +1203 @@
     }
 
+    # Duplicate and extract project-builder part
     pb_log(2,"Copying $uri/$tmp to $newurl\n");
-    pb_cms_copy($scheme,$uri,$newurl);
-    pb_log(2,"Checkout $newurl to $ENV{'PBDIR'}/../$newver\n");
-    pb_cms_checkout($scheme,$newurl,"$ENV{'PBDIR'}/../$newver");
+    pb_cms_copy($scheme,"$uri/$tmp",$newurl);
+    pb_log(2,"Checkout $newurl to $ENV{'PBROOTDIR'}/../$newver\n");
+    pb_cms_checkout($scheme,$newurl,"$ENV{'PBCONFDIR'}/../$newver");
+
+    # Duplicate and extract project
+    my $newurl2 = "$pburl->{$ENV{'PBPROJ'}}/".dirname($tmp)."/$newver";
+
+    pb_log(2,"Copying $pburl->{$ENV{'PBPROJ'}}/$tmp to $newurl2\n");
+    pb_cms_copy($scheme,"$pburl->{$ENV{'PBPROJ'}}/$tmp",$newurl2);
+    pb_log(2,"Checkout $newurl2 to $ENV{'PBDIR'}/../$newver\n");
+    pb_cms_checkout($scheme,$newurl2,"$ENV{'PBDIR'}/../$newver");
 
     # Update the .pb file
-    # Should probably use projver in the old file
     open(FILE,"$ENV{'PBROOTDIR'}/../$newver/$ENV{'PBPROJ'}.pb") || die "Unable to open $ENV{'PBROOTDIR'}/../$newver/$ENV{'PBPROJ'}.pb";
     open(OUT,"> $ENV{'PBROOTDIR'}/../$newver/$ENV{'PBPROJ'}.pb.new") || die "Unable to write to $ENV{'PBROOTDIR'}/../$newver/$ENV{'PBPROJ'}.pb.new";

pbconf/devel/project-builder/pbcl

@@ -2 +2 @@
 
 PB CHANGES
+
+devel (2008-04-08)
+- devel line
+
+0.9.0 (2008-04-07)
+- Fix #20 newver comment testver and checks pbcl files (Bruno Cornec)
+- newver updated to support external CMS repo for build files (Bruno Cornec)
+- setupvm ok for all supported distro but slackware not yet supported by pb (Bruno Cornec)
+- Fix build2vm where the new name of the distro wasn't correctly handled when trying to get packages pushed to the ftp server. (Bruno Cornec)
+- pb_env_init does just setup env variables now. It does CMS checks and conf only if called on a CMS opration (Bruno Cornec)
+- systematic use of ENV VAR for PBPROJVER, PBPROJTAG, PBPACKAGER (Bruno Cornec)
+- new function to get package list for cms only context and the old one is simplified
+- $DESTDIR/pbrc contains now aal the keys needed to be independant when building - pbroot, pbprojver, pbprojtag, pbpackager. (Bruno Cornec)
+- remove ntp calls for the moment, not ready (Bruno Cornec)
+- new idempotent setupvm/setupve actions to prepare the VM/VE to be used by pb (Bruno Cornec)
+è Numerous fixes in the new way of working to have a full suite working for netperf, pb and mondorescue - newver, cms2build, build2pkg, pbcl, setupvm, build2vm (Bruno Cornec)
+- separation of CMS calls (only when using a cms2... action) and the environment variables used (Bruno Cornec)
+- Improvements for CMS support, lots on CVS (Bruno Cornec)
+- Use pod for pb documentation, modules to be done (Bruno Cornec)
+- Use Getopt::Long and support now long options (Bruno Cornec)
+- pb_syntax now uses pod2usage (Bruno Cornec)
+- All modules are packages now (Bruno Cornec)
+- pb_changelog back in Base.pm and removal of Changelog.pm (Bruno Cornec)
+- Major changes following a memorable Fort Collins discussion which makes that version incompatible with previous ones (Bruno Cornec/Bryan Gartner/Junichi Uekawa)
+- Support URLs for pbconf and projects (ftp, http, svn, cvs, file) (Bruno Cornec/Bryan Gartner)
+- Adds Virtual Environment support (mock, pbuilder, ...) (Bruno Cornec/Bryan Gartner)
+- Documentation of concepts (Bruno Cornec)
+- Fix for debian build in case a debian dir/link already exists in the project (Bruno Cornec/Bryan Gartner)
 
 0.8.12 (2008-02-07)