Changeset 736 in ProjectBuilder for devel/pb/lib

Timestamp:

Mar 12, 2009, 2:51:00 AM (16 years ago)

Author:

Bruno Cornec

Message:

Fix #35 by forcing the usage of a -r release option, and by exporting only that version tree from the VCS.

Location:

devel/pb/lib/ProjectBuilder

Files:

• CMS.pm (modified) (1 diff)
• Env.pm (modified) (5 diffs)

devel/pb/lib/ProjectBuilder/CMS.pm

@@ -620 +620 @@
         pb_mkdir_p("$ENV{$envar}");
     } else {
+        # Either we have a version in the uri, and it should be the same
+        # as the one in the envar. Or we should add the version to the uri
+        if (basename($uri) ne basename($ENV{$envar})) {
+            $uri .= "/".basename($ENV{$envar})
+        }
         pb_log(1,"Checking out $uri\n");
         pb_cms_checkout($scheme,$uri,$ENV{$envar});

devel/pb/lib/ProjectBuilder/Env.pm

@@ -109 +109 @@
 }
 
-# Adds a potential conf file now as it's more 
+# Adds a potential conf file now as it's less 
 # important than the project conf file
 my ($vmpath,$vepath) = pb_conf_get("vmpath","vepath");
@@ -177 +177 @@
 
 # Put under CMS the PBPROJ dir
-if (defined $pbinit) {
+if ($action =~ /^newproj$/) {
     if (! -d "$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}") {
         pb_mkdir_p("$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}") || die "Unable to recursively create $ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}";
@@ -236 +236 @@
     if (not defined $ENV{'PBROOTDIR'}) {
         if (! -f ("$ENV{'PBDESTDIR'}/pbrc")) {
-            opendir(DIR,$ENV{'PBCONFDIR'}) || die "Unable to open directory $ENV{'PBCONFDIR'}: $!";
-            my $maxmtime = 0;
-            foreach my $d (readdir(DIR)) {
-                pb_log(3,"Looking at \'$d\'...");
-                next if ($d =~ /^\./);
-                next if (! -d "$ENV{'PBCONFDIR'}/$d");
-                my $s = stat("$ENV{'PBCONFDIR'}/$d");
-                next if (not defined $s);
-                pb_log(3,"KEEP\n");
-                # Keep the most recent
-                pb_log(2," $s->mtime\n");
-                if ($s->mtime > $maxmtime) {
-                    $ENV{'PBROOTDIR'} = "$ENV{'PBCONFDIR'}/$d";
-                    $maxmtime = $s->mtime;
-                }
-            }
-            closedir(DIR);
+            $ENV{'PBROOTDIR'} = "$ENV{'PBCONFDIR'}";
             pb_log(1,"WARNING: no pbroot defined, using $ENV{'PBROOTDIR'}\n");
             pb_log(1,"         Please use -r release if you want to use another release\n");
@@ -585 +569 @@
 #filter PBDEP =
 
-# PBSUF is replaced by the package suffix (\$pbsuf'} in code)
+# PBSUF is replaced by the package suffix (\$pb->{'suf'} in code)
 filter PBSUF = %{dist}
 
@@ -935 +919 @@
             pb_cms_checkin($pbconf{$ENV{'PBPROJ'}},"$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}",$pbinit);
         } else {
+            pb_log(0,"ERROR: no pbroot defined, used $ENV{'PBROOTDIR'}, without finding $ENV{'PBPROJ'}.pb in it\n");
+            pb_log(0,"       Please use -r release in order to be able to initialize your environment correctly\n");
             die "Unable to open $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb";
         }