Changeset 149 in ProjectBuilder

Timestamp:

Sep 25, 2007, 1:39:22 AM (18 years ago)

Author:

Bruno Cornec

Message:

Adds support for non-rpm distro

Location:

devel/pb/bin

Files:

• pb (modified) (2 diffs)
• pbvi (modified) (1 diff)

devel/pb/bin/pb

@@ -318 +318 @@
         print $LOG "Source file: $src\n" if ($debug >= 0);
 
+        print $LOG "Working directory: $ENV{'PBBUILDDIR'}\n" if ($debug >= 0);
         if ($dtype eq "rpm") {
-            print $LOG "Working under $ENV{'PBBUILDDIR'}\n" if ($debug >= 0);
             foreach my $d ('RPMS','SRPMS','SPECS','SOURCES','BUILD') {
                 if (! -d "$ENV{'PBBUILDDIR'}/$d") {
@@ -342 +342 @@
             }
             $made="$made RPMS/*/$pbpkg-$pbver-$pbtag$pbsuf.*.rpm SRPMS/$pbpkg-$pbver-$pbtag$pbsuf.src.rpm";
+            if (-f "/usr/bin/rpmlint") {
+                pb_system("rpmlint $made","Checking validity of rpms with rpmlint");
         } elsif ($dtype eq "deb") {
+            chdir "$ENV{'PBBUILDDIR'}" || die "Unable to chdir to $ENV{'PBBUILDDIR'}";
+            pb_system("tar xfz $src","Extracting sources");
+
+            chdir "$pbpkg-$pbver" || die "Unable to chdir to $pbpkg-$pbver";
+            symlink "pbconf/$ddir-$dver","debian" || die "Unable to symlink to pbconf/$ddir-$dver";
+            pb_system("dpkg-buildpackage -us -uc -rfakeroot","Building package");
             $made="$made $pbpkg"."_*.deb $pbpkg"."_*.dsc $pbpkg"."_*.tar.gz";
         } elsif ($dtype eq "ebuild") {
-            $made="$made portage/*/$pbpkg/$pbpkg-$pbver.ebuild";
-            pb_mkdir_p("$ENV{'PBBUILDDIR'}/portage") if (! -d "$ENV{'PBBUILDDIR'}/portage");
+            my @ebuildfile;
+            # For gentoo we need to take pb as subsystem name
+            pb_mkdir_p("$ENV{'PBBUILDDIR'}/portage/pb/$pbpkg") if (! -d "$ENV{'PBBUILDDIR'}/portage/pb/$pbpkg");
+
+            # We need to first extract the ebuild file
+            @ebuildfile = pb_extract_build_files($src,"$pbpkg-$pbver/pbconf/$ddir-$dver/","$ENV{'PBBUILDDIR'}/portage/pb/$pbpkg");
+
+            # Prepare the build env for gentoo
+            my $found = 0;
+            my $pbbd = $ENV{'PBBUILDDIR'};
+            $pbbd =~ /|/|\\/|g;
+            open(MAKE,"/etc/make.conf") || die "Unable to open /etc/make.conf";
+            while (<MAKE>) {
+                $found = 1 if (/$pbbd\/portage/);
+            }
+            close(MAKE);
+            if ($found == 0) {
+                pb_system("sudo \'echo \"$ENV{'PBBUILDDIR'}/portage\" >> /etc/make.conf\'");
+            }
+            $found = 0;
+            open(KEYW,"/etc/portage/package.keywords") || die "Unable to open /etc/portage/package.keywords";
+            while (<KEYW>) {
+                $found = 1 if (/portage\/pb/);
+            }
+            close(KEYW);
+            if ($found == 0) {
+                pb_system("sudo \'echo \"portage/pb\" >> /etc/portage/package.keywords\'");
+            }
+
+            # Build
+            foreach my $f (@ebuildfile) {
+                if ($f =~ /\.ebuild$/) {
+                    pb_system("ebuild $f digest ; ebuild $f package");
+                }
+            }
+            print $LOG "ebuild file: ".Dumper(\@ebuildfile)."\n" if ($debug >= 1);
+
+            $made="$made portage/pb/$pbpkg/$pbpkg-$pbver.ebuild";
         } elsif ($dtype eq "slackware") {
             $made="$made build-$pbpkg/$pbpkg-$pbver-*-$pbtag.tgz";

devel/pb/bin/pbvi

@@ -1 @@
-gvim `egrep -r $* . | egrep -vi '\.svn|~:|binary|binaire' | cut -d: -f1 | sort -u`
+LANGUAGE=C gvim `egrep -r $* . | egrep -vi '\.svn|~:|binary' | cut -d: -f1 | sort -u`