Changeset 1097 in ProjectBuilder for devel/pb/lib/ProjectBuilder
- Timestamp:
- Oct 25, 2010, 12:26:55 AM (14 years ago)
- Location:
- devel/pb/lib/ProjectBuilder
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb/lib/ProjectBuilder/CMS.pm
r940 r1097 57 57 58 58 my $pbinit = shift || undef; 59 my $param = shift || undef; 59 60 60 61 my ($pburl) = pb_conf_get("pburl"); … … 70 71 $ENV{'PBPROJDIR'} = "$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}"; 71 72 } 73 # Expand potential env variable in it to allow string replacement 74 eval { $ENV{'PBPROJDIR'} =~ s/(\$ENV.+\})/$1/eeg }; 75 72 76 73 77 # Computing the default dir for PBDIR. … … 101 105 $ENV{'PBCMSLOGFILE'}="flat.log"; 102 106 } elsif ($scheme =~ /^svn/) { 103 # svnversion more precise than svn info 104 $tmp = `(cd "$ENV{'PBDIR'}" ; $vcscmd"version" .)`; 107 # svnversion more precise than svn info if sbx 108 if ($param eq "CMS") { 109 $tmp = `(LANGUAGE=C $vcscmd info $pburl->{$ENV{'PBPROJ'}} | grep -E '^Revision:' | cut -d: -f2)`; 110 $tmp =~ s/\s+//; 111 } else { 112 $tmp = `(cd "$ENV{'PBDIR'}" ; $vcscmd"version" .)`; 113 } 105 114 chomp($tmp); 106 115 $ENV{'PBREVISION'}=$tmp; 107 116 $ENV{'PBCMSLOGFILE'}="svn.log"; 108 117 } elsif ($scheme =~ /^svk/) { 109 $tmp = `(cd "$ENV{'PBDIR'}" ; $vcscmd info . | grep -E '^Revision:' | cut -d: -f2)`;118 $tmp = `(cd "$ENV{'PBDIR'}" ; LANGUAGE=C $vcscmd info . | grep -E '^Revision:' | cut -d: -f2)`; 110 119 $tmp =~ s/\s+//; 111 120 chomp($tmp); … … 267 276 } else { 268 277 # Probably not right, should be checked, but that way I'll notice it :-) 278 pb_log(0,"You're in an untested part of project-builder.org, please report any result upstream\n"); 269 279 $tmp1 = $uri; 270 280 } -
devel/pb/lib/ProjectBuilder/Env.pm
r1094 r1097 286 286 return if ($action =~ /^clean$/); 287 287 288 if (($action =~ /^cms2/) || ($action =~ /^ newver$/) || ($action =~ /pbinit/) || ($action =~ /^newproj$/) || ($action =~ /^announce/) || ($action =~ /^web/)) {288 if (($action =~ /^cms2/) || ($action =~ /^sbx2/) || ($action =~ /^newver$/) || ($action =~ /pbinit/) || ($action =~ /^newproj$/) || ($action =~ /^announce/) || ($action =~ /^web/)) { 289 289 290 290 #
Note:
See TracChangeset
for help on using the changeset viewer.