diff options
author | Guenter Knauf <fuankg@apache.org> | 2013-05-27 00:00:55 +0000 |
---|---|---|
committer | Guenter Knauf <fuankg@apache.org> | 2013-05-27 00:00:55 +0000 |
commit | 5f15a84deb579dbee6fed90f07116464d234ca83 (patch) | |
tree | 49467112bf214a11aa1fe7504e231d8458c5c9f1 /build/nw_ver.awk | |
parent | 3fab5f89e3ed86efead2ebfc1ee5ce510b76c5ec (diff) | |
download | apr-5f15a84deb579dbee6fed90f07116464d234ca83.tar.gz |
Use SVN revision for NetWare dev builds version info.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1486495 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build/nw_ver.awk')
-rw-r--r-- | build/nw_ver.awk | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/build/nw_ver.awk b/build/nw_ver.awk index e83ea9689..405c847bd 100644 --- a/build/nw_ver.awk +++ b/build/nw_ver.awk @@ -31,7 +31,18 @@ BEGIN { ver_devbuild = 1; } } - ver_str = ver_major "." ver_minor "." ver_patch (ver_devbuild ? "-dev" : ""); + if (ver_devbuild) { + ver_dev = "-dev" + if (ARGV[2]) { + while ((getline < ARGV[2]) > 0) { + if (match ($0, /^\/repos\/asf\/!svn\/ver\/[0-9]+\/apr\/(apr|apr-util)\/(trunk|branches\/[0-9]\.[0-9]\.x)$/)) { + gsub(/^\/repos\/asf\/!svn\/ver\/|\/apr\/(apr|apr-util)\/(trunk|branches\/[0-9]\.[0-9]\.x)$/, "", $0); + ver_dev = svn_rev = "-r" $0; + } + } + } + } + if (WANTED) { ver_num = ver_major * 1000000 + ver_minor * 1000 + ver_patch; if (ver_num < WANTED) { @@ -46,9 +57,12 @@ BEGIN { } } else { ver_nlm = ver_major "," ver_minor "," ver_patch; + ver_str = ver_major "." ver_minor "." ver_patch ver_dev; print "VERSION = " ver_nlm ""; print "VERSION_STR = " ver_str ""; print "VERSION_MAJMIN = " ver_major ver_minor ""; + # print "COPYRIGHT_STR = " copyright_str ""; + print "SVN_REVISION = " svn_rev ""; } } |