Skip to content

Commit

Permalink
Feature: add git repo reference to mdsdcl
Browse files Browse the repository at this point in the history
git commands has been added to obtain the RELEASE_TAG from git if the code has been
installed from sources. All added information are written to mdsdcl structure that
can be accessed through "mdsdcl show git", with some further optional qualifiers:
TAG, BRANCH, COMMIT, REMOTE, REMOTE_URL

the GIT_TAG is formatted as follow:
 [closest_release_tag]-[number_of_commit_ahead]-g[short_commit_hash]<"M" if code has uncommitted changes>

Some additional improvement have been also added within the same commit:
1) a help-more command that writes the commented targets tagged with ##@@argument
2) the autmatic reconfigure upon changes in any Makfile.in
3) a new configure parameter --disable-uncommitted-install prevent install
   action if there are uncommitted changes
  • Loading branch information
AndreaRigoni authored and tfredian committed May 22, 2019
1 parent 2afbced commit 8598fa9
Show file tree
Hide file tree
Showing 80 changed files with 1,297 additions and 267 deletions.
13 changes: 11 additions & 2 deletions LabView/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_defun_local.m4 \
$(top_srcdir)/m4/ax_compare_version.m4 \
$(top_srcdir)/m4/ax_compiler_vendor.m4 \
$(top_srcdir)/m4/ax_compiler_version.m4 \
$(top_srcdir)/m4/ax_git_revision.m4 \
$(top_srcdir)/m4/ax_reconfigure_targets.m4 \
$(top_srcdir)/m4/ax_target_selfhelp.m4 \
$(top_srcdir)/m4/m4_ac_search_readline.m4 \
$(top_srcdir)/m4/m4_am_path_xml2.m4 \
Expand Down Expand Up @@ -243,12 +245,21 @@ FORLD = @FORLD@
FOR_LDFLAGS = @FOR_LDFLAGS@
FOR_LINKSHARED = @FOR_LINKSHARED@
GEN_DEVICE = @GEN_DEVICE@
GIT_BRANCH = @GIT_BRANCH@
GIT_COMMIT = @GIT_COMMIT@
GIT_COMMIT_DATE = @GIT_COMMIT_DATE@
GIT_REMOTE = @GIT_REMOTE@
GIT_REMOTE_URL = @GIT_REMOTE_URL@
GIT_SRCDIR = @GIT_SRCDIR@
GIT_TAG = @GIT_TAG@
GLOBUS_CFLAGS = @GLOBUS_CFLAGS@
GLOBUS_FLAVOR = @GLOBUS_FLAVOR@
GLOBUS_LIBS = @GLOBUS_LIBS@
GLOBUS_LOCATION = @GLOBUS_LOCATION@
GREP = @GREP@
HAVE_AWK = @HAVE_AWK@
HAVE_DOCKER = @HAVE_DOCKER@
HAVE_GIT = @HAVE_GIT@
HAVE_MOTIF = @HAVE_MOTIF@
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WINE = @HAVE_WINE@
Expand Down Expand Up @@ -358,8 +369,6 @@ READLINE_CPPFLAGS = @READLINE_CPPFLAGS@
READLINE_LDFLAGS = @READLINE_LDFLAGS@
READLINE_LIBS = @READLINE_LIBS@
READLINK = @READLINK@
RELEASE_BRANCH = @RELEASE_BRANCH@
RELEASE_COMMIT = @RELEASE_COMMIT@
RELEASE_DATE = @RELEASE_DATE@
RELEASE_MAJOR = @RELEASE_MAJOR@
RELEASE_MINOR = @RELEASE_MINOR@
Expand Down
7 changes: 3 additions & 4 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@
include @top_builddir@/Makefile.inc

srcdir=@srcdir@
builddir=@builddir@
builddir=@builddir@
VPATH=@srcdir@
@AX_RECONFIGURE_TARGET@


# selfhelp target
@TARGET_SELFHELP@
HELP_DESCRIPTION = This is MDSplus build system, documented targets follow:

JAVA_JAR = \
javascope \
Expand Down
7 changes: 5 additions & 2 deletions Makefile.inc.in
Original file line number Diff line number Diff line change
Expand Up @@ -93,15 +93,17 @@ $(sort @MAKEBINDIR@ @MAKELIBDIR@ @MAKESHLIBDIR@ @MAKEETCDIR@ @MAKEUIDDIR@ @uiddi

.DEFAULT_GOAL := all

## enable help command
@TARGET_SELFHELP@
HELP_DESCRIPTION = This is MDSplus build system, documented targets follow:

## docker build targets
@AX_DOCKER_BUILD_TARGETS@


## git release tags
@AX_GIT_REVISION_TARGETS@



.PHONY: reconfigure
reconfigure: ##@miscellaneous rerun configure script again using last arguments passed
@ \
Expand All @@ -112,3 +114,4 @@ reconfigure: ##@miscellaneous rerun configure script again using last arguments
cd '$(top_builddir)' && \
$(top_srcdir)/configure $(shell $(abs_top_builddir)/config.status --config);


2 changes: 2 additions & 0 deletions actions/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ include @top_builddir@/Makefile.inc
srcdir=@srcdir@
builddir=@builddir@
VPATH = @srcdir@
@AX_RECONFIGURE_TARGET@

X_CFLAGS=@X_CFLAGS@
CFLAGS+=$(X_CFLAGS) @TARGET_ARCH@
X_LIBS=@X_LIBS@
Expand Down
3 changes: 3 additions & 0 deletions camshr/Makefile.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
include @top_builddir@/Makefile.inc

srcdir = @srcdir@
builddir = @builddir@
VPATH = @srcdir@
@AX_RECONFIGURE_TARGET@

@MINGW_TRUE@ IMPLIB=@[email protected]

Expand Down
6 changes: 5 additions & 1 deletion ccl/Makefile.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
include @top_builddir@/Makefile.inc

VPATH = @srcdir@
srcdir=@srcdir@
builddir=@builddir@
VPATH=@srcdir@
@AX_RECONFIGURE_TARGET@

SOURCES = ccl_verbs.c
OBJECTS = $(SOURCES:.c=.o)
EXPORTS = ccl_commands.exports
Expand Down
Loading

0 comments on commit 8598fa9

Please sign in to comment.