Changeset 204 in ProjectBuilder

Timestamp:

Oct 14, 2007, 8:20:11 PM (17 years ago)

Author:

Bruno Cornec

Message:

Coding of newver in progress

Location:

devel

Files:

• pb/bin/pb (modified) (3 diffs)
• pb/lib/ProjectBuilder/Base.pm (modified) (1 diff)
• pbconf/project-builder/rpm/project-builder.spec (modified) (1 diff)

devel/pb/bin/pb

@@ -24 +24 @@
 use ProjectBuilder::Distribution qw (pb_distro_init);
 use ProjectBuilder::Version qw (pb_version_init);
-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);
+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);
 
 my %opts;                   # CLI Options
@@ -695 +695 @@
 sub pb_newver {
 
+    die "-V Version parameter needed" if ((not defined $newver) || ($newver eq ""));
     my $cms=pb_cms_init($ENV{'PBPROJ'});
     if ($cms->{$ENV{'PBPROJ'}} ne "svn") {
@@ -702 +703 @@
     die "You need to have no differences before creating a new version" if ($res != 0);
     my $cmsurl = pb_cms_getinfo($cms);
-    my $newurl = dirname($cmsurl).$newver;
-    pb_cms_copy($cmsurl,$newurl);
-    pb_cms_checkout($newurl);
+    my $newurl = dirname($cmsurl)."/$newver";
+    pb_cms_copy($cms,$cmsurl,$newurl);
+    pb_cms_checkout($cms,$newurl,"$ENV{'PBROOT'}/..");
 }
 

devel/pb/lib/ProjectBuilder/Base.pm

@@ -354 +354 @@
 }
 }
-    
-
+
+sub pb_cms_getinfo {
+my $cms = shift;
+my $url = "";
+my $void = "";
+
+if ($cms->{$ENV{'PBPROJ'}} eq "svn") {
+    open(PIPE,"LANGUAGE=C svn info $ENV{'PBROOT'} |") || die "Unable to get svn info from $ENV{'PBROOT'}";
+    while (<PIPE>) {
+        ($void,$url) = split(/^Repository Root:/) if (/^Repository Root:/);
+    }
+    close(PIPE);
+} elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") {
+} else {
+    die "cms $cms->{$ENV{'PBPROJ'}} unknown";
+}
+return($url);
+}
+
+sub pb_cms_copy {
+my $cms = shift;
+my $oldurl = shift;
+my $newurl = shift;
+
+if ($cms->{$ENV{'PBPROJ'}} eq "svn") {
+    pb_system("svn copy $oldurl $newurl","Copying $oldurl to $newurl ");
+} elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") {
+} else {
+    die "cms $cms->{$ENV{'PBPROJ'}} unknown";
+}
+}
+
+sub pb_cms_checkout {
+my $cms = shift;
+my $url = shift;
+my $destination = shift;
+
+if ($cms->{$ENV{'PBPROJ'}} eq "svn") {
+    pb_system("svn co $url $destination","Checking $url to $destination ");
+} elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") {
+} else {
+    die "cms $cms->{$ENV{'PBPROJ'}} unknown";
+}
+}
+
+sub pb_cms_isdiff {
+my $cms = shift;
+
+if ($cms->{$ENV{'PBPROJ'}} eq "svn") {
+    open(PIPE,"svn diff $ENV{'PBROOT'} |") || die "Unable to get svn diff from $ENV{'PBROOT'}";
+    my $l = 0;
+    while (<PIPE>) {
+        $l++;
+    }
+    return($l);
+} elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") {
+} else {
+    die "cms $cms->{$ENV{'PBPROJ'}} unknown";
+}
+}
 
 # Get all filters to apply

devel/pbconf/project-builder/rpm/project-builder.spec

@@ -38 +38 @@
 
 %install
-make install
+%makeinstall_std
 
 %clean