Changeset 2333 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/Distribution.pm

Timestamp:

Oct 24, 2017, 12:49:59 AM (7 years ago)

Author:

Bruno Cornec

Message:

Initial support of apk for pb

File:

• devel/pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (3 diffs)

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

@@ -206 +206 @@
 # 3: Should have the same keys as the previous one. If ambiguity, which other distributions should be checked
 # 4: Matching Rg. Expr to detect distribution and version
-my ($single_rel_files, $ambiguous_rel_files,$distro_similar,$distro_match) = pb_conf_get("osrelfile","osrelambfile","osambiguous","osrelexpr");
+my ($single_rel_files, $ambiguous_rel_files,$distro_similar,$distro_match,$nover) = pb_conf_get("osrelfile","osrelambfile","osambiguous","osrelexpr","osnover");
 
 my $release;
@@ -226 +226 @@
             ($release) = $tmp =~ m/$distro_match->{$d}/m;
         } else {
-            print STDERR "Unable to find $d version in $r (non-ambiguous)\n";
-            print STDERR "Please report to the maintainer bruno_at_project-builder.org\n";
+            if (not defined ($nover->{$d})) {
+                print STDERR "Unable to find $d version in $r (non-ambiguous)\n";
+                print STDERR "Please report to the maintainer bruno_at_project-builder.org\n";
+            }
             $release = "unknown";
         }
@@ -410 +412 @@
 } elsif ($pbos->{'type'} eq "deb") {
     $regexp = '^Build-Depends:(.*)$';
+} elsif ($pbos->{'type'} eq "apk") {
+    # TODO
+    $regexp = 'TODO\n';
 } elsif ($pbos->{'type'} eq "ebuild") {
     $sep = '"'.$/;
-    $regexp = '^DEPEND="(.*)"\n'
+    $regexp = '^DEPEND="(.*)"\n';
 } else {
     # No idea