diff --git a/LabView/Makefile.in b/LabView/Makefile.in index 4b601935f9..2c2ca7b8bd 100644 --- a/LabView/Makefile.in +++ b/LabView/Makefile.in @@ -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 \ @@ -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@ @@ -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@ diff --git a/Makefile.in b/Makefile.in index 7279ade122..ffeb679972 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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 \ diff --git a/Makefile.inc.in b/Makefile.inc.in index 298bca2dba..bd14b0d6cb 100644 --- a/Makefile.inc.in +++ b/Makefile.inc.in @@ -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 @ \ @@ -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); + diff --git a/actions/Makefile.in b/actions/Makefile.in index f8c92b43b0..935860300d 100644 --- a/actions/Makefile.in +++ b/actions/Makefile.in @@ -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@ diff --git a/camshr/Makefile.in b/camshr/Makefile.in index 4e7bd03137..72a0d97030 100644 --- a/camshr/Makefile.in +++ b/camshr/Makefile.in @@ -1,6 +1,9 @@ include @top_builddir@/Makefile.inc +srcdir = @srcdir@ +builddir = @builddir@ VPATH = @srcdir@ +@AX_RECONFIGURE_TARGET@ @MINGW_TRUE@ IMPLIB=@MAKELIBDIR@CamShr.dll.a diff --git a/ccl/Makefile.in b/ccl/Makefile.in index 9eb50f02b8..bb75db06fc 100644 --- a/ccl/Makefile.in +++ b/ccl/Makefile.in @@ -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 diff --git a/configure b/configure index 57069cfb12..cd60937312 100755 --- a/configure +++ b/configure @@ -650,10 +650,15 @@ SHARETYPEJNI SHARETYPE REMCAMLIB REMCAM +GIT_SRCDIR +GIT_COMMIT_DATE +GIT_COMMIT +GIT_REMOTE_URL +GIT_REMOTE +GIT_BRANCH +GIT_TAG RELEASE_DATE RELEASE_TAG -RELEASE_BRANCH -RELEASE_COMMIT RELEASE_RELEASE RELEASE_MINOR RELEASE_MAJOR @@ -905,6 +910,10 @@ CXX USE_JARS_DIR_FALSE USE_JARS_DIR_TRUE TARGET_SELFHELP +AX_RECONFIGURE_TARGET +HAVE_AWK +AX_GIT_REVISION_TARGETS +HAVE_GIT MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -997,6 +1006,8 @@ with_docker_profile enable_debug enable_silent_rules enable_maintainer_mode +enable_uncommitted_install +enable_reconfigure enable_java_only with_jars enable_dependency_tracking @@ -1687,6 +1698,10 @@ Optional Features: --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer + --disable-uncommitted-install + disable install target if there are uncommitted + changes + --disable-reconfigure disable reconfigure targets for autoconf --enable-debug=[yes/info/profile/no] compile with debugging --enable-java_only Only build java jar files @@ -2966,6 +2981,8 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. +srcdir=${srcdir} +builddir=$(pwd) @@ -4639,6 +4656,262 @@ fi +# //////////////////////////////////////////////////////////////////////////// # +# ////// RELEASE INFO //////////////////////////////////////////////////////// # +# //////////////////////////////////////////////////////////////////////////// # + + # AC_ARG_WITH(release_version, [AS_HELP_STRING([--with-release-version],[tag a partivular version name])],[ + # ],[ + # ]) + +if [ ! -z ${RELEASE_VERSION} ] +then + RELEASE_MAJOR=$(echo ${RELEASE_VERSION} | cut -d. -f1) + RELEASE_MINOR=$(echo ${RELEASE_VERSION} | cut -d. -f2) + RELEASE_RELEASE=$(echo ${RELEASE_VERSION} | cut -d. -f3) + RELEASE_TAG="${BRANCH}_release-${RELEASE_MAJOR}-${RELEASE_MINOR}-${RELEASE_RELEASE}" +else + RELEASE_MAJOR=1 + RELEASE_MINOR=0 + RELEASE_RELEASE=0 + RELEASE_TAG="unknown_release-${RELEASE_MAJOR}-${RELEASE_MINOR}-${RELEASE_RELEASE}" +fi +RELEASE_DATE="$(date)" + + + + + # Check whether --enable-uncommitted-install was given. +if test "${enable_uncommitted_install+set}" = set; then : + enableval=$enable_uncommitted_install; +fi + + if test -z "${enable_uncommitted_install}"; then : + enable_uncommitted_install=yes +fi + if test "x$enable_uncommitted_install" = xyes; then : + enable_uncommitted_install=# +else + enable_uncommitted_install= +fi + + # Extract the first word of "git", so it can be a program name with args. +set dummy git; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_HAVE_GIT+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$HAVE_GIT"; then + ac_cv_prog_HAVE_GIT="$HAVE_GIT" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_HAVE_GIT="yes" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_HAVE_GIT" && ac_cv_prog_HAVE_GIT="no" +fi +fi +HAVE_GIT=$ac_cv_prog_HAVE_GIT +if test -n "$HAVE_GIT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_GIT" >&5 +$as_echo "$HAVE_GIT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if test -d ${srcdir}/.git; then : + +else + HAVE_GIT=no +fi + + abs_top_srcdir=$(cd ${srcdir}; pwd) + if test -d ${abs_top_srcdir}; then : + +else + HAVE_GIT=no +fi + + if test "x$HAVE_GIT" = xyes; then : + + GIT="git --git-dir=${abs_top_srcdir}/.git" + GIT_TAG=$(${GIT} describe --tag) + GIT_BRANCH=$(${GIT} rev-parse --abbrev-ref HEAD) + GIT_REMOTE=$(${GIT} config branch.${GIT_BRANCH}.remote) + GIT_REMOTE_URL=$(${GIT} config remote.${GIT_REMOTE}.url) + GIT_COMMIT=$(${GIT} rev-parse HEAD) GIT_COMMIT_DATE=$(${GIT} log -1 --format="%ad") + GIT_SRCDIR=${abs_top_srcdir} + + ## remoute could not be set to local branch + if test -z "${GIT_REMOTE}"; then : + + GIT_REMOTE=LOCAL + GIT_REMOTE_URL="source code upstream is not set, please refer to local srcdir." + +fi + + ## substs + + +read -d '' AX_GIT_REVISION_TARGETS << _as_read_EOF + + +# //////////////////////////////////////////////////////////////////////////// # +# //// GIT REVISION TARGETS ///////////////////////////////////////////////// # +# //////////////////////////////////////////////////////////////////////////// # + +# check for uncommitted modified files and eventually define "M" for the GIT_TAG +_git_check_changes = \$(shell ${GIT} diff-index --quiet HEAD || echo M) + +# check if the current branch name matches the autoconf variable and trigger a reconfigure otherwise +\$(shell test "$(${GIT} rev-parse --abbrev-ref HEAD)" = "${GIT_BRANCH}" || touch \$(top_builddir)/config.status) + +# ///////////// # +# GIT VARIABLES # +# ///////////// # +GIT_TAG = ${GIT_TAG}\$(_git_check_changes) +GIT_SRCDIR = \$(abs_top_srcdir) +GIT_BRANCH = ${GIT_BRANCH} +GIT_REMOTE = ${GIT_REMOTE} +GIT_REMOTE_URL = ${GIT_REMOTE_URL} + +release_tag: ##@@miscellaneous dump release tag + @ \$(if \$(_git_check_changes),\$(info "WARNING: There are uncommitted changes")) \ + echo "\$(RELEASE_TAG)" + +git_info: ##@@miscellaneous dump release tag + @ \$(if \$(_git_check_changes),\$(info WARNING: There are uncommitted changes))\ + echo " Git repository status: "; \ + echo " ------------------------------ "; \ + echo ""; + echo " tag: ...... \$(GIT_TAG)"; \ + echo " branch: ... \$(GIT_BRANCH)"; \ + echo " commit: ... \$(GIT_COMMIT)"; \ + echo " remote_url: \$(GIT_REMOTE_URL)"; \ + echo ""; + + +ifeq (install,\$(filter install,\$(MAKECMDGOALS))) +${enable_uncommitted_changes}\$(if \$(_git_check_changes),\$(error ERROR: There are uncommitted changes, install not allowed)) +endif + + +_as_read_EOF + + + + + + # Extract the first word of "awk", so it can be a program name with args. +set dummy awk; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_HAVE_AWK+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$HAVE_AWK"; then + ac_cv_prog_HAVE_AWK="$HAVE_AWK" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_HAVE_AWK="yes" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_HAVE_AWK" && ac_cv_prog_HAVE_AWK="no" +fi +fi +HAVE_AWK=$ac_cv_prog_HAVE_AWK +if test -n "$HAVE_AWK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_AWK" >&5 +$as_echo "$HAVE_AWK" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if test "x$HAVE_AWK" = xyes; then : + + if test -z "${RELEASE_VERSION}"; then : + + RELEASE_TAG=$(echo ${GIT_TAG} | ${AWK} '{ match($0,/([a-zA-Z0-9_-]+[^0-9-]+)-([0-9]+-[0-9]+-[0-9]+)/,arr); print arr[0] }' ) + RELEASE_VERSION=$(echo ${GIT_TAG} | ${AWK} '{ match($0,/[0-9]+-[0-9]+-[0-9]+/,arr); print arr[0] }' | ${AWK} '{ gsub("-","."); print }' ) + RELEASE_MAJOR=$(echo ${RELEASE_VERSION} | ${AWK} -F"." '{ print $1 }' ) + RELEASE_MINOR=$(echo ${RELEASE_VERSION} | ${AWK} -F"." '{ print $2 }' ) + RELEASE_RELEASE=$(echo ${RELEASE_VERSION} | ${AWK} -F"." '{ print $3 }' ) + RELEASE_DATE=$(${GIT} log -1 --format="%ad") + +fi +fi + +fi + + + + + + # Check whether --enable-reconfigure was given. +if test "${enable_reconfigure+set}" = set; then : + enableval=$enable_reconfigure; +fi + + if test -z "${enable_reconfigure}"; then : + enable_reconfigure=yes +fi + if test "x$enable_reconfigure" = xyes; then : + + + +read -d '' AX_RECONFIGURE_TARGET << _as_read_EOF + + +# trigger reconfigure if config.status has been touched +Makefile: \$(srcdir)/Makefile.in \$(top_builddir)/config.status + cd '\$(top_builddir)' && \$(SHELL) ./config.status; + +# trigger reconfigure at configure changes +\$(top_builddir)/config.status: \$(top_srcdir)/configure + \$(info -------------------------------------------------------------------------------------)\ + \$(info INFO: A reconfigure is needed because the configure does not match with config.status)\ + \$(info -------------------------------------------------------------------------------------)\ + cd '\$(top_builddir)' && \$(top_srcdir)/configure \$(shell \$(abs_top_builddir)/config.status --config); + + +_as_read_EOF + + + + + +fi + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable debugging" >&5 @@ -4755,7 +5028,7 @@ ifndef SELFHELP_FUNC SELFHELP_FUNC = \\\\ %help; \\\\ while(<>) { \\\\ - if(/^([a-zA-Z0-9_-]+):.*\\\\#\\\\#(?:@(\\\\w+))?\\\\s(.*)\$\$/) { \\\\ + if(/^([a-zA-Z0-9_\\\\-\\\\.]+):.*\\\\#\\\\#(?:@(\\\\w+))?\\\\s(.*)\$\$/) { \\\\ push(@{\$\$help{\$\$2}}, [\$\$1, \$\$3]); \\\\ } \\\\ }; \\\\ @@ -4765,14 +5038,59 @@ SELFHELP_FUNC = \\\\ print "| \${SH_GREEN}usage: make target\${SH_RESET}\\\\n"; \\\\ print "| \\\\n"; \\\\ for ( sort keys %help ) { \\\\ - print "| \${SH_YELLOW}\$\$_:\${SH_RESET}\\\\n"; \\\\ + print "| \${SH_YELLOW}\$\$_\${SH_RESET}:\\\\n"; \\\\ printf("| %-20s %-60s\\\\n", \$\$_->[0], \$\$_->[1]) for @{\$\$help{\$\$_}}; \\\\ print "| \\\\n"; \\\\ } \\\\ print "\\\\n"; -help: ##@miscellaneous Show this help. +SELFHELP_ADVANCED_FUNC = \\\\ + %help; \\\\ + while(<>) { \\\\ + if(/^([a-zA-Z0-9_\\\\-\\\\.]+):.*\\\\#\\\\#(?:@(\\\\w+))?\\\\s(.*)\$\$/) { \\\\ + push(@{\$\$help{\$\$2}}, [\$\$1, \$\$3]); \\\\ + } \\\\ + if(/^([a-zA-Z0-9_\\\\-\\\\.]+):.*\\\\#\\\\#(?:@@(\\\\w+))?\\\\s(.*)\$\$/) { \\\\ + push(@{\$\$help{\$\$2}}, [\$\$1, \$\$3]); \\\\ + } \\\\ + }; \\\\ + print "\\\\n"; \\\\ + print ", \${SH_GREEN}ADVANCED TARGETS \${SH_RESET}\\\\n"; \\\\ + print "| \\\\n"; \\\\ + for ( sort keys %help ) { \\\\ + print "| \${SH_YELLOW}\$\$_\${SH_RESET}:\\\\n"; \\\\ + printf("| %-20s %-60s\\\\n", \$\$_->[0], \$\$_->[1]) for @{\$\$help{\$\$_}}; \\\\ + print "| \\\\n"; \\\\ + } \\\\ + print "\\\\n"; + +SELFHELP_PRINT_TARGET_LIST_FUNC = \\\\ + %help; \\\\ + while(<>) { \\\\ + if(/^([a-zA-Z0-9_\\\\-\\\\.]+):.*\\\\#\\\\#(?:@(\\\\w+))?\\\\s(.*)\$\$/) { \\\\ + push(@{\$\$help{\$\$2}}, [\$\$1, \$\$3]); } \\\\ + if(/^([a-zA-Z0-9_\\\\-\\\\.]+):.*\\\\#\\\\#(?:@@(\\\\w+))?\\\\s(.*)\$\$/) { \\\\ + push(@{\$\$help{\$\$2}}, [\$\$1, \$\$3]); } \\\\ + }; \\\\ + for ( sort keys %help ) { \\\\ + printf("%s ", \$\$_->[0]) for @{\$\$help{\$\$_}}; \\\\ + } \\\\ + +SELFHELP_TARGETS = \$(shell perl -e '\$(SELFHELP_PRINT_TARGET_LIST_FUNC)' \$(MAKEFILE_LIST)) + +help: ##@miscellaneous Show this help. +help-more: ##@miscellaneous get help on advanced targets. +help-targets: ##@@miscellaneous get list of target with help signature + +help-targets: + @ \$(info \$(SELFHELP_TARGETS)):; + +help: @perl -e '\$(SELFHELP_FUNC)' \$(MAKEFILE_LIST) + +help-more: + @perl -e '\$(SELFHELP_ADVANCED_FUNC)' \$(MAKEFILE_LIST) + endif @@ -17115,26 +17433,7 @@ esac CFLAGS="$CFLAGS_lib_check_save" # -# //////////////////////////////////////////////////////////////////////////// # -# ////// RELEASE INFO //////////////////////////////////////////////////////// # -# //////////////////////////////////////////////////////////////////////////// # -if [ ! -z ${RELEASE_VERSION} ] -then - RELEASE_MAJOR=$(echo ${RELEASE_VERSION} | cut -d. -f1) - RELEASE_MINOR=$(echo ${RELEASE_VERSION} | cut -d. -f2) - RELEASE_RELEASE=$(echo ${RELEASE_VERSION} | cut -d. -f3) - RELEASE_BRANCH=$BRANCH - RELEASE_COMMIT=$GIT_COMMIT -else - RELEASE_MAJOR=1 - RELEASE_MINOR=0 - RELEASE_RELEASE=0 - RELEASE_BRANCH="unknown" - RELEASE_COMMIT="unknown" -fi -RELEASE_DATE="$(date)" -RELEASE_TAG="${BRANCH}_release-${RELEASE_MAJOR}-${RELEASE_MINOR}-${RELEASE_RELEASE}" # Determine common warning options to apply to C, C++, and Fortran languages WARNFLAGS="-Wall -Wextra" @@ -17359,6 +17658,14 @@ fi + + + + + + + + diff --git a/configure.ac b/configure.ac index 2fad8d1438..bdcaa1a9aa 100644 --- a/configure.ac +++ b/configure.ac @@ -36,26 +36,29 @@ AX_IS_RELEASE([always]) # ////// RELEASE INFO //////////////////////////////////////////////////////// # # //////////////////////////////////////////////////////////////////////////// # + # AC_ARG_WITH(release_version, [AS_HELP_STRING([--with-release-version],[tag a partivular version name])],[ + # ],[ + # ]) + if [[ ! -z ${RELEASE_VERSION} ]] then RELEASE_MAJOR=$(echo ${RELEASE_VERSION} | cut -d. -f1) RELEASE_MINOR=$(echo ${RELEASE_VERSION} | cut -d. -f2) RELEASE_RELEASE=$(echo ${RELEASE_VERSION} | cut -d. -f3) - # RELEASE_BRANCH=${BRANCH:-${GIT_BRANCH}} - # RELEASE_COMMIT=${GIT_COMMIT} + RELEASE_TAG="${BRANCH}_release-${RELEASE_MAJOR}-${RELEASE_MINOR}-${RELEASE_RELEASE}" else RELEASE_MAJOR=1 RELEASE_MINOR=0 RELEASE_RELEASE=0 - # RELEASE_BRANCH="unknown" - # RELEASE_COMMIT="unknown" + RELEASE_TAG="unknown_release-${RELEASE_MAJOR}-${RELEASE_MINOR}-${RELEASE_RELEASE}" fi +RELEASE_DATE="$(date)" dnl look if a version from git directory can be obtained AX_GIT_REVISION -: ${RELEASE_TAG="${BRANCH}_release-${RELEASE_MAJOR}-${RELEASE_MINOR}-${RELEASE_RELEASE}"} -: ${RELEASE_DATE="$(date)"} +dnl add reconfigure target option to autoconf generated Makefile +AX_RECONFIGURE_TARGETS dnl AX_CHECK_ENABLE_DEBUG ////////////////////////////////////////////////////// @@ -1309,13 +1312,21 @@ AC_SUBST(MOTIF_LD_LDARC) AC_SUBST(PYTHON_INCLUDE_DIR) AC_SUBST(DEF_PYLIB) AC_SUBST(NEED_SEMUN) + AC_SUBST(RELEASE_MAJOR) AC_SUBST(RELEASE_MINOR) AC_SUBST(RELEASE_RELEASE) -AC_SUBST(RELEASE_COMMIT) -AC_SUBST(RELEASE_BRANCH) AC_SUBST(RELEASE_TAG) AC_SUBST(RELEASE_DATE) + +AC_SUBST([GIT_TAG]) +AC_SUBST([GIT_BRANCH]) +AC_SUBST([GIT_REMOTE]) +AC_SUBST([GIT_REMOTE_URL]) +AC_SUBST([GIT_COMMIT]) +AC_SUBST([GIT_COMMIT_DATE]) +AC_SUBST([GIT_SRCDIR]) + AC_SUBST(REMCAM) AC_SUBST(REMCAMLIB) AC_SUBST(ENABLE_SANITIZE) diff --git a/d3dshr/Makefile.in b/d3dshr/Makefile.in index ff05360552..609c39588f 100644 --- a/d3dshr/Makefile.in +++ b/d3dshr/Makefile.in @@ -1,6 +1,11 @@ include @top_builddir@/Makefile.inc -VPATH = @srcdir@ +srcdir=@srcdir@ +builddir=@builddir@ +VPATH=@srcdir@ +@AX_RECONFIGURE_TARGET@ + + FFLAGS=@FFLAGS@ @D3D_FFLAGS@ D3DLIB=@D3DLIB@ diff --git a/docs/Makefile.in b/docs/Makefile.in index ea20fb7f6c..b20d6049e7 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -125,6 +125,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 \ @@ -245,12 +247,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@ @@ -360,8 +371,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@ diff --git a/dwscope/Makefile.in b/dwscope/Makefile.in index 1bbfb7370c..0673ad6f81 100644 --- a/dwscope/Makefile.in +++ b/dwscope/Makefile.in @@ -99,6 +99,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 \ @@ -304,12 +306,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@ @@ -419,8 +430,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@ diff --git a/hdf5/Makefile.in b/hdf5/Makefile.in index 7279aaba01..64dfa109e7 100644 --- a/hdf5/Makefile.in +++ b/hdf5/Makefile.in @@ -1,6 +1,10 @@ include @top_builddir@/Makefile.inc -VPATH = @srcdir@ +srcdir=@srcdir@ +builddir=@builddir@ +VPATH=@srcdir@ +@AX_RECONFIGURE_TARGET@ + CFLAGS+=@HDF5_INCS@ -I. -DH5_USE_16_API @TARGET_ARCH@ LD_FLAGS=$(LDFLAGS) @TARGET_ARCH@ LIBS=-L@MAKESHLIBDIR@ @LIBS@ -lTdiShr -lTreeShr -lMdsShr @HDF5_LIBS@ -lhdf5 diff --git a/idlmdsevent/Makefile.in b/idlmdsevent/Makefile.in index 25b7da6665..5ed1f48ea3 100644 --- a/idlmdsevent/Makefile.in +++ b/idlmdsevent/Makefile.in @@ -1,8 +1,11 @@ include @top_builddir@/Makefile.inc srcdir=@srcdir@ -builddir=@builddir@ -VPATH = @srcdir@ +builddir=@builddir@ +VPATH=@srcdir@ +MKDIR_P=@MKDIR_P@ +@AX_RECONFIGURE_TARGET@ + CFLAGS+=@IDL_INC@ @X_CFLAGS@ @TARGET_ARCH@ LDFLAGS=@LDFLAGS@ @IDL_LIB@ @TARGET_ARCH@ X_LIBS=@X_LIBS@ diff --git a/idlmdswidgets/Makefile.in b/idlmdswidgets/Makefile.in index 7e4ef2f1f4..1e6fd20879 100644 --- a/idlmdswidgets/Makefile.in +++ b/idlmdswidgets/Makefile.in @@ -1,6 +1,10 @@ include @top_builddir@/Makefile.inc -VPATH = @srcdir@ +srcdir=@srcdir@ +builddir=@builddir@ +VPATH=@srcdir@ +@AX_RECONFIGURE_TARGET@ + CFLAGS+=@IDL_INC@ @X_CFLAGS@ @TARGET_ARCH@ LDFLAGS=@LDFLAGS@ @IDL_LIB@ @TARGET_ARCH@ X_LIBS=@X_LIBS@ diff --git a/include/mdsshr.h b/include/mdsshr.h index 8b7c2c095e..117861d1b5 100644 --- a/include/mdsshr.h +++ b/include/mdsshr.h @@ -129,6 +129,16 @@ typedef struct { const char *MDSVERSION; } MDSplusVersionInfo; +typedef struct { + const char *GIT_TAG; + const char *GIT_BRANCH; + const char *GIT_REMOTE; + const char *GIT_REMOTE_URL; + const char *GIT_COMMIT; + const char *GIT_SRCDIR; +} MDSplusGitVersionInfo; + + #ifdef HAVE_PTHREAD_H #include // FREEXD diff --git a/javaclient/Makefile.in b/javaclient/Makefile.in index 3cd51f19df..e806d52d3e 100644 --- a/javaclient/Makefile.in +++ b/javaclient/Makefile.in @@ -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 \ @@ -244,12 +246,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@ @@ -359,8 +370,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@ diff --git a/javadevices/Makefile.in b/javadevices/Makefile.in index 4d81da8ff1..138b484ec1 100644 --- a/javadevices/Makefile.in +++ b/javadevices/Makefile.in @@ -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 \ @@ -260,12 +262,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@ @@ -375,8 +386,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@ diff --git a/javadispatcher/Makefile.in b/javadispatcher/Makefile.in index 078d436eb9..c8288a647f 100644 --- a/javadispatcher/Makefile.in +++ b/javadispatcher/Makefile.in @@ -97,6 +97,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 \ @@ -247,12 +249,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@ @@ -362,8 +373,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@ diff --git a/javamds/Makefile.in b/javamds/Makefile.in index 309b0401a2..fe55579cff 100644 --- a/javamds/Makefile.in +++ b/javamds/Makefile.in @@ -1,8 +1,9 @@ include @top_builddir@/Makefile.inc srcdir=@srcdir@ -builddir=@builddir@ -VPATH = @srcdir@ +builddir=@builddir@ +VPATH=@srcdir@ +@AX_RECONFIGURE_TARGET@ @MINGW_TRUE@ DEF=${srcdir}/JavaMds.def CFLAGS += -I /media/sf_FedoraShared/include/ -I /media/sf_FedoraShared/include/win32 $(THREAD) @JDK_CFLAGS@ diff --git a/javascope/Makefile.in b/javascope/Makefile.in index c526002aac..3422c11ee7 100644 --- a/javascope/Makefile.in +++ b/javascope/Makefile.in @@ -100,6 +100,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 \ @@ -309,12 +311,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@ @@ -424,8 +435,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@ diff --git a/javatraverser/Makefile.in b/javatraverser/Makefile.in index ab547d940a..e68fa25cf9 100644 --- a/javatraverser/Makefile.in +++ b/javatraverser/Makefile.in @@ -99,6 +99,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 \ @@ -266,12 +268,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@ @@ -381,8 +392,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@ diff --git a/javatraverser2/Makefile.in b/javatraverser2/Makefile.in index 963e788228..9582e68a77 100644 --- a/javatraverser2/Makefile.in +++ b/javatraverser2/Makefile.in @@ -99,6 +99,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 \ @@ -249,12 +251,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@ @@ -364,8 +375,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@ diff --git a/javatraverser2/java/mds/mdslib/Makefile.in b/javatraverser2/java/mds/mdslib/Makefile.in index 2199d8f676..f8ee73071a 100644 --- a/javatraverser2/java/mds/mdslib/Makefile.in +++ b/javatraverser2/java/mds/mdslib/Makefile.in @@ -1,8 +1,9 @@ include @top_builddir@/Makefile.inc srcdir=@srcdir@ -builddir=@builddir@ -VPATH = @srcdir@ +builddir=@builddir@ +VPATH=@srcdir@ +@AX_RECONFIGURE_TARGET@ @MINGW_TRUE@ DEF=${srcdir}/JavaMdsLib.def CFLAGS += -I $(THREAD) @JDK_CFLAGS@ diff --git a/m4/ax_git_revision.m4 b/m4/ax_git_revision.m4 index fc4472bc17..675a70dcda 100644 --- a/m4/ax_git_revision.m4 +++ b/m4/ax_git_revision.m4 @@ -7,12 +7,9 @@ # AX_GIT_REVISION([git_caommand]) # # DESCRIPTION -# -# -# EXAMPLE -# -# -# +# Adds Git variables to code that can be used to locate your current install +# upon the source repository that triggered the "make install" command +# # LICENSE # # Copyright (c) 2016 Andrea Rigoni Garola @@ -45,36 +42,23 @@ #serial 1 -# # //////////////////////////////////////////////////////////////////////////// # -# # ////// RELEASE INFO //////////////////////////////////////////////////////// # -# # //////////////////////////////////////////////////////////////////////////// # - -# if [[ ! -z ${RELEASE_VERSION} ]] -# then -# RELEASE_MAJOR=$(echo ${RELEASE_VERSION} | cut -d. -f1) -# RELEASE_MINOR=$(echo ${RELEASE_VERSION} | cut -d. -f2) -# RELEASE_RELEASE=$(echo ${RELEASE_VERSION} | cut -d. -f3) -# RELEASE_BRANCH=$BRANCH -# RELEASE_COMMIT=$GIT_COMMIT -# else -# RELEASE_MAJOR=1 -# RELEASE_MINOR=0 -# RELEASE_RELEASE=0 -# RELEASE_BRANCH="unknown" -# RELEASE_COMMIT="unknown" -# fi -# RELEASE_DATE="$(date)" -# RELEASE_TAG="${BRANCH}_release-${RELEASE_MAJOR}-${RELEASE_MINOR}-${RELEASE_RELEASE}" - +# //////////////////////////////////////////////////////////////////////////// # +# ////// GIT INFO //////////////////////////////////////////////////////////// # +# //////////////////////////////////////////////////////////////////////////// # AC_DEFUN([AX_GIT_REVISION],[ AC_PUSH_LOCAL([ax_git_revision]) + + AC_ARG_ENABLE(uncommitted-install, [AS_HELP_STRING([--disable-uncommitted-install], + [disable install target if there are uncommitted changes])]) + AS_IF([test -z "${enable_uncommitted_install}"], [AS_VAR_SET([enable_uncommitted_install],[yes])]) + AS_VAR_IF([enable_uncommitted_install],[yes], + [AS_VAR_SET([enable_uncommitted_install],[#])], + [AS_VAR_SET([enable_uncommitted_install],[])]) + AC_CHECK_PROG([HAVE_GIT],[git],[yes],[no]) AS_IF([test -d ${srcdir}/.git],,AS_VAR_SET([HAVE_GIT],[no])) - AC_CHECK_PROG([HAVE_AWK],[awk],[yes],[no]) - AS_VAR_IF([HAVE_AWK],,AS_VAR_SET([HAVE_GIT],[no])) - AS_VAR_SET([abs_top_srcdir],[$(cd ${srcdir}; pwd)]) AS_IF([test -d ${abs_top_srcdir}],,AS_VAR_SET([HAVE_GIT],[no])) @@ -82,61 +66,80 @@ AC_DEFUN([AX_GIT_REVISION],[ AS_VAR_SET([GIT],["git --git-dir=${abs_top_srcdir}/.git"]) AS_VAR_SET([GIT_TAG],[$(${GIT} describe --tag)]) AS_VAR_SET([GIT_BRANCH],[$(${GIT} rev-parse --abbrev-ref HEAD)]) - AS_VAR_SET([GIT_REMOTE],[$(${GIT} config branch.${GIT_BRANCH}.remote)]) - AS_VAR_SET([GIT_REMOTE_URL],[$(${GIT} config remote.${GIT_REMOTE}.url)]) + AS_VAR_SET([GIT_REMOTE],[$(${GIT} config branch.${GIT_BRANCH}.remote)]) + AS_VAR_SET([GIT_REMOTE_URL],[$(${GIT} config remote.${GIT_REMOTE}.url)]) AS_VAR_SET([GIT_COMMIT],[$(${GIT} rev-parse HEAD)]) dnl add --short to have 7 digit code - ## substs - GIT_SET_TARGETS + AS_VAR_SET([GIT_COMMIT_DATE], [$(${GIT} log -1 --format="%ad")]) + AS_VAR_SET([GIT_SRCDIR],[${abs_top_srcdir}]) - AC_SUBST([GIT_TAG]) - AC_SUBST([GIT_BRANCH]) - AC_SUBST([GIT_REMOTE]) - AC_SUBST([GIT_REMOTE_URL]) - AC_SUBST([GIT_COMMIT]) - - dnl TODO: verify matching TAG regexp - AS_IF([test -z ${RELEASE_VERSION}],[ - AS_VAR_SET([RELEASE_TAG],[${GIT_TAG}]) - AS_VAR_SET([RELEASE_VERSION],[$(echo ${GIT_TAG} | ${AWK} '{ match($[]0,/[[0-9]]+-[[0-9]]+-[[0-9]]+/,arr); print arr[[0]] }' | ${AWK} '{ gsub("-","."); print }' ) ]) - AS_VAR_SET([RELEASE_MAJOR], [$(echo ${RELEASE_VERSION} | ${AWK} -F"." '{ print $[]1 }' ) ]) - AS_VAR_SET([RELEASE_MINOR], [$(echo ${RELEASE_VERSION} | ${AWK} -F"." '{ print $[]2 }' ) ]) - AS_VAR_SET([RELEASE_RELEASE],[$(echo ${RELEASE_VERSION} | ${AWK} -F"." '{ print $[]3 }' ) ]) + ## remoute could not be set to local branch + AS_IF([test -z "${GIT_REMOTE}"], [ + AS_VAR_SET([GIT_REMOTE],[LOCAL]) + AS_VAR_SET([GIT_REMOTE_URL],["source code upstream is not set, please refer to local srcdir."]) ]) - AS_VAR_SET([RELEASE_DATE], [$(${GIT} log -1 --format="%ad")]) + ## substs + GIT_DEFINE_TARGETS + dnl TODO: verify matching TAG regexp + AC_CHECK_PROG([HAVE_AWK],[awk],[yes],[no]) + AS_VAR_IF([HAVE_AWK],[yes],[ + AS_IF([test -z "${RELEASE_VERSION}"],[ + AS_VAR_SET([RELEASE_TAG],[$(echo ${GIT_TAG} | ${AWK} '{ match($[]0,/([[a-zA-Z0-9_-]]+[[^0-9-]]+)-([[0-9]]+-[[0-9]]+-[[0-9]]+)/,arr); print arr[[0]] }' )]) + AS_VAR_SET([RELEASE_VERSION],[$(echo ${GIT_TAG} | ${AWK} '{ match($[]0,/[[0-9]]+-[[0-9]]+-[[0-9]]+/,arr); print arr[[0]] }' | ${AWK} '{ gsub("-","."); print }' ) ]) + AS_VAR_SET([RELEASE_MAJOR], [$(echo ${RELEASE_VERSION} | ${AWK} -F"." '{ print $[]1 }' ) ]) + AS_VAR_SET([RELEASE_MINOR], [$(echo ${RELEASE_VERSION} | ${AWK} -F"." '{ print $[]2 }' ) ]) + AS_VAR_SET([RELEASE_RELEASE],[$(echo ${RELEASE_VERSION} | ${AWK} -F"." '{ print $[]3 }' ) ]) + AS_VAR_SET([RELEASE_DATE], [$(${GIT} log -1 --format="%ad")]) + ])]) ]) - AC_POP_LOCAL([ax_git_revision]) ]) -AC_DEFUN_LOCAL([ax_git_revision],[GIT_SET_TARGETS],[ + +AC_DEFUN_LOCAL([ax_git_revision],[GIT_DEFINE_TARGETS],[ AS_VAR_READ([AX_GIT_REVISION_TARGETS],[ # //////////////////////////////////////////////////////////////////////////// # # //// GIT REVISION TARGETS ///////////////////////////////////////////////// # # //////////////////////////////////////////////////////////////////////////// # -# -# + +# check for uncommitted modified files and eventually define "M" for the GIT_TAG _git_check_changes = \$(shell ${GIT} diff-index --quiet HEAD || echo M) -# -GIT_RELEASE_TAG = ${RELEASE_TAG}\$(_git_check_changes) + +# check if the current branch name matches the autoconf variable and trigger a reconfigure otherwise +\$(shell test "$(${GIT} rev-parse --abbrev-ref HEAD)" = "${GIT_BRANCH}" || touch \$(top_builddir)/config.status) + +# ///////////// # +# GIT VARIABLES # +# ///////////// # +GIT_TAG = ${GIT_TAG}\$(_git_check_changes) +GIT_SRCDIR = \$(abs_top_srcdir) GIT_BRANCH = ${GIT_BRANCH} GIT_REMOTE = ${GIT_REMOTE} GIT_REMOTE_URL = ${GIT_REMOTE_URL} -GIT_COMMIT = ${GIT_COMMIT} -GIT_SRCDIR = \$(abs_top_srcdir) - -git_install_check: ##@miscellaneous check if we are about to install uncommitted changes - @ \$(if \$(_git_check_changes),\$(info "WARNING: There are uncommitted changes")):; - -git_release_tag: ##@miscellaneous dump release tag - @ echo "\$(GIT_RELEASE_TAG)" -git_show_log: - @ ${GIT} log +release_tag: ##@@miscellaneous dump release tag + @ \$(if \$(_git_check_changes),\$(info "WARNING: There are uncommitted changes")) \ + echo "\$(RELEASE_TAG)" + +git_info: ##@@miscellaneous dump release tag + @ \$(if \$(_git_check_changes),\$(info WARNING: There are uncommitted changes))\ + echo " Git repository status: "; \ + echo " ------------------------------ "; \ + echo ""; + echo " tag: ...... \$(GIT_TAG)"; \ + echo " branch: ... \$(GIT_BRANCH)"; \ + echo " commit: ... \$(GIT_COMMIT)"; \ + echo " remote_url: \$(GIT_REMOTE_URL)"; \ + echo ""; + + +ifeq (install,\$(filter install,\$(MAKECMDGOALS))) +${enable_uncommitted_changes}\$(if \$(_git_check_changes),\$(error ERROR: There are uncommitted changes, install not allowed)) +endif ]) AC_SUBST([AX_GIT_REVISION_TARGETS]) @@ -150,15 +153,6 @@ m4_ifdef([AM_SUBST_NOTMAKE], [AM_SUBST_NOTMAKE([AX_GIT_REVISION_TARGETS])]) - - - - - - - - - dnl //////////////////////////////////////////////////////////////////////////// dnl //////////////////////////////////////////////////////////////////////////// dnl //////////////////////////////////////////////////////////////////////////// diff --git a/m4/ax_reconfigure_targets.m4 b/m4/ax_reconfigure_targets.m4 new file mode 100644 index 0000000000..4c2cd8bec3 --- /dev/null +++ b/m4/ax_reconfigure_targets.m4 @@ -0,0 +1,117 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_reconfigure_targets.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_RECONFIGURE_TARGETS() +# +# USAGE +# Add @AX_RECONFIGURE_TARGET@ in Makefile.in after standard directories definition +# +# DESCRIPTION +# Add auto reconfigure targets that trigger a reconfigure action upon changes on +# config.status file and configure script itself. This emulate the Automake config +# behavior also in pure autoconf Makefiles. +# IMPORTANT NOTE: +# The implementation needs the srcdir, builddir, top_srcdir etc ... to be set +# before the @AX_RECONFIGURE_TARGET@ call in any Makefile.in +# +# LICENSE +# +# Copyright (c) 2016 Andrea Rigoni Garola +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 1 + +AC_DEFUN([AX_RECONFIGURE_TARGETS],[ + AC_PUSH_LOCAL([ax_reconifgure_targets]) + AC_ARG_ENABLE(reconfigure, [AS_HELP_STRING([--disable-reconfigure],[disable reconfigure targets for autoconf])]) + AS_IF([test -z "${enable_reconfigure}"], [AS_VAR_SET([enable_reconfigure],[yes])]) + AS_VAR_IF([enable_reconfigure],[yes],[ + SET_RECONFIGURE_TARGET + ]) + AC_POP_LOCAL([ax_reconifgure_targets]) +]) + + + + + +AC_DEFUN_LOCAL([ax_reconifgure_targets],[SET_RECONFIGURE_TARGET],[ +AS_VAR_READ([AX_RECONFIGURE_TARGET],[ + +# trigger reconfigure if config.status has been touched +Makefile: \$(srcdir)/Makefile.in \$(top_builddir)/config.status + cd '\$(top_builddir)' && \$(SHELL) ./config.status; + +# trigger reconfigure at configure changes +\$(top_builddir)/config.status: \$(top_srcdir)/configure + \$(info -------------------------------------------------------------------------------------)\ + \$(info INFO: A reconfigure is needed because the configure does not match with config.status)\ + \$(info -------------------------------------------------------------------------------------)\ + cd '\$(top_builddir)' && \$(top_srcdir)/configure \$(shell \$(abs_top_builddir)/config.status --config); + +]) +AC_SUBST([AX_RECONFIGURE_TARGET]) +m4_ifdef([AM_SUBST_NOTMAKE], [AM_SUBST_NOTMAKE([AX_RECONFIGURE_TARGET])]) +]) + + + + + + + + + + + + + + + + + +dnl //////////////////////////////////////////////////////////////////////////// +dnl //////////////////////////////////////////////////////////////////////////// +dnl //////////////////////////////////////////////////////////////////////////// +dnl // Utility functions + +AC_DEFUN_LOCAL([ax_reconifgure_targets],[AS_BANNER],[ + AS_ECHO + AS_BOX([// $1 //////], [\/]) + AS_ECHO + ]) + + +AC_DEFUN_LOCAL([ax_reconifgure_targets],[AS_VAR_READ],[ +read -d '' $1 << _as_read_EOF +$2 +_as_read_EOF +]) diff --git a/m4/ax_target_selfhelp.m4 b/m4/ax_target_selfhelp.m4 index 5cc0ed0ebe..3b10463723 100644 --- a/m4/ax_target_selfhelp.m4 +++ b/m4/ax_target_selfhelp.m4 @@ -1,3 +1,23 @@ +## ////////////////////////////////////////////////////////////////////////// // +## +## This file is part of the autoconf-bootstrap project. +## Copyright 2018 Andrea Rigoni Garola . +## +## This program is free software: you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program. If not, see . +## +## ////////////////////////////////////////////////////////////////////////// // + @@ -7,7 +27,6 @@ AC_DEFUN([AX_TARGET_SELFHELP],[ AC_POP_LOCAL([ax_target_selfhelp]) ]) - AC_DEFUN_LOCAL([ax_target_selfhelp],[SET_SELFHELP],[ AS_VAR_READ([TARGET_SELFHELP],[ @@ -22,7 +41,7 @@ ifndef SELFHELP_FUNC SELFHELP_FUNC = \\\\ %help; \\\\ while(<>) { \\\\ - if(/^([[a-zA-Z0-9_-]]+):.*\\\\[#]\\\\[#](?:@(\\\\w+))?\\\\s(.*)\$\$/) { \\\\ + if(/^([[a-zA-Z0-9_\\\\-\\\\.]]+):.*\\\\[#]\\\\[#](?:@(\\\\w+))?\\\\s(.*)\$\$/) { \\\\ push(@{\$\$help{\$\$[2]}}, @<:@\$\$[1], \$\$[3]@:>@); \\\\ } \\\\ }; \\\\ @@ -32,14 +51,59 @@ SELFHELP_FUNC = \\\\ print "| \${SH_GREEN}usage: make [target]\${SH_RESET}\\\\n"; \\\\ print "| \\\\n"; \\\\ for ( sort keys %help ) { \\\\ - print "| \${SH_YELLOW}\$\$_:\${SH_RESET}\\\\n"; \\\\ + print "| \${SH_YELLOW}\$\$_\${SH_RESET}:\\\\n"; \\\\ printf("| %-20s %-60s\\\\n", \$\$_->[[0]], \$\$_->[[1]]) for @{\$\$help{\$\$_}}; \\\\ print "| \\\\n"; \\\\ } \\\\ print "\\\\n"; -help: ##@miscellaneous Show this help. +SELFHELP_ADVANCED_FUNC = \\\\ + %help; \\\\ + while(<>) { \\\\ + if(/^([[a-zA-Z0-9_\\\\-\\\\.]]+):.*\\\\[#]\\\\[#](?:@(\\\\w+))?\\\\s(.*)\$\$/) { \\\\ + push(@{\$\$help{\$\$[2]}}, @<:@\$\$[1], \$\$[3]@:>@); \\\\ + } \\\\ + if(/^([[a-zA-Z0-9_\\\\-\\\\.]]+):.*\\\\[#]\\\\[#](?:@@(\\\\w+))?\\\\s(.*)\$\$/) { \\\\ + push(@{\$\$help{\$\$[2]}}, @<:@\$\$[1], \$\$[3]@:>@); \\\\ + } \\\\ + }; \\\\ + print "\\\\n"; \\\\ + print ", \${SH_GREEN}ADVANCED TARGETS \${SH_RESET}\\\\n"; \\\\ + print "| \\\\n"; \\\\ + for ( sort keys %help ) { \\\\ + print "| \${SH_YELLOW}\$\$_\${SH_RESET}:\\\\n"; \\\\ + printf("| %-20s %-60s\\\\n", \$\$_->[[0]], \$\$_->[[1]]) for @{\$\$help{\$\$_}}; \\\\ + print "| \\\\n"; \\\\ + } \\\\ + print "\\\\n"; + +SELFHELP_PRINT_TARGET_LIST_FUNC = \\\\ + %help; \\\\ + while(<>) { \\\\ + if(/^([[a-zA-Z0-9_\\\\-\\\\.]]+):.*\\\\[#]\\\\[#](?:@(\\\\w+))?\\\\s(.*)\$\$/) { \\\\ + push(@{\$\$help{\$\$[2]}}, @<:@\$\$[1], \$\$[3]@:>@); } \\\\ + if(/^([[a-zA-Z0-9_\\\\-\\\\.]]+):.*\\\\[#]\\\\[#](?:@@(\\\\w+))?\\\\s(.*)\$\$/) { \\\\ + push(@{\$\$help{\$\$[2]}}, @<:@\$\$[1], \$\$[3]@:>@); } \\\\ + }; \\\\ + for ( sort keys %help ) { \\\\ + printf("%s ", \$\$_->[[0]]) for @{\$\$help{\$\$_}}; \\\\ + } \\\\ + +SELFHELP_TARGETS = \$(shell perl -e '\$(SELFHELP_PRINT_TARGET_LIST_FUNC)' \$(MAKEFILE_LIST)) + +help: ##@miscellaneous Show this help. +help-more: ##@miscellaneous get help on advanced targets. +help-targets: ##@@miscellaneous get list of target with help signature + +help-targets: + @ \$(info \$(SELFHELP_TARGETS)):; + +help: @perl -e '\$(SELFHELP_FUNC)' \$(MAKEFILE_LIST) + +help-more: + @perl -e '\$(SELFHELP_ADVANCED_FUNC)' \$(MAKEFILE_LIST) + endif ]) @@ -48,6 +112,7 @@ endif ]) + AC_DEFUN_LOCAL([ax_target_selfhelp],[AS_VAR_READ],[ read -d '' $1 << _as_read_EOF $2 diff --git a/macosx/Makefile.in b/macosx/Makefile.in index d8baa16d4f..47d46f68a3 100644 --- a/macosx/Makefile.in +++ b/macosx/Makefile.in @@ -97,6 +97,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 \ @@ -247,12 +249,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@ @@ -362,8 +373,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@ diff --git a/manpages/Makefile.in b/manpages/Makefile.in index 8f70bb226a..221fd5061c 100644 --- a/manpages/Makefile.in +++ b/manpages/Makefile.in @@ -95,6 +95,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 \ @@ -245,12 +247,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@ @@ -360,8 +371,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@ diff --git a/math/Makefile.in b/math/Makefile.in index aef6867be5..11c60f361c 100644 --- a/math/Makefile.in +++ b/math/Makefile.in @@ -1,8 +1,9 @@ include @top_builddir@/Makefile.inc srcdir=@srcdir@ -builddir=@builddir@ -VPATH = @srcdir@ +builddir=@builddir@ +VPATH=@srcdir@ +@AX_RECONFIGURE_TARGET@ #### Remove following line after code causing warnings is fixed #### FCFLAGS+=-Wno-compare-reals -Wno-uninitialized @MINGW_TRUE@ DEF=${srcdir}/MdsMath.def diff --git a/mdsdcl/Makefile.in b/mdsdcl/Makefile.in index 710e5bec70..ec0e5a917f 100644 --- a/mdsdcl/Makefile.in +++ b/mdsdcl/Makefile.in @@ -1,8 +1,10 @@ include @top_builddir@/Makefile.inc srcdir=@srcdir@ -builddir=@builddir@ -VPATH = @srcdir@ +builddir=@builddir@ +VPATH=@srcdir@ +@AX_RECONFIGURE_TARGET@ + @MINGW_TRUE@ IMPLIB=@MAKELIBDIR@Mdsdcl.dll.a @MINGW_TRUE@ DEF=${srcdir}/Mdsdcl.def @MINGW_TRUE@ XML_LIBS=-Wl,-Bstatic -lxml2 -lz @LIBLZMA@ -Wl,-Bdynamic -liconv @LIBDL@ $(LIBSOCKET) diff --git a/mdsdcl/mdsdcl_show_version.c b/mdsdcl/mdsdcl_show_version.c index 4757d6b9e6..b935f2dcd9 100644 --- a/mdsdcl/mdsdcl_show_version.c +++ b/mdsdcl/mdsdcl_show_version.c @@ -3,43 +3,113 @@ #include #include #include +#include +#include + +// typedef struct { +// const char *MAJOR; +// const char *MINOR; +// const char *RELEASE; +// const char *BRANCH; +// const char *RELEASE_TAG; +// const char *COMMIT; +// const char *DATE; +// const char *MDSVERSION; +// } MDSplusVersionInfo; + + +// typedef struct { +// const char *GIT_TAG; +// const char *GIT_BRANCH; +// const char *GIT_REMOTE; +// const char *GIT_REMOTE_URL; +// const char *GIT_COMMIT; +// const char *GIT_SRCDIR; +// } MDSplusGitVersionInfo; + extern MDSplusVersionInfo MDSplusVersion; +extern MDSplusGitVersionInfo MDSplusGitVersion; + EXPORT int mdsdcl_show_version(void *ctx __attribute__ ((unused)), char **error __attribute__ ((unused)), char **output) { char *info = malloc(strlen(MDSplusVersion.MAJOR)+strlen(MDSplusVersion.MINOR)+strlen(MDSplusVersion.RELEASE)+ strlen(MDSplusVersion.BRANCH)+strlen(MDSplusVersion.RELEASE_TAG)+ strlen(MDSplusVersion.COMMIT)+1000); + strcpy(info,"\n\n"); + sprintf(info,"----------------------\n"); if (strlen(MDSplusVersion.MAJOR) && strlen(MDSplusVersion.MINOR) && strlen(MDSplusVersion.MAJOR)) { sprintf(info+strlen(info),"MDSplus version: %s.%s.%s\n",MDSplusVersion.MAJOR,MDSplusVersion.MINOR,MDSplusVersion.RELEASE); } - if (strlen(MDSplusVersion.BRANCH)) { - sprintf(info+strlen(info),"Git branch: %s\n",MDSplusVersion.BRANCH); - if (strlen(MDSplusVersion.RELEASE_TAG)==0 && strlen(MDSplusVersion.COMMIT)==0) { - sprintf(info+strlen(info)," View:\n https://github.com/MDSplus/mdsplus/tree/%s\n",MDSplusVersion.BRANCH); - sprintf(info+strlen(info)," Download:\n https://github.com/MDSplus/mdsplus/archive/%s.tar.gz\n",MDSplusVersion.BRANCH); - } - } + sprintf(info,"----------------------\n"); if (strlen(MDSplusVersion.RELEASE_TAG)) { - sprintf(info+strlen(info)," Git tag: %s\n",MDSplusVersion.RELEASE_TAG); - sprintf(info+strlen(info)," View:\n https://github.com/MDSplus/mdsplus/tree/%s\n",MDSplusVersion.RELEASE_TAG); - sprintf(info+strlen(info)," Download:\n https://github.com/MDSplus/mdsplus/archive/%s.tar.gz\n",MDSplusVersion.RELEASE_TAG); - } - if (strlen(MDSplusVersion.COMMIT)) { - sprintf(info+strlen(info)," Git commit: %s\n",MDSplusVersion.COMMIT); - if (strlen(MDSplusVersion.RELEASE_TAG)==0) { - sprintf(info+strlen(info)," View:\n https://github.com/MDSplus/mdsplus/tree/%s\n",MDSplusVersion.COMMIT); - sprintf(info+strlen(info)," Download:\n https://github.com/MDSplus/mdsplus/archive/%s.tar.gz\n",MDSplusVersion.COMMIT); - } + sprintf(info+strlen(info)," Release: %s\n",MDSplusVersion.RELEASE_TAG); + sprintf(info+strlen(info)," Browse: https://github.com/MDSplus/mdsplus/tree/%s\n",MDSplusVersion.RELEASE_TAG); + sprintf(info+strlen(info)," Download: https://github.com/MDSplus/mdsplus/archive/%s.tar.gz\n",MDSplusVersion.RELEASE_TAG); } if (strlen(MDSplusVersion.DATE)) { sprintf(info+strlen(info)," Build date: %s\n",MDSplusVersion.DATE); } if (strlen(info) == 2) { - strcat(info,"Manual build from sources, no version information available\n"); + strcat(info,"no release information available\n"); } strcat(info,"\n\n"); *output=strdup(info); free(info); + return 1; } + +EXPORT int mdsdcl_show_git_info(void *ctx, char **error, char **output) +{ + int status; + int qfr[] = { + cli_present(ctx, "TAG"), + cli_present(ctx, "BRANCH"), + cli_present(ctx, "REMOTE"), + cli_present(ctx, "REMOTE_URL"), + cli_present(ctx, "COMMIT"), + cli_present(ctx, "SRCDIR") + }; + + // if no qualifiers have been set set all + int i,s=0; + for(i=0; i<6; ++i) s+=(qfr[i]==MdsdclPRESENT); + if(s==0) for(i=0; i<6; ++i) qfr[i]=MdsdclPRESENT; + + char *info = malloc(strlen(MDSplusGitVersion.GIT_TAG)+ + strlen(MDSplusGitVersion.GIT_BRANCH)+ + strlen(MDSplusGitVersion.GIT_REMOTE)+ + strlen(MDSplusGitVersion.GIT_REMOTE_URL)+ + strlen(MDSplusGitVersion.GIT_COMMIT)+ + strlen(MDSplusGitVersion.GIT_SRCDIR)+ + +1000); + + strcpy(info,""); + if (s) { + if(qfr[0] == MdsdclPRESENT) sprintf(info+strlen(info),"%s ",MDSplusGitVersion.GIT_TAG); + if(qfr[1] == MdsdclPRESENT) sprintf(info+strlen(info),"%s ",MDSplusGitVersion.GIT_BRANCH); + if(qfr[2] == MdsdclPRESENT) sprintf(info+strlen(info),"%s ",MDSplusGitVersion.GIT_REMOTE); + if(qfr[3] == MdsdclPRESENT) sprintf(info+strlen(info),"%s ",MDSplusGitVersion.GIT_REMOTE_URL); + if(qfr[4] == MdsdclPRESENT) sprintf(info+strlen(info),"%s ",MDSplusGitVersion.GIT_COMMIT); + if(qfr[5] == MdsdclPRESENT) sprintf(info+strlen(info),"%s ",MDSplusGitVersion.GIT_SRCDIR); + sprintf(info+strlen(info),"\n"); + } else { + sprintf(info+strlen(info),"\n MDSplus code info:\n"); + sprintf(info+strlen(info),"----------------------\n"); + sprintf(info+strlen(info)," Tag: %s\n",MDSplusGitVersion.GIT_TAG); + sprintf(info+strlen(info)," srcdir: %s\n",MDSplusGitVersion.GIT_SRCDIR); + sprintf(info+strlen(info)," Commit: %s\n",MDSplusGitVersion.GIT_COMMIT); + sprintf(info+strlen(info)," Branch: %s\n",MDSplusGitVersion.GIT_BRANCH); + sprintf(info+strlen(info)," Remote: %s\n",MDSplusGitVersion.GIT_REMOTE); + sprintf(info+strlen(info)," Url: %s\n",MDSplusGitVersion.GIT_REMOTE_URL); + sprintf(info+strlen(info),"\n\n"); + } + status = MdsdclSUCCESS; + *error = strdup(""); + *output=strdup(info); + free(info); + return status; +} + + diff --git a/mdslib/Makefile.in b/mdslib/Makefile.in index 345f952768..aafb4fa178 100644 --- a/mdslib/Makefile.in +++ b/mdslib/Makefile.in @@ -1,9 +1,10 @@ include @top_builddir@/Makefile.inc srcdir=@srcdir@ -builddir=@builddir@ -VPATH = @srcdir@ +builddir=@builddir@ +VPATH=@srcdir@ MKDIR_P=@MKDIR_P@ +@AX_RECONFIGURE_TARGET@ @MINGW_TRUE@ IMPLIB_MdsLib=@MAKELIBDIR@MdsLib.dll.a @MINGW_TRUE@ IMPLIB_MdsLib_client=@MAKELIBDIR@MdsLib_client.dll.a diff --git a/mdslib/docs/Makefile.in b/mdslib/docs/Makefile.in index f92dd4eb04..665bb50579 100644 --- a/mdslib/docs/Makefile.in +++ b/mdslib/docs/Makefile.in @@ -125,6 +125,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 \ @@ -246,12 +248,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@ @@ -361,8 +372,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@ diff --git a/mdslib/testing/Makefile.in b/mdslib/testing/Makefile.in index 974f667675..efc5a280d3 100644 --- a/mdslib/testing/Makefile.in +++ b/mdslib/testing/Makefile.in @@ -111,6 +111,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 \ @@ -474,12 +476,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@ @@ -589,8 +600,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@ diff --git a/mdslibidl/Makefile.in b/mdslibidl/Makefile.in index 52ae803655..fd7766c7ec 100644 --- a/mdslibidl/Makefile.in +++ b/mdslibidl/Makefile.in @@ -1,8 +1,10 @@ include @top_builddir@/Makefile.inc srcdir=@srcdir@ -builddir=@builddir@ -VPATH = @srcdir@ +builddir=@builddir@ +VPATH=@srcdir@ +@AX_RECONFIGURE_TARGET@ + @MINGW_TRUE@ DEF=${srcdir}/MdsLibIdl.def SOURCES = MdsLibIdl.c OBJECTS = $(SOURCES:.c=.o) diff --git a/mdsmisc/Makefile.in b/mdsmisc/Makefile.in index 3ff54d976c..a31bbc6b14 100644 --- a/mdsmisc/Makefile.in +++ b/mdsmisc/Makefile.in @@ -1,8 +1,9 @@ include @top_builddir@/Makefile.inc srcdir=@srcdir@ -builddir=@builddir@ -VPATH = @srcdir@ +builddir=@builddir@ +VPATH=@srcdir@ +@AX_RECONFIGURE_TARGET@ @MINGW_TRUE@ DEF=${srcdir}/MdsMisc.def CFLAGS+=@GLOBUS_CFLAGS@ diff --git a/mdsobjects/cpp/Makefile.in b/mdsobjects/cpp/Makefile.in index db601c42ce..d27c4dfba1 100644 --- a/mdsobjects/cpp/Makefile.in +++ b/mdsobjects/cpp/Makefile.in @@ -1,6 +1,10 @@ include @top_builddir@/Makefile.inc -VPATH = @srcdir@ +srcdir=@srcdir@ +builddir=@builddir@ +VPATH=@srcdir@ +@AX_RECONFIGURE_TARGET@ + @MINGW_TRUE@ IMPLIB=@MAKELIBDIR@MdsObjectsCppShr.dll.a CPPFLAGS += diff --git a/mdsobjects/cpp/docs/Makefile.in b/mdsobjects/cpp/docs/Makefile.in index 88dbb6fd69..6cc02ba30f 100644 --- a/mdsobjects/cpp/docs/Makefile.in +++ b/mdsobjects/cpp/docs/Makefile.in @@ -125,6 +125,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 \ @@ -248,12 +250,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@ @@ -363,8 +374,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@ diff --git a/mdsobjects/cpp/testing/Makefile.in b/mdsobjects/cpp/testing/Makefile.in index adaf4ccc91..858becbee7 100644 --- a/mdsobjects/cpp/testing/Makefile.in +++ b/mdsobjects/cpp/testing/Makefile.in @@ -122,6 +122,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 \ @@ -646,12 +648,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@ @@ -761,8 +772,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@ diff --git a/mdsobjects/cpp/testing/testutils/Makefile.in b/mdsobjects/cpp/testing/testutils/Makefile.in index deaebd1716..e6cff5679f 100644 --- a/mdsobjects/cpp/testing/testutils/Makefile.in +++ b/mdsobjects/cpp/testing/testutils/Makefile.in @@ -97,6 +97,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 \ @@ -303,12 +305,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@ @@ -418,8 +429,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@ diff --git a/mdsobjects/java/Makefile.in b/mdsobjects/java/Makefile.in index 5a53b6ac5c..7bc06662d1 100644 --- a/mdsobjects/java/Makefile.in +++ b/mdsobjects/java/Makefile.in @@ -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 \ @@ -260,12 +262,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@ @@ -375,8 +386,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@ diff --git a/mdsobjects/java/docs/Makefile.in b/mdsobjects/java/docs/Makefile.in index 9f480239d4..d3c8a8ba19 100644 --- a/mdsobjects/java/docs/Makefile.in +++ b/mdsobjects/java/docs/Makefile.in @@ -125,6 +125,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 \ @@ -246,12 +248,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@ @@ -361,8 +372,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@ diff --git a/mdsobjects/labview/Makefile.in b/mdsobjects/labview/Makefile.in index c88f30bba8..c501e94943 100644 --- a/mdsobjects/labview/Makefile.in +++ b/mdsobjects/labview/Makefile.in @@ -1,7 +1,10 @@ include @top_builddir@/Makefile.inc -VPATH = @srcdir@ +srcdir=@srcdir@ +builddir=@builddir@ +VPATH=@srcdir@ MKDIR_P=@MKDIR_P@ +@AX_RECONFIGURE_TARGET@ LD=@CXX@ CFLAGS+=-I@LV_CINTOOLS@ -fPIC @TARGET_ARCH@ diff --git a/mdsobjects/python/_version.py.in b/mdsobjects/python/_version.py.in index f6eef62d87..68a1c4aeea 100644 --- a/mdsobjects/python/_version.py.in +++ b/mdsobjects/python/_version.py.in @@ -1,5 +1,3 @@ version="@RELEASE_MAJOR@.@RELEASE_MINOR@.@RELEASE_RELEASE@" -branch="@RELEASE_BRANCH@" -commit="@RELEASE_COMMIT@" release_tag="@RELEASE_TAG@" release_date="@RELEASE_DATE@" diff --git a/mdsobjects/python/docs/Makefile.in b/mdsobjects/python/docs/Makefile.in index 26b7187d2f..aa29572d94 100644 --- a/mdsobjects/python/docs/Makefile.in +++ b/mdsobjects/python/docs/Makefile.in @@ -125,6 +125,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 \ @@ -246,12 +248,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@ @@ -361,8 +372,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@ @@ -535,11 +544,6 @@ DX_PAGES = .. \ index.md DX_EXCLUDE_PAGES = \ - ../yacc.py \ - ../lex.py \ - ../tdiparsetab.py \ - ../tdilextab.py \ - ../tdicompile.py \ ../mdsExceptions.py \ ../setup.py \ ../__init__.py diff --git a/mdsobjects/python/tests/Makefile.in b/mdsobjects/python/tests/Makefile.in index 00a4d7088f..d068959a52 100644 --- a/mdsobjects/python/tests/Makefile.in +++ b/mdsobjects/python/tests/Makefile.in @@ -110,6 +110,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 \ @@ -428,12 +430,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@ @@ -543,8 +554,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@ diff --git a/mdsshr/Makefile.in b/mdsshr/Makefile.in index e0a811f5f9..d4d0c9498f 100644 --- a/mdsshr/Makefile.in +++ b/mdsshr/Makefile.in @@ -4,9 +4,11 @@ srcdir=@srcdir@ builddir=@builddir@ VPATH=@srcdir@ MKDIR_P=@MKDIR_P@ +@AX_RECONFIGURE_TARGET@ -CFLAGS += $(THREAD) @GLOBUS_CFLAGS@ @XML_CPPFLAGS@ +CFLAGS += $(THREAD) @GLOBUS_CFLAGS@ @XML_CPPFLAGS@ LDFLAGS += $(THREAD) + @MINGW_TRUE@ IMPLIB=@MAKELIBDIR@MdsShr.dll.a @MINGW_TRUE@ DEF=${srcdir}/MdsShr.def @MINGW_TRUE@ XML_LIBS=-Wl,-Bstatic -lxml2 -lz @LIBLZMA@ -Wl,-Bdynamic -liconv @@ -14,7 +16,6 @@ LDFLAGS += $(THREAD) LIBS=@LIBS@ @LIBDL@ $(XML_LIBS) @CLOCK_GETTIME_LIB@ $(LIBSOCKET) \ @MINGW_TRUE@ -liphlpapi - lib_LIBRARIES = MdsShr libStatic = $(addsuffix .a, $(addprefix @MAKELIBDIR@@LIBPRE@, $(lib_LIBRARIES))) libShared = $(addsuffix @SHARETYPE@, $(addprefix @MAKESHLIBDIR@@LIBPRE@, $(lib_LIBRARIES))) @@ -36,13 +37,19 @@ SOURCES = \ MdsSerialize.c \ MdsShrThreadSafe.c \ MdsXdRoutines.c \ - MdsVersionInfo.c \ - mds_dsc_string.c \ - UdpEvents.c \ - UdpEventSettings.c + MdsVersionInfo.c \ + mds_dsc_string.c \ + UdpEvents.c \ + UdpEventSettings.c OBJECTS = $(SOURCES:.c=.o) +## Version info for git needs to be checked for tag each time +.PHONY: MdsVersionInfo.o +MdsVersionInfo.o: CFLAGS := $(CFLAGS) -D_GIT_TAG=$(GIT_TAG) +MdsVersionInfo.o: MdsVersionInfo.c + $(COMPILE.c) $(OUTPUT_OPTION) $< + all: @MAKELIBDIR@ @MAKESHLIBDIR@ $(libs) diff --git a/mdsshr/MdsVersionInfo.c.in b/mdsshr/MdsVersionInfo.c.in index 41e0c9b73d..fc8c26c99a 100644 --- a/mdsshr/MdsVersionInfo.c.in +++ b/mdsshr/MdsVersionInfo.c.in @@ -34,3 +34,26 @@ EXPORT MDSplusVersionInfo MDSplusVersion = "@RELEASE_COMMIT@", "@RELEASE_DATE@", "@RELEASE_MAJOR@.@RELEASE_MINOR@.@RELEASE_RELEASE@"}; + + +#define STR(s) #s +#define xSTR(s) STR(s) +#ifdef _GIT_TAG +EXPORT MDSplusGitVersionInfo MDSplusGitVersion = + {xSTR(_GIT_TAG), + "@GIT_BRANCH@", + "@GIT_REMOTE@", + "@GIT_REMOTE_URL@", + "@GIT_COMMIT@", + "@GIT_SRCDIR@"}; +#else +EXPORT MDSplusGitVersionInfo MDSplusGitVersion = + {"@GIT_TAG@", + "@GIT_BRANCH@", + "@GIT_REMOTE@", + "@GIT_REMOTE_URL@", + "@GIT_COMMIT@", + "@GIT_SRCDIR@"}; +#endif + + diff --git a/mdsshr/docs/Makefile.in b/mdsshr/docs/Makefile.in index 15cbcf7492..47a98259bc 100644 --- a/mdsshr/docs/Makefile.in +++ b/mdsshr/docs/Makefile.in @@ -125,6 +125,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 \ @@ -246,12 +248,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@ @@ -361,8 +372,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@ diff --git a/mdsshr/testing/Makefile.in b/mdsshr/testing/Makefile.in index 74d8b97fc4..97c559906d 100644 --- a/mdsshr/testing/Makefile.in +++ b/mdsshr/testing/Makefile.in @@ -111,6 +111,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 \ @@ -480,12 +482,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@ @@ -595,8 +606,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@ diff --git a/mdssql/Makefile.in b/mdssql/Makefile.in index 3b0203fa3b..0244852c70 100644 --- a/mdssql/Makefile.in +++ b/mdssql/Makefile.in @@ -1,8 +1,10 @@ include @top_builddir@/Makefile.inc srcdir=@srcdir@ -builddir=@builddir@ -VPATH = @srcdir@ +builddir=@builddir@ +VPATH=@srcdir@ +@AX_RECONFIGURE_TARGET@ + @MINGW_TRUE@ DEF=${srcdir}/MdsSql.def CFLAGS+=@SYBASE_INC@ @TARGET_ARCH@ diff --git a/mdstcpip/Makefile.in b/mdstcpip/Makefile.in index e121721552..ccd308dffb 100644 --- a/mdstcpip/Makefile.in +++ b/mdstcpip/Makefile.in @@ -2,8 +2,10 @@ include @top_builddir@/Makefile.inc srcdir=@srcdir@ builddir=@builddir@ -VPATH = @srcdir@ +VPATH=@srcdir@ MKDIR_P=@MKDIR_P@ +@AX_RECONFIGURE_TARGET@ + @MINGW_TRUE@ IMPLIB_MdsIpShr=@MAKELIBDIR@MdsIpShr.dll.a @MINGW_TRUE@ IMPLIB_MdsIpSrvShr=@MAKELIBDIR@MdsIpSrvShr.dll.a diff --git a/mdstcpip/docs/Makefile.in b/mdstcpip/docs/Makefile.in index 60ccffb584..ee3a8255b9 100644 --- a/mdstcpip/docs/Makefile.in +++ b/mdstcpip/docs/Makefile.in @@ -125,6 +125,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 \ @@ -306,12 +308,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@ @@ -421,8 +432,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@ diff --git a/mdstcpip/docs/img/Makefile.in b/mdstcpip/docs/img/Makefile.in index 988f169a1f..41e0814600 100644 --- a/mdstcpip/docs/img/Makefile.in +++ b/mdstcpip/docs/img/Makefile.in @@ -95,6 +95,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 \ @@ -212,12 +214,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@ @@ -327,8 +338,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@ diff --git a/mdstcpip/zlib/Makefile.in b/mdstcpip/zlib/Makefile.in index 51b367551f..087c144ab6 100644 --- a/mdstcpip/zlib/Makefile.in +++ b/mdstcpip/zlib/Makefile.in @@ -97,6 +97,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 \ @@ -293,12 +295,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@ @@ -408,8 +419,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@ diff --git a/mdsvme/Makefile.in b/mdsvme/Makefile.in index 39ffa84e2a..e5838ee8cf 100644 --- a/mdsvme/Makefile.in +++ b/mdsvme/Makefile.in @@ -1,6 +1,10 @@ include @top_builddir@/Makefile.inc -VPATH = @srcdir@ +srcdir=@srcdir@ +builddir=@builddir@ +VPATH=@srcdir@ +@AX_RECONFIGURE_TARGET@ + LIBS=@LIBS@ @LIBDL@ SOURCES = \ diff --git a/mitdevices/Makefile.in b/mitdevices/Makefile.in index 4017af1c59..6ec466541f 100644 --- a/mitdevices/Makefile.in +++ b/mitdevices/Makefile.in @@ -1,8 +1,10 @@ include @top_builddir@/Makefile.inc srcdir=@srcdir@ -builddir=@builddir@ -VPATH = @srcdir@ +builddir=@builddir@ +VPATH=@srcdir@ +@AX_RECONFIGURE_TARGET@ + SHELL=/bin/bash X_CFLAGS=@X_CFLAGS@ CFLAGS+=$(X_CFLAGS) $(TARGET_ARCH) diff --git a/remcam/Makefile.in b/remcam/Makefile.in index 98e5239bed..0dbdd756db 100644 --- a/remcam/Makefile.in +++ b/remcam/Makefile.in @@ -1,8 +1,9 @@ include @top_builddir@/Makefile.inc srcdir=@srcdir@ -builddir=@builddir@ -VPATH = @srcdir@ +builddir=@builddir@ +VPATH=@srcdir@ +@AX_RECONFIGURE_TARGET@ @MINGW_TRUE@ DEF=${srcdir}/remcam.def LIBS=@LIBS@ diff --git a/roam/Makefile.in b/roam/Makefile.in index 21cb75ac73..afbac20db7 100644 --- a/roam/Makefile.in +++ b/roam/Makefile.in @@ -1,6 +1,10 @@ include @top_builddir@/Makefile.inc -VPATH = @srcdir@ +srcdir=@srcdir@ +builddir=@builddir@ +VPATH=@srcdir@ +@AX_RECONFIGURE_TARGET@ + CFLAGS+=$$(pkg-config --cflags globus-xio globus-gridmap-callout-error) LDFLAGS = @LDFLAGS@ $$(pkg-config --libs globus-xio globus-gridmap-callout-error globus-gssapi-gsi globus-gss-assist globus-gssapi-error globus-common) -L@MAKESHLIBDIR@ -lMdsShr -lTdiShr -lcurl EXPORTS = diff --git a/rpm/Makefile.in b/rpm/Makefile.in index c14bc5485a..1679baa44d 100644 --- a/rpm/Makefile.in +++ b/rpm/Makefile.in @@ -97,6 +97,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 \ @@ -251,12 +253,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@ @@ -366,8 +377,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@ diff --git a/scripts/Makefile.in b/scripts/Makefile.in index cb6b19a03d..c9d91426f8 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -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 \ @@ -246,12 +248,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@ @@ -361,8 +372,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@ diff --git a/servershr/Makefile.in b/servershr/Makefile.in index dc4cf9be2b..3485684341 100644 --- a/servershr/Makefile.in +++ b/servershr/Makefile.in @@ -1,8 +1,10 @@ include @top_builddir@/Makefile.inc srcdir=@srcdir@ -builddir=@builddir@ -VPATH = @srcdir@ +builddir=@builddir@ +VPATH=@srcdir@ +@AX_RECONFIGURE_TARGET@ + @MINGW_TRUE@ IMPLIB=@MAKELIBDIR@MdsServerShr.dll.a @MINGW_TRUE@ DEF=${srcdir}/MdsServerShr.def diff --git a/setevent/Makefile.in b/setevent/Makefile.in index 47ff7df56d..ea3dbd041a 100644 --- a/setevent/Makefile.in +++ b/setevent/Makefile.in @@ -97,6 +97,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 \ @@ -254,12 +256,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@ @@ -369,8 +380,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@ diff --git a/tcl/Makefile.in b/tcl/Makefile.in index f286e20197..fe12c48ff5 100644 --- a/tcl/Makefile.in +++ b/tcl/Makefile.in @@ -1,8 +1,10 @@ include @top_builddir@/Makefile.inc srcdir=@srcdir@ -builddir=@builddir@ -VPATH = @srcdir@ +builddir=@builddir@ +VPATH=@srcdir@ +@AX_RECONFIGURE_TARGET@ + CFLAGS += $(THREAD) LDFLAGS += $(THREAD) diff --git a/tdic/Makefile.in b/tdic/Makefile.in index cfcf6594af..8a429cdaad 100644 --- a/tdic/Makefile.in +++ b/tdic/Makefile.in @@ -1,8 +1,10 @@ include @top_builddir@/Makefile.inc srcdir=@srcdir@ -builddir=@builddir@ -VPATH = @srcdir@ +builddir=@builddir@ +VPATH=@srcdir@ +@AX_RECONFIGURE_TARGET@ + @MINGW_TRUE@ DEF=${srcdir}/TdiShrExt.def LIBS=@LIBS@ -L@MAKESHLIBDIR@ -lMdsIpShr -lTdiShr -lMdsShr -lTreeShr diff --git a/tdishr/Makefile.in b/tdishr/Makefile.in index 10d2d64350..72be161616 100644 --- a/tdishr/Makefile.in +++ b/tdishr/Makefile.in @@ -1,8 +1,10 @@ include @top_builddir@/Makefile.inc srcdir=@srcdir@ -builddir=@builddir@ -VPATH = @srcdir@ +builddir=@builddir@ +VPATH=@srcdir@ +@AX_RECONFIGURE_TARGET@ + @MINGW_TRUE@ IMPLIB=@MAKELIBDIR@TdiShr.dll.a @MINGW_TRUE@ DEF=${srcdir}/TdiShr.def diff --git a/tdishr/testing/Makefile.in b/tdishr/testing/Makefile.in index 4c23b23c30..239ada451a 100644 --- a/tdishr/testing/Makefile.in +++ b/tdishr/testing/Makefile.in @@ -111,6 +111,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 \ @@ -474,12 +476,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@ @@ -589,8 +600,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@ diff --git a/tditest/Makefile.in b/tditest/Makefile.in index 0627f1a7a3..023740b0f8 100644 --- a/tditest/Makefile.in +++ b/tditest/Makefile.in @@ -1,7 +1,10 @@ include @top_builddir@/Makefile.inc -VPATH = @srcdir@ +srcdir=@srcdir@ +builddir=@builddir@ +VPATH=@srcdir@ MKDIR_P=@MKDIR_P@ +@AX_RECONFIGURE_TARGET@ SOURCES = tditest.c @MINGW_TRUE@ SOURCES += icon.o diff --git a/tditest/testing/Makefile.in b/tditest/testing/Makefile.in index 927e9635eb..ac8133c23e 100644 --- a/tditest/testing/Makefile.in +++ b/tditest/testing/Makefile.in @@ -110,6 +110,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 \ @@ -429,12 +431,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@ @@ -544,8 +555,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@ diff --git a/testing/Makefile.in b/testing/Makefile.in index 29bd689ed6..d8afce7da3 100644 --- a/testing/Makefile.in +++ b/testing/Makefile.in @@ -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 \ @@ -309,12 +311,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@ @@ -424,8 +435,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@ diff --git a/testing/backends/check/Makefile.in b/testing/backends/check/Makefile.in index 5fb493cffd..b0c389a4e1 100644 --- a/testing/backends/check/Makefile.in +++ b/testing/backends/check/Makefile.in @@ -98,6 +98,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 \ @@ -277,12 +279,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@ @@ -392,8 +403,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@ diff --git a/testing/selftest/Makefile.in b/testing/selftest/Makefile.in index 64b1d32197..3ed890acfa 100644 --- a/testing/selftest/Makefile.in +++ b/testing/selftest/Makefile.in @@ -117,6 +117,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 \ @@ -553,12 +555,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@ @@ -668,8 +679,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@ diff --git a/traverser/Makefile.in b/traverser/Makefile.in index 018963bdb9..7fa1a92fe7 100644 --- a/traverser/Makefile.in +++ b/traverser/Makefile.in @@ -1,8 +1,10 @@ include @top_builddir@/Makefile.inc srcdir=@srcdir@ -builddir=@builddir@ -VPATH = @srcdir@ +builddir=@builddir@ +VPATH=@srcdir@ +@AX_RECONFIGURE_TARGET@ + X_CFLAGS=@X_CFLAGS@ CFLAGS+=$(X_CFLAGS) @TARGET_ARCH@ UIL=@UIL@ diff --git a/treeshr/Makefile.in b/treeshr/Makefile.in index 92d11063ab..57d091d772 100644 --- a/treeshr/Makefile.in +++ b/treeshr/Makefile.in @@ -1,8 +1,10 @@ include @top_builddir@/Makefile.inc srcdir=@srcdir@ -builddir=@builddir@ -VPATH = @srcdir@ +builddir=@builddir@ +VPATH=@srcdir@ +@AX_RECONFIGURE_TARGET@ + CFLAGS+=@SRBINCLUDE@ $(THREAD) LIBS=-L@MAKESHLIBDIR@ @LIBS@ -lMdsShr @SRBLIB@ $(LIBSOCKET) $(THREAD) diff --git a/treeshr/testing/Makefile.in b/treeshr/testing/Makefile.in index c62324528e..b9ed38f618 100644 --- a/treeshr/testing/Makefile.in +++ b/treeshr/testing/Makefile.in @@ -111,6 +111,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 \ @@ -474,12 +476,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@ @@ -589,8 +600,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@ diff --git a/wfevent/Makefile.in b/wfevent/Makefile.in index 8e21cb9025..c426368666 100644 --- a/wfevent/Makefile.in +++ b/wfevent/Makefile.in @@ -97,6 +97,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 \ @@ -254,12 +256,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@ @@ -369,8 +380,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@ diff --git a/xmdsshr/Makefile.in b/xmdsshr/Makefile.in index e873a321cb..f79c7324a4 100644 --- a/xmdsshr/Makefile.in +++ b/xmdsshr/Makefile.in @@ -1,9 +1,10 @@ include @top_builddir@/Makefile.inc -srcdir = @srcdir@ -builddir = @builddir@ -VPATH = @srcdir@ +srcdir=@srcdir@ +builddir=@builddir@ +VPATH=@srcdir@ MKDIR_P=@MKDIR_P@ +@AX_RECONFIGURE_TARGET@ X_CFLAGS=@X_CFLAGS@ CFLAGS+=$(X_CFLAGS) diff --git a/xml/mdsdcl_commands.xml b/xml/mdsdcl_commands.xml index eb38e44485..9764976c95 100644 --- a/xml/mdsdcl_commands.xml +++ b/xml/mdsdcl_commands.xml @@ -44,6 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. SHOW MACRO - Show the contents of a macro SHOW TIMER - Show the timer information. SHOW VERSION - Show MDSplus version information. + SHOW GIT - Show git source repository information. SPAWN - Execute a operating system shell command. syntax - Basic syntax of mdsdcl commands. TYPE - Print a message. @@ -383,6 +384,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + @@ -437,15 +439,33 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. information will not be provided unless environment variables have been set before using ./configure. The environment variables include: - BRANCH: Git branch used for the build MAJOR,MINOR,RELEASE: Version numbers where a release of 7.8.9 would be - represented by MAJOR=7, MINOR=8, RELEASE=9 - RELEASE_TAG: Git tag of the build (i.e. alpha_release_7_8_9). + represented by MAJOR=7, MINOR=8, RELEASE=9 + RELEASE_TAG: Git tag of the build (i.e. alpha_release_7_8_9). + + + Command: SHOW GIT + Purpose: Show the version information of this MDSplus git repository. + Format: SHOW GIT [/TAG] [/BRANCH] [/COMMIT] [/REMOTE] [/REMOTE_URL] [/SRCDIR] + + + + + + + + + + + + + + Command: SPAWN diff --git a/xml/tcl_commands.xml b/xml/tcl_commands.xml index 5e610a982c..3cfeb37e12 100644 --- a/xml/tcl_commands.xml +++ b/xml/tcl_commands.xml @@ -1259,6 +1259,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. " " " + " @@ -1413,6 +1414,25 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + + Command: SHOW GIT + Purpose: Show the version information of this MDSplus git repository. + Format: SHOW GIT [/TAG] [/BRANCH] [/COMMIT] [/REMOTE] [/REMOTE_URL] [/SRCDIR] + + + + + + + + + + + + + + Command: SHOW VERSIONS diff --git a/xtreeshr/Makefile.in b/xtreeshr/Makefile.in index 31fe9da6dd..06b89d91cd 100644 --- a/xtreeshr/Makefile.in +++ b/xtreeshr/Makefile.in @@ -1,6 +1,10 @@ include @top_builddir@/Makefile.inc -VPATH = @srcdir@ +srcdir=@srcdir@ +builddir=@builddir@ +VPATH=@srcdir@ +@AX_RECONFIGURE_TARGET@ + @MINGW_TRUE@ IMPLIB=@MAKELIBDIR@XTreeShr.dll.a @MINGW_TRUE@ DEF=${srcdir}/XTreeShr.def