Use Git for version detection and tools.

This commit is contained in:
Florian Pose
2021-03-17 14:51:35 +01:00
parent 99fe9e6799
commit b87076135e
14 changed files with 22 additions and 23 deletions

View File

@@ -91,13 +91,13 @@ clean-local:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean
mydist:
hg log --style=changelog $(srcdir) > ChangeLog
@REV=`hg id -i $(srcdir)` && \
git -C $(srcdir) log > ChangeLog
@REV=`git -C $(srcdir) describe` && \
$(MAKE) dist-bzip2 distdir=$(PACKAGE)-$(VERSION)-$${REV}
dist-hook:
if which hg >/dev/null 2>&1; then \
hg id -i $(srcdir) 2>/dev/null >$(distdir)/revision; \
if which git >/dev/null 2>&1; then \
git -C $(srcdir) describe 2>/dev/null >$(distdir)/revision; \
fi
mrproper: clean cleandoc

View File

@@ -35,7 +35,7 @@ AC_PREREQ(2.59)
# - Write NEWS entry with changes since last release
# - Check for complete Doxygen comments
# - Update version number in documentation
# - Update the ChangeLog -> hg log -bstable-1.5 --style=changelog > ChangeLog
# - Update the ChangeLog -> git log > ChangeLog
# - Update version number below
# - make dist-bzip2
#

View File

@@ -34,7 +34,7 @@
REV := $(shell if test -s $(src)/../revision; then \
cat $(src)/../revision; \
else \
hg id -i $(src)/.. 2>/dev/null || echo "unknown"; \
git -C $(src)/.. describe 2>/dev/null || echo "unknown"; \
fi)
ifeq (@ENABLE_GENERIC@,1)

View File

@@ -36,7 +36,7 @@ TOPDIR := $(src)/../..
REV := $(shell if test -s $(TOPDIR)/revision; then \
cat $(TOPDIR)/revision; \
else \
hg id -i $(TOPDIR) 2>/dev/null || echo "unknown"; \
git -C $(TOPDIR) describe 2>/dev/null || echo "unknown"; \
fi)
ifeq (@ENABLE_E1000@,1)

View File

@@ -23,5 +23,5 @@ for f in $KERNELDIR/drivers/net/ethernet/intel/e1000/*.[ch]; do
ep=${b/\./-$PREVER-ethercat.}
diff -u $op $ep | patch -p1 $e
sed -i s/$PREVER-ethercat.h/$KERNELVER-ethercat.h/ $e
hg add $o $e
git add $o $e
done

View File

@@ -36,7 +36,7 @@ TOPDIR := $(src)/../..
REV := $(shell if test -s $(TOPDIR)/revision; then \
cat $(TOPDIR)/revision; \
else \
hg id -i $(TOPDIR) 2>/dev/null || echo "unknown"; \
git -C $(TOPDIR) describe 2>/dev/null || echo "unknown"; \
fi)
ifeq (@ENABLE_E1000E@,1)

View File

@@ -23,5 +23,5 @@ for f in $KERNELDIR/drivers/net/ethernet/intel/e1000e/*.[ch]; do
ep=${b/\./-$PREVER-ethercat.}
diff -u $op $ep | patch -p1 $e
sed -i s/$PREVER-ethercat.h/$KERNELVER-ethercat.h/ $e
hg add $o $e
git add $o $e
done

View File

@@ -36,7 +36,7 @@ TOPDIR := $(src)/../..
REV := $(shell if test -s $(TOPDIR)/revision; then \
cat $(TOPDIR)/revision; \
else \
hg id -i $(TOPDIR) 2>/dev/null || echo "unknown"; \
git -C $(TOPDIR) describe 2>/dev/null || echo "unknown"; \
fi)
ifeq (@ENABLE_IGB@,1)

View File

@@ -25,5 +25,5 @@ for f in $FILES; do
op=${f/\./-$PREVER-orig.}
ep=${f/\./-$PREVER-ethercat.}
diff -u $op $ep | patch -p1 $e
hg add $o $e
git add $o $e
done

View File

@@ -17,5 +17,5 @@ for f in $KERNELDIR/drivers/net/ethernet/{realtek/8139too,realtek/r8169,intel/e1
op=${b/\./-$PREVER-orig.}
ep=${b/\./-$PREVER-ethercat.}
diff -u $op $ep | patch -p1 $e
hg add $o $e
git add $o $e
done

View File

@@ -3052,18 +3052,17 @@ the master's website\footnote{\url{http://etherlab.org/en/ethercat/index.php}}
at~the EtherLab project~\cite{etherlab} as a tarball.
\item The most recent development revision (and moreover any other revision)
can be obtained via the Mercurial~\cite{mercurial} repository on the master's
can be obtained via the Git~\cite{git} repository on the master's
project page on
SourceForge.net\footnote{\url{http://sourceforge.net/projects/etherlabmaster}}.
GitLab.com\footnote{\url{https://gitlab.com/etherlab.org/ethercat}}.
The whole repository can be cloned with the command
\begin{lstlisting}[breaklines=true]
hg clone http://etherlabmaster.hg.sourceforge.net/hgweb/etherlabmaster/etherlabmaster `\textit{local-dir}`
git clone https://gitlab.com/etherlab.org/ethercat.git `\textit{local-dir}`
\end{lstlisting}
\item Without a local Mercurial installation, tarballs of arbitrary revisions
can be downloaded via the ``bz2'' links in the browsable repository
pages\footnote{\url{http://etherlabmaster.hg.sourceforge.net/hgweb/etherlabmaster/etherlabmaster}}.
\item Without a local Git installation, tarballs of arbitrary revisions
can be downloaded via the ``Download'' button on GitLab.
\end{enumerate}
@@ -3406,7 +3405,7 @@ misunderstandings. In: IEE journal ``Computing and Control Engineering'',
\bibitem{doxygen} Doxygen. Source code documentation generator tool.
\url{http://www.stack.nl/~dimitri/doxygen}, 2008.
\bibitem{mercurial} Mercurial SCM. \url{http://mercurial.selenic.com}, 2010.
\bibitem{git} Git SCM. \url{https://git-scm.com}, 2021.
\bibitem{autoconf} Autoconf -- GNU Project -- Free Software Foundation (FSF).
\url{http://www.gnu.org/software/autoconf}, 2010.

View File

@@ -100,7 +100,7 @@ endif # ENABLE_RTDM
REV := $(shell if test -s $(src)/../revision; then \
cat $(src)/../revision; \
else \
hg id -i $(src)/.. 2>/dev/null || echo "unknown"; \
git -C $(src)/.. describe 2>/dev/null || echo "unknown"; \
fi)
CFLAGS_module.o := -DREV=$(REV)

View File

@@ -124,7 +124,7 @@ endif
REV = `if test -s $(top_srcdir)/revision; then \
cat $(top_srcdir)/revision; \
else \
hg id -i $(top_srcdir) 2>/dev/null || echo "unknown"; \
git -C $(top_srcdir) describe 2>/dev/null || echo "unknown"; \
fi`
ethercat_CXXFLAGS = \

View File

@@ -39,7 +39,7 @@ ec_tty-objs := \
REV := $(shell if test -s $(src)/../revision; then \
cat $(src)/../revision; \
else \
hg id -i $(src)/.. 2>/dev/null || echo "unknown"; \
git -C $(src)/.. describe 2>/dev/null || echo "unknown"; \
fi)
CFLAGS_module.o := -DREV=$(REV)