Changeset 1113

Timestamp:

11/23/10 15:45:03 (3 years ago)

Author:

bruno

Message:

• Presentation update after HP internal presentation
• Fix a bug when building for non VCS hosted projects, we need to return in pb_cms_compliant earlier in that case and not go through the check out phase.
• Remove ref to web commands which do not exist anymore

Location:

devel

Files:

• pb-doc/pb-presentation.odp (modified) (previous)
• pb/lib/ProjectBuilder/CMS.pm (modified) (2 diffs)
• pb/lib/ProjectBuilder/Env.pm (modified) (1 diff)

devel/pb/lib/ProjectBuilder/CMS.pm

@@ -669 +669 @@
 my ($scheme, $account, $host, $port, $path) = pb_get_uri($uri);
 
-if ((! -d "$ENV{$envar}") || (defined $pbinit)) {
+if (($scheme !~ /^cvs/) || ($scheme !~ /^svn/) || ($scheme =~ /^svk/) || ($scheme !~ /^hg/) || ($scheme !~ /^git/) ) {
+    # Do not compare if it's not a real cms
+    return;
+} elsif ((! -d "$ENV{$envar}") || (defined $pbinit)) {
     if (defined $pbinit) {
         pb_mkdir_p("$ENV{$envar}");
@@ -681 +684 @@
         pb_cms_checkout($scheme,$uri,$ENV{$envar});
     }
-} elsif (($scheme !~ /^cvs/) || ($scheme !~ /^svn/) || ($scheme =~ /^svk/) || ($scheme !~ /^hg/) || ($scheme !~ /^git/) ) {
-    # Do not compare if it's not a real cms
-    return;
 } else {
     pb_log(1,"$uri found locally, checking content\n");

devel/pb/lib/ProjectBuilder/Env.pm

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