Changeset 890 in ProjectBuilder

Timestamp:

Oct 27, 2009, 11:54:28 AM (14 years ago)

Author:

Bruno Cornec

Message:

• Adds solaris support to pb_env_init (template file creation)
• Simplify pb_changelog when dest ChangeLog file exists

Location:

devel/pb/lib/ProjectBuilder

Files:

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

devel/pb/lib/ProjectBuilder/CMS.pm

@@ -779 +779 @@
 }
 
-if ($scheme =~ /^svn/) {
-    if (! -f "$dest/ChangeLog") {
+if (! -f "$dest/ChangeLog") {
+    if ($scheme =~ /^svn/) {
         # 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";
@@ -790 +790 @@
             pb_system("$vcscmd log -v $pkgdir > $dest/$ENV{'PBCMSLOGFILE'}","Extracting log info from SVN");
         }
-    }
-} elsif ($scheme =~ /^svk/) {
-    if (! -f "$dest/ChangeLog") {
+    } elsif ($scheme =~ /^svk/) {
         pb_system("$vcscmd log -v $pkgdir > $dest/$ENV{'PBCMSLOGFILE'}","Extracting log info from SVK");
-        }
-} elsif ($scheme =~ /^hg/) {
-    if (! -f "$dest/ChangeLog") {
+    } elsif ($scheme =~ /^hg/) {
         # 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("$vcscmd log -v $pkgdir > $dest/$ENV{'PBCMSLOGFILE'}","Extracting log info from SVN");
-        }
-} elsif ($scheme =~ /^git/) {
-    if (! -f "$dest/ChangeLog") {
+    } elsif ($scheme =~ /^git/) {
         # 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("$vcscmd log -v $pkgdir > $dest/$ENV{'PBCMSLOGFILE'}","Extracting log info from GIT");
-        }
-} elsif (($scheme eq "file") || ($scheme eq "dir") || ($scheme eq "http") || ($scheme eq "ftp")) {
-    if (! -f "$dest/ChangeLog") {
+    } elsif (($scheme eq "file") || ($scheme eq "dir") || ($scheme eq "http") || ($scheme eq "ftp")) {
         pb_system("echo ChangeLog for $pkgdir > $dest/ChangeLog","Empty ChangeLog file created");
-    }
-} elsif ($scheme =~ /^cvs/) {
-    my $tmp=basename($pkgdir);
-    # CVS needs a relative path !
-    if (! -f "$dest/ChangeLog") {
+    } elsif ($scheme =~ /^cvs/) {
+        my $tmp=basename($pkgdir);
+        # CVS needs a relative path !
         # 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";
@@ -826 +816 @@
             pb_system("$vcscmd log $tmp > $dest/$ENV{'PBCMSLOGFILE'}","Extracting log info from CVS");
         }
-    }
-} else {
-    die "cms $scheme unknown";
+    } else {
+        die "cms $scheme unknown";
+    }
 }
 }

devel/pb/lib/ProjectBuilder/Env.pm

@@ -412 +412 @@
 # a QEMU rhel-3-i286 here means that the VM will be named rhel-3-i386.qemu
 #
-#vmlist $ENV{'PBPROJ'} = mandrake-10.1-i386,mandrake-10.2-i386,mandriva-2006.0-i386,mandriva-2007.0-i386,mandriva-2007.1-i386,mandriva-2008.0-i386,redhat-7.3-i386,redhat-9-i386,fedora-4-i386,fedora-5-i386,fedora-6-i386,fedora-7-i386,fedora-8-i386,rhel-3-i386,rhel-4-i386,rhel-5-i386,suse-10.0-i386,suse-10.1-i386,suse-10.2-i386,suse-10.3-i386,sles-9-i386,sles-10-i386,gentoo-nover-i386,debian-3.1-i386,debian-4.0-i386,ubuntu-6.06-i386,ubuntu-7.04-i386,ubuntu-7.10-i386,mandriva-2007.0-x86_64,mandriva-2007.1-x86_64,mandriva-2008.0-x86_64,fedora-6-x86_64,fedora-7-x86_64,fedora-8-x86_64,rhel-4-x86_64,rhel-5-x86_64,suse-10.2-x86_64,suse-10.3-x86_64,sles-10-x86_64,gentoo-nover-x86_64,debian-4.0-x86_64,ubuntu-7.04-x86_64,ubuntu-7.10-x86_64
+#vmlist $ENV{'PBPROJ'} = mandrake-10.1-i386,mandrake-10.2-i386,mandriva-2006.0-i386,mandriva-2007.0-i386,mandriva-2007.1-i386,mandriva-2008.0-i386,redhat-7.3-i386,redhat-9-i386,fedora-4-i386,fedora-5-i386,fedora-6-i386,fedora-7-i386,fedora-8-i386,rhel-3-i386,rhel-4-i386,rhel-5-i386,suse-10.0-i386,suse-10.1-i386,suse-10.2-i386,suse-10.3-i386,sles-9-i386,sles-10-i386,gentoo-nover-i386,debian-3.1-i386,debian-4.0-i386,ubuntu-6.06-i386,ubuntu-7.04-i386,ubuntu-7.10-i386,mandriva-2007.0-x86_64,mandriva-2007.1-x86_64,mandriva-2008.0-x86_64,fedora-6-x86_64,fedora-7-x86_64,fedora-8-x86_64,rhel-4-x86_64,rhel-5-x86_64,suse-10.2-x86_64,suse-10.3-x86_64,sles-10-x86_64,gentoo-nover-x86_64,debian-4.0-x86_64,ubuntu-7.04-x86_64,ubuntu-7.10-x86_64,solaris-10-x86_64
 
 #
@@ -956 +956 @@
                 close(CONF);
                 pb_mkdir_p("$ENV{'PBROOTDIR'}/$pp/pbfilter") || die "Unable to create $ENV{'PBROOTDIR'}/$pp/pbfilter";
+                pb_mkdir_p("$ENV{'PBROOTDIR'}/$pp/pkg") || die "Unable to create $ENV{'PBROOTDIR'}/$pp/pkg";
+                open(CONF,"> $ENV{'PBROOTDIR'}/$pp/pkg/pkginfo") || die "Unable to create $ENV{'PBROOTDIR'}/$pp/pkg/pkginfo";
+                print CONF << 'EOF';
+#
+# $Id$
+#
+PKG="PBREALPKG"
+NAME="PBSUMMARY"
+VERSION="PBVER"
+# or i386
+ARCH="all"
+CATEGORY="application"
+DESC="PBDESC"
+EMAIL="PBPACKAGER"
+VENDOR="PBPACKAGER"
+HOTLINE="PBURL"
+EOF
+                close(CONF);
+                open(CONF,"> $ENV{'PBROOTDIR'}/$pp/pkg/pbbuild") || die "Unable to create $ENV{'PBROOTDIR'}/$pp/pkg/pbbuild";
+                print CONF << 'EOF';
+#
+# $Id$
+#
+#perl Makefile.PL INSTALLDIRS=vendor
+./configure --prefix=/usr
+make
+make install DESTDIR=\$1
+EOF
+                close(CONF);
+                open(CONF,"> $ENV{'PBROOTDIR'}/$pp/pkg/depend") || die "Unable to create $ENV{'PBROOTDIR'}/$pp/pkg/depend";
+                print CONF << 'EOF';
+#
+# $Id$
+#
+#P SUNWperl584core       Perl 5.8.4 (core)
+EOF
+                close(CONF);
     
             }