X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=include%2FMakefile.am;h=85ffa11da55af922abb9c07f98c2c70428be3c60;hp=cbd8861fc83bd6a8d82fa74b38a038b139c9cccb;hb=2ebe596e3e57e57220afae2b4499aff6348ce3a7;hpb=aa3acc4e196b83d981d11f508a7fffb99b6d5722 diff --git a/include/Makefile.am b/include/Makefile.am index cbd8861fc..85ffa11da 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,75 +1,86 @@ ## -## The version.h file must be verified and generated or updated if the -## git commit id (called git version here) changed since the last build -## of lttng-tools. +## This target generates an include file that contains the git version +## string of the current branch, it must be continuously updated when +## we build in the git repo and shipped in dist tarballs to reflect the +## status of the tree when it was generated. If the tree is clean and +## the current commit is tag a starting with "v", consider this a +## release version and set an empty git version. ## -version.h: - ## - ## We first create variables for the current git version and - ## the locations of the version.h and version.h.tmpl files - ## - @echo -n "Generating version.h ... " - @(version_h_tmpl="$(top_srcdir)/include/version.h.tmpl"; \ - if [ -f "$${version_h_tmpl}" ]; then \ - version_h="$(top_builddir)/include/version.h"; \ - ## - ## We check the git version format we will use depending on - ## whether or not we are in the master branch or on a tag - ## - git_branch="$$(git describe --all 2>/dev/null)"; \ - if [ -z "$${git_branch}" ]; then \ - git_version=""; \ - else \ - git_describe="$$(git describe)"; \ - if [ "$${git_branch}" == "$${git_describe}" ] || \ - [ "$${git_branch}" == "heads/master" ]; then \ - git_version="$${git_describe}"; \ - else \ - git_version="$$(git describe --long --all)"; \ - fi; \ - fi; \ - ## - ## If the version.h file doesn't exist or is not up to date, - ## We replace it by the version.h.tmpl file - ## - if [ ! -e "$${version_h}" ] || \ - [ "$${version_h_tmpl}" -nt "$${version_h}" ]; then \ - cp "$${version_h_tmpl}" "$${version_h}"; \ +## Here is what the inline script does: +## +## First, delete any stale "version.i.tmp" file. +## +## If "bootstrap" and ".git" exists in the top source directory and the git +## executable is available, get the current git version string in the form: +## +## "latest_tag"(-"number_of_commits_on_top")(-g"latest_commit_hash")(-dirty) +## +## And store it in "version.i.tmp", if the current commit is tagged, the tag +## starts with "v" and the tree is clean, consider this a release version and +## overwrite the git version with an empty string in "version.i.tmp". +## +## If we don't have a "version.i.tmp" nor a "version.i", generate an empty +## string as a failover. If a "version.i" is present, for example when building +## from a distribution tarball, get the git_version using grep. +## +## Fetch the EXTRA_VERSION_NAME define from "version/extra_version_name" and output it +## to "version.i.tmp". +## +## Fetch the EXTRA_VERSION_DESCRIPTION define from "version/extra_version_description", +## sanitize and format it with a sed script to replace all non-alpha-numeric values +## with "-" and join all lines by replacing "\n" with litteral string c-style "\n\t" and +## output it to "version.i.tmp". +## +## If we don't have a "version.i" or we have both files (version.i, version.i.tmp) +## and they are different, copy "version.i.tmp" over "version.i". +## This way the dependent targets are only rebuilt when the git version +## string or either one of extra version string change. +## +version_verbose = $(version_verbose_@AM_V@) +version_verbose_ = $(version_verbose_@AM_DEFAULT_V@) +version_verbose_0 = @echo " GEN " $@; + +version.i: + $(version_verbose)rm -f version.i.tmp; \ + if (test -r "$(top_srcdir)/bootstrap" && test -r "$(top_srcdir)/.git") && \ + test -x "`which git 2>&1;true`"; then \ + GIT_VERSION_STR="`cd "$(top_srcdir)" && git describe --tags --dirty`"; \ + GIT_CURRENT_TAG="`cd "$(top_srcdir)" && git describe --tags --exact-match --match="v[0-9]*" HEAD 2> /dev/null`"; \ + echo "#define GIT_VERSION \"$$GIT_VERSION_STR\"" > version.i.tmp; \ + if ! $(GREP) -- "-dirty" version.i.tmp > /dev/null && \ + test "x$$GIT_CURRENT_TAG" != "x"; then \ + echo "#define GIT_VERSION \"\"" > version.i.tmp; \ fi; \ - if [ -n "$${git_version}" ]; then \ - ## - ## We remove the leading "v" for the version number - ## - git_version="$$(echo "$${git_version}" | sed -r "s/^v([0-9])/\1/")"; \ - ## - ## If we have a git version, we verify that it isn't the same - ## as the one currently in the file (if there is one), as we - ## don't want to update the file if it is already up to date - ## - if [ $$(grep -cE "^#define GIT_VERSION \"?$${git_version}\"?$$" "$${version_h}") -eq 0 ]; then \ - if [ $$(grep -c "^#define GIT_VERSION" "$${version_h}") -gt 0 ]; then \ - ## - ## If there is already a GIT_VERSION defined, - ## we just replace it by the new version - ## - sed -i "s'^#define GIT_VERSION.*$$'#define GIT_VERSION \"$${git_version}\"'" "$${version_h}"; \ - else \ - ## - ## Else, we add a GIT_VERSION define - ## containing our new version. - ## - sed -i "s'^\(#define VERSION_H.*\)$$'\1\n\n#define GIT_VERSION \"$${git_version}\"'" "$${version_h}"; \ - fi; \ - fi; \ + fi; \ + if test ! -f version.i.tmp; then \ + if test -f version.i; then \ + $(GREP) "^#define \bGIT_VERSION\b.*" version.i > version.i.tmp; \ + else \ + echo '#define GIT_VERSION ""' > version.i.tmp; \ fi; \ - fi) - @echo "ok" + fi; \ + echo "#define EXTRA_VERSION_NAME \"`$(SED) -n '1p' "$(top_srcdir)/version/extra_version_name" 2> /dev/null`\"" >> version.i.tmp; \ + echo "#define EXTRA_VERSION_DESCRIPTION \"`$(SED) -E ':a ; N ; $$!ba ; s/[^a-zA-Z0-9 \n\t\.,]/-/g ; s/\r{0,1}\n/\\\n\\\t/g' "$(top_srcdir)/version/extra_version_description" 2> /dev/null`\"" >> version.i.tmp; \ + if test ! -f version.i || \ + test x"`cat version.i.tmp`" != x"`cat version.i`"; then \ + mv version.i.tmp version.i; \ + fi; \ + rm -f version.i.tmp; \ + true + +## +## version.i is defined as a .PHONY target even if it's a real file, +## we want the target to be re-run on every make. +## +.PHONY: version.i + +CLEANFILES = version.i.tmp ## -## version.h is defined as a .PHONY file even if it's a real file as -## we want our routine to be runned for each build. +## Only clean "version.i" on dist-clean, we need to keep it on regular +## clean when it's part of a dist tarball. ## -.PHONY: version.h +DISTCLEANFILES = version.i lttnginclude_HEADERS = \ lttng/health.h \ @@ -83,9 +94,55 @@ lttnginclude_HEADERS = \ lttng/lttng-error.h \ lttng/snapshot.h \ lttng/save.h \ - version.h + lttng/load.h \ + lttng/endpoint.h \ + lttng/rotation.h \ + lttng/location.h \ + lttng/userspace-probe.h \ + lttng/session-descriptor.h \ + lttng/destruction-handle.h + +lttngactioninclude_HEADERS= \ + lttng/action/action.h \ + lttng/action/notify.h + +lttngconditioninclude_HEADERS= \ + lttng/condition/condition.h \ + lttng/condition/buffer-usage.h \ + lttng/condition/session-consumed-size.h \ + lttng/condition/session-rotation.h \ + lttng/condition/evaluation.h + +lttngnotificationinclude_HEADERS= \ + lttng/notification/channel.h \ + lttng/notification/notification.h + +lttngtriggerinclude_HEADERS= \ + lttng/trigger/trigger.h noinst_HEADERS = \ lttng/snapshot-internal.h \ lttng/health-internal.h \ - lttng/save-internal.h + lttng/save-internal.h \ + lttng/load-internal.h \ + lttng/action/action-internal.h \ + lttng/action/notify-internal.h \ + lttng/condition/condition-internal.h \ + lttng/condition/buffer-usage-internal.h \ + lttng/condition/session-consumed-size-internal.h \ + lttng/condition/evaluation-internal.h \ + lttng/condition/session-rotation-internal.h \ + lttng/notification/notification-internal.h \ + lttng/trigger/trigger-internal.h \ + lttng/endpoint-internal.h \ + lttng/notification/channel-internal.h \ + lttng/channel-internal.h \ + lttng/event-internal.h \ + lttng/rotate-internal.h \ + lttng/ref-internal.h \ + lttng/location-internal.h \ + lttng/userspace-probe-internal.h \ + lttng/session-internal.h \ + lttng/session-descriptor-internal.h \ + version.h \ + version.i