Changeset 2251 in ProjectBuilder for devel/pbtest

Timestamp:

Aug 30, 2017, 5:07:30 PM (8 years ago)

Author:

Bruno Cornec

Message:

Transform .pb and .pbf files into .yml as well

In example generated as well as in the usage during processing

File:

• devel/pbtest/bin/pbtest (modified) (1 diff)

devel/pbtest/bin/pbtest

@@ -208 +208 @@
 sudopbtest "PBVCSOPT=\"$VCSOPT\" pb -p $PBPROJ -r 2.5 newproj afio"
 
-grep -vE '^defpkgdir|^projver|^projtag|^pburl|^pbrepo|^shh' $PBTEST/pb/afio/pbconf/2.5/afio.pb > /tmp/afio.pb
-cat >> /tmp/afio.pb << EOF
-defpkgdir afio = dummy
-projver afio = 2.5
-projtag afio = 1
-pburl afio = ftp://ftp.project-builder.org/src/afio-2.5.tar.gz
-pbrepo afio = ftp://ftp.project-builder.org
-sshhost afio = localhost
-sshlogin afio = $PBUSER
-sshdir afio = \$ENV{'HOME'}/ftp
-EOF
-sudocmd "mv /tmp/afio.pb $PBTEST/pb/afio/pbconf/2.5/afio.pb"
-sudocmd "chown ${PBUSER}:$PBUSER $PBTEST/pb/afio/pbconf/2.5/afio.pb"
+grep -vE '^defpkgdir|^projver|^projtag|^pburl|^pbrepo|^shh' $PBTEST/pb/afio/pbconf/2.5/afio.yml > /tmp/afio.yml
+cat >> /tmp/afio.yml << EOF
+  defpkgdir:
+    afio : dummy
+  projver:
+    afio : 2.5
+  projtag:
+    afio : 1
+  pburl:
+    afio : ftp://ftp.project-builder.org/src/afio-2.5.tar.gz
+  pbrepo:
+    afio : ftp://ftp.project-builder.org
+  sshhost:
+    afio : localhost
+  sshlogin:
+    afio : $PBUSER
+  sshdir:
+    afio : \$ENV{'HOME'}/ftp
+EOF
+sudocmd "mv /tmp/afio.yml $PBTEST/pb/afio/pbconf/2.5/afio.yml"
+sudocmd "chown ${PBUSER}:$PBUSER $PBTEST/pb/afio/pbconf/2.5/afio.yml"
 cat > /tmp/pbtestcmd << EOF
-perl -pi -e 's|testver\s+afio\s+=\s+true|testver\ afio\ =\ false|' $PBTEST/pb/afio/pbconf/2.5/afio.pb
+perl -pi -e 's|testver\s+afio\s+=\s+true|testver\ afio\ =\ false|' $PBTEST/pb/afio/pbconf/2.5/afio.yml
 EOF
 chmod 755 /tmp/pbtestcmd
 sudopbtest /tmp/pbtestcmd
 
-grep -vE 'PBSRC|PBDESC|PBSUMMARY|PBURL|PBLOG' $PBTEST/pb/afio/pbconf/2.5/pbfilter/all.pbf > /tmp/all.pbf
-cat >> /tmp/all.pbf << EOF
-filter PBSRC = src/%{name}-%{version}.tar.gz
-filter PBDESC = afio is a cpio compatible archiver with extended features$/It can compress on a file by file basis.
-filter PBSUMMARY = afio is a cpio compatible archiver with extended features
-filter PBURL = http://www.boutell.com/lsm/lsmbyid.cgi/000462
-filter PBLOG = no
-EOF
-sudocmd "mv /tmp/all.pbf $PBTEST/pb/afio/pbconf/2.5/pbfilter/all.pbf"
-sudocmd "chown ${PBUSER}:$PBUSER $PBTEST/pb/afio/pbconf/2.5/pbfilter/all.pbf"
-
-grep -vE 'PBGRP|PBLIC' $PBTEST/pb/afio/pbconf/2.5/pbfilter/rpm.pbf > /tmp/rpm.pbf
-cat >> /tmp/rpm.pbf << EOF
-filter PBGRP = Applications/Archiving
-filter PBLIC = Afio
-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
-filter PBGRP = utils
-filter PBLIC = Afio
-filter PBBDEP = gcc
-EOF
-sudocmd "mv /tmp/deb.pbf $PBTEST/pb/afio/pbconf/2.5/pbfilter/deb.pbf"
-sudocmd "chown ${PBUSER}:$PBUSER $PBTEST/pb/afio/pbconf/2.5/pbfilter/deb.pbf "
+grep -vE 'PBSRC|PBDESC|PBSUMMARY|PBURL|PBLOG' $PBTEST/pb/afio/pbconf/2.5/pbfilter/all.yml > /tmp/all.yml
+cat >> /tmp/all.yml << EOF
+  filter:
+    PBSRC : src/%{name}-%{version}.tar.gz
+    PBDESC : afio is a cpio compatible archiver with extended features$/It can compress on a file by file basis.
+    PBSUMMARY : afio is a cpio compatible archiver with extended features
+    PBURL : http://www.boutell.com/lsm/lsmbyid.cgi/000462
+    PBLOG : no
+EOF
+sudocmd "mv /tmp/all.yml $PBTEST/pb/afio/pbconf/2.5/pbfilter/all.yml"
+sudocmd "chown ${PBUSER}:$PBUSER $PBTEST/pb/afio/pbconf/2.5/pbfilter/all.yml"
+
+grep -vE 'PBGRP|PBLIC' $PBTEST/pb/afio/pbconf/2.5/pbfilter/rpm.yml > /tmp/rpm.yml
+cat >> /tmp/rpm.yml << EOF
+  filter:
+    PBGRP : Applications/Archiving
+    PBLIC : Afio
+    PBBDEP : gcc
+EOF
+sudocmd "mv /tmp/rpm.yml $PBTEST/pb/afio/pbconf/2.5/pbfilter/rpm.yml"
+sudocmd "chown ${PBUSER}:$PBUSER $PBTEST/pb/afio/pbconf/2.5/pbfilter/rpm.yml "
+
+cat > /tmp/deb.yml << EOF
+  filter:
+    PBGRP : utils
+    PBLIC : Afio
+    PBBDEP : gcc
+EOF
+sudocmd "mv /tmp/deb.yml $PBTEST/pb/afio/pbconf/2.5/pbfilter/deb.yml"
+sudocmd "chown ${PBUSER}:$PBUSER $PBTEST/pb/afio/pbconf/2.5/pbfilter/deb.yml "
 
 # First build