Import SHERPA 2.2.8

AHADIC++/Decays/Git_Info.C

@@ -0,0 +1,3 @@
+#include "ATOOLS/Org/Git_Info.H"
+static ATOOLS::Git_Info initializer
+("AHADIC++/Decays","rel-2-2-8","ad8fdbd6877fd27819b13d50682b21a17806b2ef","fea49efd2566ec45b29f8ae165d0386d");

AHADIC++/Decays/Makefile.am

@@ -1,10 +1,10 @@
 pkglib_LTLIBRARIES = libAhadicDecays.la
 
-SVNTAG = AHADIC++/Decays
-include ../../svn.make
+GITTAG = AHADIC++/Decays
+include ../../git.make
 
 libAhadicDecays_la_SOURCES = \
-                             SVN_Info.C \
+                             Git_Info.C \
 			     Cluster_Decay_Handler.C \
                              Cluster_Decay_Analysis.C \
                              Cluster_Part.C 

AHADIC++/Decays/Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -89,6 +89,7 @@ host_triplet = @host@
 subdir = AHADIC++/Decays
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
+	$(top_srcdir)/m4/ax_compare_version.m4 \
 	$(top_srcdir)/m4/ax_lib_sqlite3.m4 \
 	$(top_srcdir)/m4/ax_pkg_swig.m4 \
 	$(top_srcdir)/m4/ax_prog_cxx_mpi.m4 \
@@ -139,7 +140,7 @@ am__uninstall_files_from_dir = { \
 am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(localincdir)"
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 libAhadicDecays_la_LIBADD =
-am_libAhadicDecays_la_OBJECTS = SVN_Info.lo Cluster_Decay_Handler.lo \
+am_libAhadicDecays_la_OBJECTS = Git_Info.lo Cluster_Decay_Handler.lo \
 	Cluster_Decay_Analysis.lo Cluster_Part.lo
 libAhadicDecays_la_OBJECTS = $(am_libAhadicDecays_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
@@ -160,7 +161,10 @@ am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/ATOOLS/Org
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/Cluster_Decay_Analysis.Plo \
+	./$(DEPDIR)/Cluster_Decay_Handler.Plo \
+	./$(DEPDIR)/Cluster_Part.Plo ./$(DEPDIR)/Git_Info.Plo
 am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -207,7 +211,7 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/../../svn.make $(srcdir)/Makefile.in \
+am__DIST_COMMON = $(srcdir)/../../git.make $(srcdir)/Makefile.in \
 	$(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 pkgdatadir = @pkgdatadir@
@@ -263,6 +267,9 @@ CONDITIONAL_GZIPLIBS = @CONDITIONAL_GZIPLIBS@
 CONDITIONAL_HEPMC2DIR = @CONDITIONAL_HEPMC2DIR@
 CONDITIONAL_HEPMC2INCS = @CONDITIONAL_HEPMC2INCS@
 CONDITIONAL_HEPMC2LIBS = @CONDITIONAL_HEPMC2LIBS@
+CONDITIONAL_HEPMC3DIR = @CONDITIONAL_HEPMC3DIR@
+CONDITIONAL_HEPMC3INCS = @CONDITIONAL_HEPMC3INCS@
+CONDITIONAL_HEPMC3LIBS = @CONDITIONAL_HEPMC3LIBS@
 CONDITIONAL_HZTOOLDIR = @CONDITIONAL_HZTOOLDIR@
 CONDITIONAL_HZTOOLINCS = @CONDITIONAL_HZTOOLINCS@
 CONDITIONAL_HZTOOLLIBS = @CONDITIONAL_HZTOOLLIBS@
@@ -461,10 +468,10 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 pkglib_LTLIBRARIES = libAhadicDecays.la
-SVNTAG = AHADIC++/Decays
-DISTCLEANFILES = SVN_Info.C
+GITTAG = AHADIC++/Decays
+DISTCLEANFILES = Git_Info.C
 libAhadicDecays_la_SOURCES = \
-                             SVN_Info.C \
+                             Git_Info.C \
 			     Cluster_Decay_Handler.C \
                              Cluster_Decay_Analysis.C \
                              Cluster_Part.C 
@@ -478,7 +485,7 @@ all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .C .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../../svn.make $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../../git.make $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -495,10 +502,10 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
-$(srcdir)/../../svn.make $(am__empty):
+$(srcdir)/../../git.make $(am__empty):
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -553,10 +560,16 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Cluster_Decay_Analysis.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Cluster_Decay_Handler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Cluster_Part.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SVN_Info.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Cluster_Decay_Analysis.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Cluster_Decay_Handler.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Cluster_Part.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Git_Info.Plo@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
 
 .C.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -658,7 +671,10 @@ cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -732,7 +748,10 @@ clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
 	mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/Cluster_Decay_Analysis.Plo
+	-rm -f ./$(DEPDIR)/Cluster_Decay_Handler.Plo
+	-rm -f ./$(DEPDIR)/Cluster_Part.Plo
+	-rm -f ./$(DEPDIR)/Git_Info.Plo
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -778,7 +797,10 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/Cluster_Decay_Analysis.Plo
+	-rm -f ./$(DEPDIR)/Cluster_Decay_Handler.Plo
+	-rm -f ./$(DEPDIR)/Cluster_Part.Plo
+	-rm -f ./$(DEPDIR)/Git_Info.Plo
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -799,58 +821,49 @@ uninstall-am: uninstall-localincHEADERS uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
-	ctags-am distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-localincHEADERS install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-am uninstall uninstall-am uninstall-localincHEADERS \
-	uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-libtool clean-pkglibLTLIBRARIES \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-localincHEADERS \
+	install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-localincHEADERS uninstall-pkglibLTLIBRARIES
 
 .PRECIOUS: Makefile
 
 
 MD5_EXCLUDE ?= 
 
-SVN_Info.C: SVN_Info.C.in
-	@if ! which svn > /dev/null || \
-	  ! svn info $(top_srcdir) > /dev/null 2>&1 && \
-	  ! git svn info $(srcdir) > /dev/null 2>&1; then \
+Git_Info.C: Git_Info.C.in
+	@if ! which git > /dev/null || \
+	  ! (cd $(top_srcdir); git rev-parse HEAD > /dev/null 2>&1); then \
 	  if test -f $(srcdir)/$@; then \
 	    cp $(srcdir)/$@ $@.tmp; chmod u+rw $@.tmp; \
 	  else \
 	    echo "***************************************************"; \
-	    echo "* Incomplete sources and no SVN information. This *"; \
+	    echo "* Incomplete sources and no git information. This *"; \
 	    echo "* copy of Sherpa will not be supported. Please    *"; \
 	    echo "* contact sherpa@projects.hepforge.org for help.  *"; \
 	    echo "***************************************************"; \
 	    exit 1; \
 	  fi; \
 	else \
-	  cur=$$(echo "/"$(SVNTAG) | sed -e's/[+]/[+]/g'); \
-	  if svn info $(top_srcdir) > /dev/null 2>&1; then \
-	    url=$$(svn info $(srcdir) | awk '{ if ($$1=="URL:") { \
-	      split($$2,a,"/sherpa/"); \
-	      if (length(a[2])==0) split($$2,a,"/svn/"); \
-	      sub("'$$cur'","",a[2]); print a[2]; } }'); \
-	    rev=$$(svnversion $(srcdir)); \
-	  else \
-	    url=$$(git svn info $(srcdir) | awk '{ if ($$1=="URL:") { \
-	      split($$2,a,"/sherpa/"); \
-	      sub("'$$cur'","",a[2]); print a[2]; } }'); \
-	    rev=$$(git svn info $(srcdir) | grep Revision | cut -d " " -f2); \
+	  rev=$$(cd $(top_srcdir); git rev-parse HEAD); \
+	  if test -n "$$(cd $(srcdir); git status -s --untracked-files=no .)"; then \
+	    rev=$$rev"-dirty"; \
 	  fi; \
-	  echo '#include "ATOOLS/Org/SVN_Info.H"' > $@.tmp; \
-	  echo 'static ATOOLS::SVN_Info initializer' >> $@.tmp; \
-	  echo '("$(SVNTAG)","'$$url'","'$$rev'","X");' >> $@.tmp; \
+	  url=$$(git rev-parse --abbrev-ref HEAD); \
+	  echo '#include "ATOOLS/Org/Git_Info.H"' > $@.tmp; \
+	  echo 'static ATOOLS::Git_Info initializer' >> $@.tmp; \
+	  echo '("$(GITTAG)","'$$url'","'$$rev'","X");' >> $@.tmp; \
 	fi; \
 	if test -z $(NOMD5SUM); then \
 	  mds=$$(cat $(addprefix $(srcdir)/, \
@@ -864,7 +877,7 @@ SVN_Info.C: SVN_Info.C.in
 	  rm $@.tmp; \
 	fi;
 
-.PHONY: SVN_Info.C.in
+.PHONY: Git_Info.C.in
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

AHADIC++/Formation/Git_Info.C

@@ -0,0 +1,3 @@
+#include "ATOOLS/Org/Git_Info.H"
+static ATOOLS::Git_Info initializer
+("AHADIC++/Formation","rel-2-2-8","ad8fdbd6877fd27819b13d50682b21a17806b2ef","228f097613bba33ab77d81331d51120e");

AHADIC++/Formation/Makefile.am

@@ -1,10 +1,10 @@
 pkglib_LTLIBRARIES = libAhadicFormation.la
 
-SVNTAG = AHADIC++/Formation
-include ../../svn.make
+GITTAG = AHADIC++/Formation
+include ../../git.make
 
 libAhadicFormation_la_SOURCES = \
-                                SVN_Info.C \
+                                Git_Info.C \
 				Cluster_Formation_Handler.C \
                                 Gluon_Decayer.C \
                                 Cluster_Former.C \