Changeset 1176 in ProjectBuilder for devel/pb/lib

Timestamp:

Feb 7, 2011, 2:24:11 PM (14 years ago)

Author:

Bruno Cornec

Message:

r4160@eelzbach2: bruno | 2011-02-06 13:30:39 +0100

• Adds support for Remote Machines (RM). Not tested yet.

Location:

devel/pb/lib/ProjectBuilder

Files:

• CMS.pm (modified) (2 diffs)
• Env.pm (modified) (3 diffs)

devel/pb/lib/ProjectBuilder/CMS.pm

@@ -227 +227 @@
 
     # Check whether the file is well formed 
-     (containing already a directory with the project-version name)
+    # (containing already a directory with the project-version name)
     #
     # If it's not the case, we try to adapt, but distro needing 
@@ -711 +711 @@
     my $cmsurl = pb_cms_get_uri($scheme,$ENV{$envar});
     my ($scheme2, $account2, $host2, $port2, $path2) = pb_get_uri($cmsurl);
+    # For svk, scheme doesn't appear in svk info so remove it here in uri coming from conf file 
+    # which needs it to trigger correct behaviour
+    $uri =~ s/^svk://;
     if ($cmsurl ne $uri) {
         # The local content doesn't correpond to the repository

devel/pb/lib/ProjectBuilder/Env.pm

@@ -95 +95 @@
 # where to find Build System infos:
 #vmpath default = /home/qemu
-#vepath default = /home/rinse
+#vepath default = /home/rpmbootstrap
+#rmpath default = /home/remote
 
 # Overwrite generic setup
@@ -168 +169 @@
 # Adds a potential conf file now as it's less 
 # important than the project conf file
-my ($vmpath,$vepath) = pb_conf_get_if("vmpath","vepath");
+my ($vmpath,$vepath,$rmpath) = pb_conf_get_if("vmpath","vepath","rmpath");
 pb_conf_add("$vmpath->{$ENV{'PBPROJ'}}/.pbrc") if ((defined $vmpath) && (-f "$vmpath->{$ENV{'PBPROJ'}}/.pbrc"));
 pb_conf_add("$vepath->{$ENV{'PBPROJ'}}/.pbrc") if ((defined $vepath) && (-f "$vepath->{$ENV{'PBPROJ'}}/.pbrc"));
+pb_conf_add("$rmpath->{$ENV{'PBPROJ'}}/.pbrc") if ((defined $rmpath) && (-f "$rmpath->{$ENV{'PBPROJ'}}/.pbrc"));
 
 #
@@ -282 +284 @@
 pb_log(2,"PBBUILDDIR: $ENV{'PBBUILDDIR'}\n");
 
-#
-# The following part is only useful when in cms2something or newsomething
-# In VMs/VEs we want to skip that by providing good env vars.
+return if ($action =~ /^clean$/);
+#
+# The following part is only useful when in sbx|cms2something or newsomething
+# In VMs/VEs/RMs we want to skip that by providing good env vars.
 # return values in that case are useless
 #
-return if ($action =~ /^clean$/);
 
 if (($action =~ /^cms2/) || ($action =~ /^sbx2/) || ($action =~ /^newver$/) || ($action =~ /pbinit/) || ($action =~ /^newproj$/) || ($action =~ /^announce/)) {