Changeset 2334 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder

Timestamp:

Oct 25, 2017, 12:01:59 AM (6 years ago)

Author:

Bruno Cornec

Message:

Greatly improve apk build (still not finished however)

Location:

devel/pb-modules/lib/ProjectBuilder

Files:

• Distribution.pm (modified) (2 diffs)
• Env.pm (modified) (1 diff)

devel/pb-modules/lib/ProjectBuilder/Distribution.pm

@@ -413 +413 @@
     $regexp = '^Build-Depends:(.*)$';
 } elsif ($pbos->{'type'} eq "apk") {
-    # TODO
-    $regexp = 'TODO\n';
+    $regexp = '^makedepends=(.*)$';
 } elsif ($pbos->{'type'} eq "ebuild") {
     $sep = '"'.$/;
@@ -527 +526 @@
         pb_log(1, "INFO: missing dependency $p\n");
     } elsif ($pbos->{'type'} eq "ebuild") {
+    } elsif ($pbos->{'type'} eq "apk") {
+        my $res = pb_system("apk info $p","Looking for $p","mayfail");
+        next if ($res eq 0);
+        pb_log(1, "INFO: missing dependency $p\n");
     } else {
         # Not reached

devel/pb-modules/lib/ProjectBuilder/Env.pm

@@ -266 +266 @@
 pb_log(1,"PBDESTDIR: $ENV{'PBDESTDIR'}\n");
 #
-# Removes all directory existing below the delivery dir 
+# Removes all directories existing below the delivery dir 
 # as they are temp dir only except when called from a pbinit script
 # Files stay and have to be cleaned up manually if needed