- Timestamp:
- Oct 14, 2007, 8:20:11 PM (17 years ago)
- Location:
- devel
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb/bin/pb
r203 r204 24 24 use ProjectBuilder::Distribution qw (pb_distro_init); 25 25 use ProjectBuilder::Version qw (pb_version_init); 26 use ProjectBuilder::Base qw (pb_conf_read pb_conf_get pb_cms_init pb_mkdir_p pb_system pb_rm_rf pb_get_filters pb_filter_file pb_filter_file_pb pb_cms_export pb_cms_log );26 use ProjectBuilder::Base qw (pb_conf_read pb_conf_get pb_cms_init pb_mkdir_p pb_system pb_rm_rf pb_get_filters pb_filter_file pb_filter_file_pb pb_cms_export pb_cms_log pb_cms_isdiff pb_cms_copy pb_cms_checkout); 27 27 28 28 my %opts; # CLI Options … … 695 695 sub pb_newver { 696 696 697 die "-V Version parameter needed" if ((not defined $newver) || ($newver eq "")); 697 698 my $cms=pb_cms_init($ENV{'PBPROJ'}); 698 699 if ($cms->{$ENV{'PBPROJ'}} ne "svn") { … … 702 703 die "You need to have no differences before creating a new version" if ($res != 0); 703 704 my $cmsurl = pb_cms_getinfo($cms); 704 my $newurl = dirname($cmsurl). $newver;705 pb_cms_copy($cms url,$newurl);706 pb_cms_checkout($ newurl);705 my $newurl = dirname($cmsurl)."/$newver"; 706 pb_cms_copy($cms,$cmsurl,$newurl); 707 pb_cms_checkout($cms,$newurl,"$ENV{'PBROOT'}/.."); 707 708 } 708 709 -
devel/pb/lib/ProjectBuilder/Base.pm
r199 r204 354 354 } 355 355 } 356 357 356 357 sub pb_cms_getinfo { 358 my $cms = shift; 359 my $url = ""; 360 my $void = ""; 361 362 if ($cms->{$ENV{'PBPROJ'}} eq "svn") { 363 open(PIPE,"LANGUAGE=C svn info $ENV{'PBROOT'} |") || die "Unable to get svn info from $ENV{'PBROOT'}"; 364 while (<PIPE>) { 365 ($void,$url) = split(/^Repository Root:/) if (/^Repository Root:/); 366 } 367 close(PIPE); 368 } elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") { 369 } else { 370 die "cms $cms->{$ENV{'PBPROJ'}} unknown"; 371 } 372 return($url); 373 } 374 375 sub pb_cms_copy { 376 my $cms = shift; 377 my $oldurl = shift; 378 my $newurl = shift; 379 380 if ($cms->{$ENV{'PBPROJ'}} eq "svn") { 381 pb_system("svn copy $oldurl $newurl","Copying $oldurl to $newurl "); 382 } elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") { 383 } else { 384 die "cms $cms->{$ENV{'PBPROJ'}} unknown"; 385 } 386 } 387 388 sub pb_cms_checkout { 389 my $cms = shift; 390 my $url = shift; 391 my $destination = shift; 392 393 if ($cms->{$ENV{'PBPROJ'}} eq "svn") { 394 pb_system("svn co $url $destination","Checking $url to $destination "); 395 } elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") { 396 } else { 397 die "cms $cms->{$ENV{'PBPROJ'}} unknown"; 398 } 399 } 400 401 sub pb_cms_isdiff { 402 my $cms = shift; 403 404 if ($cms->{$ENV{'PBPROJ'}} eq "svn") { 405 open(PIPE,"svn diff $ENV{'PBROOT'} |") || die "Unable to get svn diff from $ENV{'PBROOT'}"; 406 my $l = 0; 407 while (<PIPE>) { 408 $l++; 409 } 410 return($l); 411 } elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") { 412 } else { 413 die "cms $cms->{$ENV{'PBPROJ'}} unknown"; 414 } 415 } 358 416 359 417 # Get all filters to apply -
devel/pbconf/project-builder/rpm/project-builder.spec
r203 r204 38 38 39 39 %install 40 make install 40 %makeinstall_std 41 41 42 42 %clean
Note:
See TracChangeset
for help on using the changeset viewer.