diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2006-01-11 18:34:55 +0100 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2006-01-11 18:34:55 +0100 |
| commit | 1dc99419ec0882885e4c3ea6336f6690e87425e2 (patch) | |
| tree | c02b56de17f586a319bfed43172ac6e5b96a1f7c /build/win32 | |
| parent | Authz refactoring (diff) | |
| download | apache2-1dc99419ec0882885e4c3ea6336f6690e87425e2.tar.xz apache2-1dc99419ec0882885e4c3ea6336f6690e87425e2.zip | |
Correct version numbering for generated .rc files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@368072 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build/win32')
| -rw-r--r-- | build/win32/win32ver.awk | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/build/win32/win32ver.awk b/build/win32/win32ver.awk index 739bf87708..5ecf4d314f 100644 --- a/build/win32/win32ver.awk +++ b/build/win32/win32ver.awk @@ -53,32 +53,29 @@ BEGIN { if (match ($0, /^.*Copyright /)) { copyright = substr($0, RLENGTH + 1); } - if (match ($0, /^#define AP_SERVER_MAJORVERSION_NUMBER [^*]/)) { + if (match ($0, /^#define AP_SERVER_MAJORVERSION_NUMBER /)) { ver_major = $3; } - else if (match ($0, /^#define AP_SERVER_MINORVERSION_NUMBER [^*]/)) { + else if (match ($0, /^#define AP_SERVER_MINORVERSION_NUMBER /)) { ver_minor = $3; } - else if (match ($0, /^#define AP_SERVER_PATCHLEVEL_NUMBER [^*]/)) { + else if (match ($0, /^#define AP_SERVER_PATCHLEVEL_NUMBER /)) { ver_patch = $3; } - else if (match ($0, /^#define AP_SERVER_ADD_STRING [^"]+"/)) { - ver_patch_modifier = substr($3, 2, length($3) - 2); + else if (match ($0, /^#define AP_SERVER_ADD_STRING +"[^"]+"/)) { + ver_build = substr($3, 2, length($3) - 2); } } - ver = ver_major "." ver_minor "." ver_patch ver_patch_modifier; - verc = ver_major "," ver_minor "," ver_patch; - if (build) { - sub(/-.*/, "", verc) - verc = verc "," build; - } else if (sub(/-dev/, ",0", verc)) { - ff = ff + 2; - } else if (!sub(/-alpha/, ",10", verc) \ - && !sub(/-beta/, ",100", verc) \ - && !sub(/-gold/, ",200", verc)) { - sub(/-.*/, "", verc); + ver = ver_major "." ver_minor "." ver_patch ver_build; + gsub(/\./, ",", verc); + if (match (ver_build, /-dev/)) { + ff = ff + 2; verc = verc "," 0; + } else if (!ver_build) { + verc = verc "," 200; + } else { + verc = verc "," 100; } if (length(vendor)) { |