Closed jsturdy closed 6 years ago
could you please elaborate more on "final", "preliminary" and "untagged" commits? or, maybe we can get some kind of doc extending your manifest?
the logic is roughly laid out in tag2rel.sh
git
treevre='^v?(\.)?([0-9]+)\.([0-9]+)\.([0-9]+)-(alpha|beta|pre|rc)[0-9]+'
pre
and rc
will be treated identically (due to how setuptools
rewrites some things...) so the numbers attached should be strictly increasingpre
tags, ending with vX.Y.Z-preN
rc
distinction makes sense and from this point on (vX.Y.Z-rcN+1
), only rc
should appear in the tag (granted, I don't expect in main production we'll get a lot of different tags in these categories, probably mostly around the time we make API/ABI changes and bump major or minor versions)vre='^v?(\.)?([0-9]+)\.([0-9]+)\.([0-9]+)'
I haven't fully tested this through all the
Verifiedc++/arm
compilation, but if they're getting their version info from the variables, they should be OK
Caveat, every subpackage will have the same version, as it will be obtained from the tag (probably fine, just something to be aware of)
if no outstanding todos, please rebase and merge
Now also builds <package>-devel
RPMs
[sturdy@gem904daq02 software/reg-utils]% rpm -q --qf "[%-15{=NAME} %-36{FILENAMES} %{FILEMODES:perms}\n]" -p ./rwreg/arm/rpm/rwreg-1.0.0-0.3.1.3.pre1.a8611eagit.centos7.arm_linux_gnueabihf_gcc4_9_2.arm.rpm
rwreg /opt/rwreg/bin drwxr-xr-x
rwreg /opt/rwreg/lib drwxr-xr-x
rwreg /opt/rwreg/lib/librwreg.so -rwxr-xr-x
rwreg /opt/rwreg/scripts drwxr-xr-x
[sturdy@gem904daq02 software/reg-utils]% rpm -q --qf "[%-15{=NAME} %-36{FILENAMES} %{FILEMODES:perms}\n]" -p ./rwreg/arm/rpm/rwreg-devel-1.0.0-0.3.1.3.pre1.a8611eagit.centos7.arm_linux_gnueabihf_gcc4_9_2.arm.rpm
rwreg-devel /opt/rwreg/include drwxr-xr-x
rwreg-devel /opt/rwreg/include/CTP7.hh -rw-r--r--
rwreg-devel /opt/rwreg/include/libmemsvc.h -rw-r--r--
[sturdy@gem904daq02 software/reg-utils]% rpm -q --qf "[%-15{=NAME} %-36{FILENAMES} %{FILEMODES:perms}\n]" -p ./rwreg/x86_64/rpm/rwreg-1.0.0-0.3.1.3.pre1.a8611eagit.centos7.gcc6_3_1.x86_64.rpm
rwreg /opt/rwreg/bin drwxr-xr-x
rwreg /opt/rwreg/lib drwxr-xr-x
rwreg /opt/rwreg/lib/librwreg.so -rwxr-xr-x
rwreg /opt/rwreg/scripts drwxr-xr-x
[sturdy@gem904daq02 software/reg-utils]% rpm -q --qf "[%-15{=NAME} %-36{FILENAMES} %{FILEMODES:perms}\n]" -p ./rwreg/x86_64/rpm/rwreg-devel-1.0.0-0.3.1.3.pre1.a8611eagit.centos7.gcc6_3_1.x86_64.rpm
rwreg-devel /opt/rwreg/include drwxr-xr-x
rwreg-devel /opt/rwreg/include/wiscRPCMsg.h -rw-r--r--
rwreg-devel /opt/rwreg/include/wiscrpcsvc.h -rw-r--r--
Motivation and Context
Makes sure versions come from the tag and number of commits since last tag. Allows uniformly sequential builds to be built.
How Has This Been Tested?
Tested
make rpm
with a final, preliminary, and untagged commit