Changeset 539 in ProjectBuilder for devel/pb/lib

Timestamp:

Sep 15, 2008, 2:54:42 AM (17 years ago)

Author:

Bruno Cornec

Message:

First attempt to code support for real/virtual names for packages in order to support perl naming in both Debian and RPM distributions

Location:

devel/pb/lib/ProjectBuilder

Files:

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

devel/pb/lib/ProjectBuilder/CMS.pm

@@ -30 +30 @@
  
 our @ISA = qw(Exporter);
-our @EXPORT = qw(pb_cms_init pb_cms_export pb_cms_get_uri pb_cms_copy pb_cms_checkout pb_cms_up pb_cms_checkin pb_cms_isdiff pb_cms_get_pkg pb_cms_compliant pb_cms_log pb_cms_add);
+our @EXPORT = qw(pb_cms_init pb_cms_export pb_cms_get_uri pb_cms_copy pb_cms_checkout pb_cms_up pb_cms_checkin pb_cms_isdiff pb_cms_get_pkg pb_cms_get_real_pkg pb_cms_compliant pb_cms_log pb_cms_add);
 
 =pod
@@ -449 +449 @@
 }
 
-=item B<pb_cms_getpkg>
+=item B<pb_cms_get_pkg>
 
 This function returns the list of packages we are working on in a CMS action.
@@ -474 +474 @@
 pb_log(0,"Packages: ".join(',',@pkgs)."\n");
 return(\@pkgs);
+}
+
+=item B<pb_cms_get_real_pkg>
+
+This function returns the real name of a virtual package we are working on in a CMS action.
+It supports the following types: perl.
+The first parameter is the virtual package name
+
+=cut
+
+sub pb_cms_get_real_pkg {
+
+my $pbpkg = shift || undef;
+my $dtype = shift;
+my $pbpkgreal = $pbpkg;
+
+my @nametype = pb_conf_get_if("namingtype");
+my $type = $nametype[0]->{$pbpkg};
+if (defined $type) {
+    if ($type eq "perl") {
+        if ($dtype eq "rpm") {
+            $pbpkgreal = "perl-".$pbpkg;
+        } elsif ($dtype eq "deb") {
+            $pbpkgreal = "lib".lc($pbpkg)."-perl";
+        } elsif ($dtype eq "ebuild") {
+            $pbpkgreal = $pbpkg;
+        } else {
+            die "pb_cms_get_real_pkg not implemented for $dtype yet";
+        }
+    } else {
+        die "nametype $type not implemented yet";
+    }
+}
+
+pb_log(2,"Real Package: $pbpkgreal\n");
+return($pbpkgreal);
 }
 

devel/pb/lib/ProjectBuilder/Env.pm

@@ -118 +118 @@
 # Detect the root dir for hosting all the content generated with pb
 #
-# Tree will look like this:
-#
-#             maint pbdefdir                         PBDEFDIR            dev dir (optional)
-#                  |                                                        |
-#            ------------------------                                --------------------
-#            |                      |                                |                  |
-#         pbproj1                pbproj2             PBPROJ       pbproj1           pbproj2   PBPROJDIR
-#            |                                                       |
-#  ---------------------------------------------                ----------
-#  *      *        *       |        |          |                *        *
-# tag    dev    pbconf    ...     build     delivery PBCONFDIR dev      tag                  
-#  |               |                           |     PBDESTDIR           |
-#  ---          ------                        pbrc   PBBUILDDIR       -------
-#    |          |    |                                                |     |
-#   1.1        dev  tag                                              1.0   1.1                PBDIR
-#                    |
-#                 -------
-#                 |     |
-#                1.0   1.1                           PBROOTDIR
-#                       |
-#               ----------------------------------
-#               |          |           |         |
-#             pkg1      pbproj1.pb   pbfilter   pbcl
-#               |
-#        -----------------
-#        |      |        |
-#       rpm    deb    pbfilter
-#
-#
-# (*) By default, if no relocation in .pbrc, dev dir is taken in the maint pbdefdir (when appropriate)
-# Names under a pbproj and the corresponding pbconf should be similar
-#
+=over 4 
+
+ Tree will look like this:
+
+             maint pbdefdir                         PBDEFDIR            dev dir (optional)
+                  |                                                        |
+            ------------------------                                --------------------
+            |                      |                                |                  |
+         pbproj1                pbproj2             PBPROJ       pbproj1           pbproj2   PBPROJDIR
+            |                                                       |
+  ---------------------------------------------                ----------
+  *      *        *       |        |          |                *        *
+ tag    dev    pbconf    ...     build     delivery PBCONFDIR dev      tag                  
+  |               |                           |     PBDESTDIR           |
+  ---          ------                        pbrc   PBBUILDDIR       -------
+    |          |    |                                                |     |
+   1.1        dev  tag                                              1.0   1.1                PBDIR
+                    |
+                 -------
+                 |     |
+                1.0   1.1                           PBROOTDIR
+                       |
+               ----------------------------------
+               |          |           |         |
+             pkg1      pbproj1.pb   pbfilter   pbcl
+               |
+        -----------------
+        |      |        |
+       rpm    deb    pbfilter
+
+
+ (*) By default, if no relocation in .pbrc, dev dir is taken in the maint pbdefdir (when appropriate)
+ Names under a pbproj and the corresponding pbconf should be similar
+
+=cut
 
 my ($pbdefdir) = pb_conf_get_if("pbdefdir");
@@ -217 +220 @@
 
 #
-# The following part is only useful when in cms2something of newver
+# The following part is only useful when in cms2something or newsomething
 # In VMs/VEs we want to skip that by providing good env vars.
 # return values in that case are useless