Changeset 1601 in ProjectBuilder for devel/pb

Timestamp:

May 26, 2012, 3:53:52 PM (12 years ago)

Author:

Bruno Cornec

Message:

• pb correctly now differentiate PBDEP and BPBDEP (in Env.pm for template generation
• pbtest uses now this feature
• Fix mageia 1 and 2 deps for VE
• remove a detail given in a generated pb_system as it creates errors in the built script

Location:

devel/pb

Files:

• bin/pb (modified) (1 diff)
• t/pbtest (modified) (5 diffs)

devel/pb/bin/pb

@@ -3323 +3323 @@
         # Sync date
         # do it after sudoers is setup
-        print SCRIPT "pb_system(\"$ntpline\",\"Setting up time\",\"mayfail\");\n";
+        print SCRIPT "pb_system(\"$ntpline\");\n";
     }
     # We may need a proxy configuration. Get it from the local env

devel/pb/t/pbtest

@@ -222 +222 @@
 filter PBGRP = Applications/Archiving
 filter PBLIC = Afio
-filter PBDEP = gcc
+filter PBBDEP = gcc
 EOF
 sudocmd "mv /tmp/rpm.pbf $PBTEST/pb/afio/pbconf/2.5/pbfilter/rpm.pbf"
 sudocmd "chown ${PBUSER}:$PBUSER $PBTEST/pb/afio/pbconf/2.5/pbfilter/rpm.pbf "
 
-cat >> /tmp/deb.pbf << EOF
+cat > /tmp/deb.pbf << EOF
 filter PBGRP = utils
 filter PBLIC = Afio
@@ -244 +244 @@
 perl -pi -e 's|%doc ChangeLog|%doc HISTORY PORTING README SCRIPTS ANNOUNCE-2.5 perl.artistic.license|' $PBTEST/pb/afio/pbconf/2.5/afio/rpm/afio.spec
 perl -pi -e 's|%doc INSTALL COPYING README AUTHORS NEWS|%doc afio.lsm script1 script2 script3 script4\n%{_bindir}/%{name}\n%{_mandir}/man1/%{name}.1*|' $PBTEST/pb/afio/pbconf/2.5/afio/rpm/afio.spec
-perl -pi -e 's|^#Requires:|Requires:|' $PBTEST/pb/afio/pbconf/2.5/afio/rpm/afio.spec
+perl -pi -e 's|^#BuildRequires:|BuildRequires:|' $PBTEST/pb/afio/pbconf/2.5/afio/rpm/afio.spec
 EOF
 chmod 755 /tmp/pbtestcmd
@@ -294 +294 @@
 perl -pi -e 's|config.status: configure|config.status: Makefile|' $PBTEST/pb/afio/pbconf/2.5/afio/deb/rules
 perl -pi -e 's|dh_installchangelogs ChangeLog|dh_installchangelogs debian/changelog|' $PBTEST/pb/afio/pbconf/2.5/afio/deb/rules
-perl -pi -e 's|\\\$(MAKE) install.*|mkdir -p \\\$(CURDIR)/debian/\\\$(PACKAGE_NAME)/usr/bin \\\$(CURDIR)/debian/\\\$(PACKAGE_NAME)/usr/share/man/man1|' $PBTEST/pb/afio/pbconf/2.5/afio/deb/rules
-perl -pi -e 's|# - copy html manual to temporary location for renaming|install -p -m 755 afio \\\$(CURDIR)/debian/\\\$(PACKAGE_NAME)/usr/bin ; install -p -m 644 afio.1 \\\$(CURDIR)/debian/\\\$(PACKAGE_NAME)/usr/share/man/man1|' $PBTEST/pb/afio/pbconf/2.5/afio/deb/rules
+perl -pi -e 's|# - copy html manual to temporary location for renaming|mkdir -p \\\$(CURDIR)/debian/\\\$(PACKAGE_NAME)/usr/bin \\\$(CURDIR)/debian/\\\$(PACKAGE_NAME)/usr/share/man/man1 ; install -p -m 755 afio \\\$(CURDIR)/debian/\\\$(PACKAGE_NAME)/usr/bin ; install -p -m 644 afio.1 \\\$(CURDIR)/debian/\\\$(PACKAGE_NAME)/usr/share/man/man1|' $PBTEST/pb/afio/pbconf/2.5/afio/deb/rules
 sed -i -e '/\.\/configure /d' $PBTEST/pb/afio/pbconf/2.5/afio/deb/rules
+sed -i -e '/ install prefix=/d' $PBTEST/pb/afio/pbconf/2.5/afio/deb/rules
 EOF
 chmod 755 /tmp/pbtestcmd
@@ -330 +330 @@
 sudopbtest "svn ci $VCSOPT -m 'sync before newver' $PBTEST/pb"
 sudopbtest "PBVCSOPT=\"$VCSOPT\" pb -r 2.5 -V 2.6 newver"
+sudopbtest "pb -r 2.6 sbx2pkg"
 sudopbtest "pb clean"
 
@@ -340 +341 @@
 sudopbtest "qemu-img create -f qcow2 $PBTEST/vm/$d.qemu 72G"
 sudopbtest "qemu-kvm -m 1024 -kernel /pub/mageia/distrib/2/i586/isolinux/alt0/vmlinuz -initrd /pub/mageia/distrib/2/i586/isolinux/alt0/all.rdz -append "ramdisk_size=128000 root=/dev/ram3 kickstart=http://192.168.8.55/pub/ks/guerrero/ks.pl automatic=method:http,server:192.168.8.55,directory:/pub/mageia/distrib/2/i586,network:dhcp" -drive file=$PBTEST/vm/$d.qemu,if=virtio,media=disk -redir tcp:2200:10.0.2.15:22"
-sudopbtest "pb -p pb -m $d sbx2setupvm"
+sudopbtest "pb -p pb -r devel -m $d sbx2setupvm"
 sudopbtest "pb -p pb -m $d snapvm"
 sudopbtest "pb -m $d sbx2vm"
 
 
-# test also with MOndoRescue
+# test also with MondoRescue
 pb -p mondorescue -r branches/3.0 cms2pkg