summaryrefslogtreecommitdiff
path: root/patchlevel.h
diff options
context:
space:
mode:
authorYves Orton <demerphq@gmail.com>2008-12-31 01:16:23 +0100
committerYves Orton <demerphq@gmail.com>2008-12-31 01:16:23 +0100
commit46807d8e809cc127621bf85d9e9cea2f838eb477 (patch)
tree602775de59ea65c577768fe05bca20ec88388f00 /patchlevel.h
parent675b0f774d374f6951c02c6463c64a746ad46acd (diff)
downloadperl-46807d8e809cc127621bf85d9e9cea2f838eb477.tar.gz
much better git related version numbering in our (*nix for now) build process
The net result of this patch is to make available via Config.pm and -v/-V the details about the git version info we have available for the build. When built within a git repository git is queried directly. When built from a snapshot or bundle it is assumed that the source is unchanged, and that the required details are avaialble in a file called .patch, whose format current is a four field string in the following format: "$branchname $date.$time $sha1 $describe". The generator of these files currently resides on camel.booking.com. * git-describe is now used more directly with -v. When the prefix of git-describe matches the version number as determined by the defines in patchlevel.h then we use ONLY the git-describe output, otherwise we include the git describe in parenthesis after the version number. Either way the describe text is optionally followed by a star should there be uncommitted changes. eg: This is perl, v5.11.0 (GitLive-blead-136-g58ca560) built for i686-linux or: This is perl, v5.11.0-1-g58ca560 built for i686-linux or: This is perl, v5.11.0 built for i686-linux * include the SHA1 in perl -V summary, and automatically include unpushed commits in the registered patches list * include various git/version/.patch details in %Config, as follows: git_commit_id # sha1 of HEAD git_ancestor # ancestor in $remote/$branch (presumably canonical) git_describe # git describe git_branch # current branch git_uncommitted_changes # "true" if there are any, empty otherwise git_unpushed_commits # List of sha1's of unpushed commits git_commit_id_title # Used to make the perl -V summary output Additionally one more value is added depending on build process used: when building from an rsynced snapshot (or any dist including a file called .patch) then the second field will be used to populate the "git_snapshot_date" field. Otherwise if built in a git directory (as is hopefully recommended these day) then the field will be "git_commit_date" which will be the commit date of HEAD. This patch introduces two new files (on top of .patchnum) that will be generated by make_patchnum.sh: "lib/Config_git.pl" and "unpushed.h", the former is used to make git data available to Config.pm/%Config without rebuilding everything else, and the second is used to expose unpushed commits (if any) via the registered patch facility of patchlevel.h
Diffstat (limited to 'patchlevel.h')
-rw-r--r--patchlevel.h14
1 files changed, 13 insertions, 1 deletions
diff --git a/patchlevel.h b/patchlevel.h
index 391cb4126c..a17a6e679d 100644
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -116,9 +116,21 @@ hunk.
*/
#if !defined(PERL_PATCHLEVEL_H_IMPLICIT) && !defined(LOCAL_PATCH_COUNT)
+#include "unpushed.h"
+#if !defined(PERL_GIT_UNPUSHED_COMMITS)
+#define PERL_GIT_UNPUSHED_COMMITS_PATCH /* no-op */
+#else
+#define PERL_GIT_UNPUSHED_COMMITS_PATCH PERL_GIT_UNPUSHED_COMMITS
+#endif
+#if !defined(PERL_GIT_UNCOMMITTED_CHANGES)
+#define PERL_GIT_UNCOMMITTED_CHANGES_PATCH /*no op*/
+#else
+#define PERL_GIT_UNCOMMITTED_CHANGES_PATCH , STRINGIFY(PERL_GIT_UNCOMMITTED_CHANGES)
+#endif
static const char * const local_patches[] = {
NULL
- ,"DEVEL"
+ PERL_GIT_UNPUSHED_COMMITS_PATCH /* do not remove this line */
+ PERL_GIT_UNCOMMITTED_CHANGES_PATCH /* do not remove this line */
,NULL
};