Changeset 448 in ProjectBuilder

Timestamp:

May 26, 2008, 10:41:45 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Fake Changelog for test version
• setupvm improved with init level 3 by default
• still issue for pb on Debian with the devel version name, and the mixed cases for modules unallowed

Location:

devel/pb

Files:

• bin/pb (modified) (3 diffs)
• lib/ProjectBuilder/CMS.pm (modified) (2 diffs)

devel/pb/bin/pb

@@ -488 +488 @@
         my $chglog;
 
-        if ((defined $testver) && (defined $testver->{$ENV{'PBPROJ'}}) && ($testver->{$ENV{'PBPROJ'}} =~ /true/i)) {
-            if (! -f "$dest/NEWS") {
-                open(NEWS,"> $dest/NEWS") || die "Unable to create $dest/NEWS";
-                close(NEWS);
-            }
-            open(CL,"> $dest/ChangeLog") || die "Unable to create $dest/ChangeLog";
-            close(CL);
-            open(CL,"> $dest/$ENV{'PBCMSLOGFILE'}") || die "Unable to create $dest/$ENV{'PBCMSLOGFILE'}";
-            close(CL);
-            $chglog = undef;
-        } else {
-
-            # Get project info on authors and log file
-            $chglog = "$ENV{'PBROOTDIR'}/$pbpkg/pbcl";
-            $chglog = "$ENV{'PBROOTDIR'}/pbcl" if (! -f $chglog);
-            $chglog = undef if (! -f $chglog);
-
-            my $authors = "$ENV{'PBROOTDIR'}/$pbpkg/pbauthors";
-            $authors = "$ENV{'PBROOTDIR'}/pbauthors" if (! -f $authors);
-            $authors = "/dev/null" if (! -f $authors);
-
-            # Extract cms log history and store it
-            if ((defined $chglog) && (! -f "$dest/NEWS")) {
-                pb_log(2,"Generating NEWS file from $chglog\n");
-                copy($chglog,"$dest/NEWS") || die "Unable to create $dest/NEWS";
-            }
-            pb_cms_log($scheme,"$ENV{'PBDIR'}/$dir",$dest,$chglog,$authors);
-        }
+        # Get project info on authors and log file
+        $chglog = "$ENV{'PBROOTDIR'}/$pbpkg/pbcl";
+        $chglog = "$ENV{'PBROOTDIR'}/pbcl" if (! -f $chglog);
+        $chglog = undef if (! -f $chglog);
+
+        my $authors = "$ENV{'PBROOTDIR'}/$pbpkg/pbauthors";
+        $authors = "$ENV{'PBROOTDIR'}/pbauthors" if (! -f $authors);
+        $authors = "/dev/null" if (! -f $authors);
+
+        # Extract cms log history and store it
+        if ((defined $chglog) && (! -f "$dest/NEWS")) {
+            pb_log(2,"Generating NEWS file from $chglog\n");
+            copy($chglog,"$dest/NEWS") || die "Unable to create $dest/NEWS";
+        }
+        pb_cms_log($scheme,"$ENV{'PBDIR'}/$dir",$dest,$chglog,$authors,$testver);
 
         my %build;
@@ -697 +684 @@
             symlink "pbconf/$ddir-$dver","debian" || die "Unable to symlink to pbconf/$ddir-$dver";
             chmod 0755,"debian/rules";
+            if ($dver !~ /[0-9]/) {
+                # dpkg-deb doesn't accept non digit versions. removing checks
+                # dpkg-source checks upper case when generating perl modules
+            }
             pb_system("dpkg-buildpackage -us -uc -rfakeroot","Building package");
             $made="$made $pbpkg"."_*.deb $pbpkg"."_*.dsc $pbpkg"."_*.tar.gz";
@@ -1510 +1501 @@
 chmod 0640,$file;
 
+# Keep the VM in text mode
+$file="/etc/inittab";
+open(PBFILE,$file) || die "Unable to open $file";
+open(PBOUT,"> $file.new") || die "Unable to open $file.new";
+while (<PBFILE>) {
+    s/^(..):5:initdefault:$/$1:3:initdefault:/;
+    print PBOUT $_;
+}
+close(PBFILE);
+close(PBOUT);
+rename("$file.new",$file);
+chmod 0640,$file;
+
 # pb has to be added to portage group on gentoo
 

devel/pb/lib/ProjectBuilder/CMS.pm

@@ -552 +552 @@
 my $chglog = shift;
 my $authors = shift;
+my $testver = shift || undef;
 
 pb_cms_create_authors($authors,$dest,$scheme);
 
-if ($scheme =~ /^svn/) {
+if ((defined $testver) && (defined $testver->{$ENV{'PBPROJ'}}) && ($testver->{$ENV{'PBPROJ'}} =~ /true/i)) {
     if (! -f "$dest/ChangeLog") {
+        open(CL,"> $dest/ChangeLog") || die "Unable to create $dest/ChangeLog";
+        # We need a minimal version for debian type of build
+        print CL "\n";
+        print CL "\n";
+        print CL "\n";
+        print CL "\n";
+        print CL "1990-01-01  none\n";
+        print CL "\n";
+        print CL "        * test version\n";
+        print CL "\n";
+        close(CL);
+        pb_log(0,"Generating fake ChangeLog for test version\n");
+        open(CL,"> $dest/$ENV{'PBCMSLOGFILE'}") || die "Unable to create $dest/$ENV{'PBCMSLOGFILE'}";
+        close(CL);
+    }
+}
+
+if ($scheme =~ /^svn/) {
+    if (! -f "$dest/ChangeLog") {
+        # In case we have no network, just create an empty one before to allow correct build
+        open(CL,"> $dest/ChangeLog") || die "Unable to create $dest/ChangeLog";
+        close(CL);
         if (-x "/usr/bin/svn2cl") {
-            # In case we have no network, just create an empty one before to allow correct build
-            open(CL,"> $dest/ChangeLog") || die "Unable to create $dest/ChangeLog";
-            close(CL);
             pb_system("/usr/bin/svn2cl --group-by-day --authors=$authors -i -o $dest/ChangeLog $pkgdir","Generating ChangeLog from SVN with svn2cl");
         } else {
@@ -575 +595 @@
     # CVS needs a relative path !
     if (! -f "$dest/ChangeLog") {
+        # In case we have no network, just create an empty one before to allow correct build
+        open(CL,"> $dest/ChangeLog") || die "Unable to create $dest/ChangeLog";
+        close(CL);
         if (-x "/usr/bin/cvs2cl") {
-            # In case we have no network, just create an empty one before to allow correct build
-            open(CL,"> $dest/ChangeLog") || die "Unable to create $dest/ChangeLog";
-            close(CL);
             pb_system("/usr/bin/cvs2cl --group-by-day -U $authors -f $dest/ChangeLog $pkgdir","Generating ChangeLog from CVS with cvs2cl");
         } else {