Changeset 1555 in ProjectBuilder

Timestamp:

May 21, 2012, 3:35:23 AM (12 years ago)

Author:

Bruno Cornec

Message:

• pb: improve documentation on the project.pb entries. Use new projcomponent value to specify which component we are building for -- most things probably aren't contrib (for deb based distros) (Eric Anderson)

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/Env.pm (modified) (1 diff)
• pb/bin/pb (modified) (5 diffs)
• pb/lib/ProjectBuilder/CMS.pm (modified) (3 diffs)

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

@@ -432 +432 @@
 #pbsmtp $ENV{'PBPROJ'} = localhost
 #pbgpgcheck $ENV{'PBPROJ'} = 1
+# For distro supporting it, which area is used
 #projcomponent $ENV{'PBPROJ'} = main
 

devel/pb/bin/pb

@@ -491 +491 @@
 =item Update your $project.pb configuration file.
 
-You need to set the pburl, pbrepo, pbwf, pbpackager, projver, projtag, testver, delivery, and defpkgdir lines as described in the configuration file.  For example:
+You need to set the pburl, pbrepo, pbwf, pbpackager, projver, projtag, testver, delivery, and defpkgdir lines as described in the configuration file. The pburl entry is used to find the source for your package. The pbrepo entry is used to build the .repo or .sources.list files for use by downloaders of the package. The pbwf entry indicates that the source tar file is named by I<package-name>-I<version>. The pbpackager entry will be stored in the packages and should be you or your team. The projver/projtag entries indicate the version of the software and the version of the packaging scripts. The testver entry when true indicates that the package is in a test version, so no log file is computed (can be long), and version is made up using a timstamp. The delivery entry gives the subdirectory under which the packages will be delivered on the repository, and the defpkgdir entry corresponds to the local subdirectory hosting the package content.
+
+For example:
 
  pburl Lintel = file:///home/anderse/projects/Lintel-0.2012.02.28.tar.gz
@@ -2141 +2143 @@
             # Remove extra . in path to fix #522
             $rpd =~ s|/./|/|g;
+            my ($projcomponent_map) = pb_conf_get_if("projcomponent");
+            pb_log(2,"projcomponent = ".Dumper($projcomponent_map);
+            my $projcomponent = $projcomponent_map->{$ENV{PBPROJ}};
+            $projcomponent ||= 'contrib';
             print PBS << "EOF";
 #!/bin/bash
 # Prepare a script to ease apt setup
 cat > $ENV{'PBPROJ'}.sources.list << EOT
-deb $rpd $pbos->{'version'} contrib
-deb-src $rpd $pbos->{'version'} contrib
+deb $rpd $pbos->{'version'} $projcomponent
+deb-src $rpd $pbos->{'version'} $projcomponent
 EOT
 chmod 644 $ENV{'PBPROJ'}.sources.list
@@ -2152 +2158 @@
 # Up two levels to deal with the dist dir cross versions
 cd ..
-mkdir -p dists/$pbos->{'version'}/contrib/binary-$debarch dists/$pbos->{'version'}/contrib/source
+mkdir -p dists/$pbos->{'version'}/$projcomponent/binary-$debarch dists/$pbos->{'version'}/$projcomponent/source
 
 # Prepare a script to create apt info file
@@ -2160 +2166 @@
 cat > \$TMPD/Release << EOT
 Archive: unstable
-Component: contrib
+Component: $projcomponent
 Origin: $ENV{'PBPROJ'}
 Label: $ENV{'PBPROJ'} dev repository $pbrepo->{$ENV{'PBPROJ'}}
@@ -2166 +2172 @@
 
 echo "Creating Packages metadata ($pbos->{'arch'} aka $debarch)"
-dpkg-scanpackages -a$debarch $pbos->{'version'} /dev/null | gzip -c9 > dists/$pbos->{'version'}/contrib/binary-$debarch/Packages.gz
-dpkg-scanpackages -a$debarch $pbos->{'version'} /dev/null | bzip2 -c9 > dists/$pbos->{'version'}/contrib/binary-$debarch/Packages.bz2
+dpkg-scanpackages -a$debarch $pbos->{'version'} /dev/null | gzip -c9 > dists/$pbos->{'version'}/$projcomponent/binary-$debarch/Packages.gz
+dpkg-scanpackages -a$debarch $pbos->{'version'} /dev/null | bzip2 -c9 > dists/$pbos->{'version'}/$projcomponent/binary-$debarch/Packages.bz2
 echo "Creating Contents metadata"
 apt-ftparchive contents $pbos->{'version'} | gzip -c9 > dists/$pbos->{'version'}/Contents.gz
 echo "Creating Release metadata ($pbos->{'arch'} aka $debarch)"
-cat \$TMPD/Release > dists/$pbos->{'version'}/contrib/binary-$debarch/Release
-echo "Architecture: $debarch" >> dists/$pbos->{'version'}/contrib/binary-$debarch/Release
+cat \$TMPD/Release > dists/$pbos->{'version'}/$projcomponent/binary-$debarch/Release
+echo "Architecture: $debarch" >> dists/$pbos->{'version'}/$projcomponent/binary-$debarch/Release
 echo "Creating Source metadata"
-dpkg-scansources $pbos->{'version'} /dev/null | gzip -c9 > dists/$pbos->{'version'}/contrib/source/Sources.gz
-cat \$TMPD/Release > dists/$pbos->{'version'}/contrib/source/Release
-echo "Architecture: Source" >> dists/$pbos->{'version'}/contrib/source/Release
+dpkg-scansources $pbos->{'version'} /dev/null | gzip -c9 > dists/$pbos->{'version'}/$projcomponent/source/Sources.gz
+cat \$TMPD/Release > dists/$pbos->{'version'}/$projcomponent/source/Release
+echo "Architecture: Source" >> dists/$pbos->{'version'}/$projcomponent/source/Release
 echo "Creating Release metadata"
 # Signing that file would be useful but uneasy as gpg keys are not there

devel/pb/lib/ProjectBuilder/CMS.pm

@@ -92 +92 @@
 #
 my $turl = "$pburl->{$ENV{'PBPROJ'}}/$tmp";
-$turl = $pburl->{$ENV{'PBPROJ'}} if ($scheme =~ /^(flat)|(ftp)|(http)|(file)\b/o) {
+$turl = $pburl->{$ENV{'PBPROJ'}} if ($scheme =~ /^(flat)|(ftp)|(http)|(file)\b/o);
 pb_cms_compliant(undef,'PBDIR',"$ENV{'PBPROJDIR'}/$tmp",$turl,$pbinit);
 
@@ -108 +108 @@
     $ENV{'PBREVISION'}=$tmp;
     $ENV{'PBCMSLOGFILE'}="git.log";
-} elsif (($scheme =~ /^(flat)|(ftp)|(http)|(file)\b/o) {
+} elsif ($scheme =~ /^(flat)|(ftp)|(http)|(file)\b/o) {
     $ENV{'PBREVISION'}="flat";
     $ENV{'PBCMSLOGFILE'}="flat.log";
@@ -432 +432 @@
         close(CL);
         pb_system("$vcscmd log -v $pkgdir > $dest/$ENV{'PBCMSLOGFILE'}","Extracting log info from GIT");
-    } elsif (($scheme =~ /^(flat)|(ftp)|(http)|(file)|(dir)\b/o) {
+    } elsif ($scheme =~ /^(flat)|(ftp)|(http)|(file)|(dir)\b/o) {
         pb_system("echo ChangeLog for $pkgdir > $dest/ChangeLog","Empty ChangeLog file created");
     } elsif ($scheme =~ /^cvs/) {