diff options
-rwxr-xr-x | make-version.pl | 25 | ||||
-rw-r--r-- | ws_version_info.c | 2 |
2 files changed, 9 insertions, 18 deletions
diff --git a/make-version.pl b/make-version.pl index f12f8bc590..8f0304b700 100755 --- a/make-version.pl +++ b/make-version.pl @@ -587,30 +587,21 @@ sub update_versioned_files sub new_version_h { - my $VCS_REVISION; my $set_header = shift @_; if (!$set_header) { - $VCS_REVISION = "/* #undef VCSVERSION */\n"; - $VCS_REVISION .= "/* #undef VCSBRANCH */\n"; - return $VCS_REVISION; + return "/* #undef VCSVERSION */\n"; } if ($git_description) { - $VCS_REVISION = "#define VCSVERSION \"" . - $git_description . "\"\n" . - "#define VCSBRANCH \"" . $repo_branch . "\"\n"; - } elsif ($last_change && $num_commits) { - $VCS_REVISION = "#define VCSVERSION \"" . $vcs_name . " Rev " . - $num_commits . "\"\n" . - "#define VCSBRANCH \"" . $repo_branch . "\"\n"; - } else { - $VCS_REVISION = "#define VCSVERSION \"" . $vcs_name . - " Rev Unknown\"\n" . - "#define VCSBRANCH \"unknown\"\n"; + return "#define VCSVERSION \"$git_description from $repo_branch\"\n"; + } + + if ($last_change && $num_commits) { + return "#define VCSVERSION \"$vcs_name Rev $num_commits from $repo_branch\"\n"; } - return $VCS_REVISION; + return "#define VCSVERSION \"$vcs_name Rev Unknown from unknown\"\n"; } # Print the version control system's version to $version_file. @@ -630,7 +621,7 @@ sub print_VCS_REVISION $VCS_REVISION = new_version_h($set_header); if (open(OLDREV, "<$version_file")) { - my $old_VCS_REVISION = <OLDREV> . <OLDREV>; + my $old_VCS_REVISION = <OLDREV>; if ($old_VCS_REVISION eq $VCS_REVISION) { $needs_update = 0; } diff --git a/ws_version_info.c b/ws_version_info.c index 830e37175c..6d47b16bcc 100644 --- a/ws_version_info.c +++ b/ws_version_info.c @@ -377,7 +377,7 @@ const char * get_ws_vcs_version_info(void) { #ifdef VCSVERSION - return VERSION " (" VCSVERSION " from " VCSBRANCH ")"; + return VERSION " (" VCSVERSION ")"; #else return VERSION; #endif |