mirror of
https://gitlab.com/etherlab.org/ethercat.git
synced 2026-02-05 19:39:50 +08:00
Switched from Subversion to Mercurial.
This commit is contained in:
11
Makefile.am
11
Makefile.am
@@ -81,14 +81,13 @@ clean-local:
|
||||
@rm -f Modules.symvers
|
||||
|
||||
mydist:
|
||||
svn2cl $(srcdir)
|
||||
@SVNREV=`svnversion $(srcdir)` && \
|
||||
$(MAKE) dist-bzip2 \
|
||||
distdir=$(PACKAGE)-$(VERSION)-r$${SVNREV}
|
||||
hg log --style=changelog $(srcdir) > ChangeLog
|
||||
@REV=`hg id -i $(srcdir)` && \
|
||||
$(MAKE) dist-bzip2 distdir=$(PACKAGE)-$(VERSION)-$${REV}
|
||||
|
||||
dist-hook:
|
||||
if which svnversion >/dev/null 2>&1; then \
|
||||
svnversion $(srcdir) 2>/dev/null >$(distdir)/svnrevision; \
|
||||
if which hg >/dev/null 2>&1; then \
|
||||
hg id -i $(srcdir) 2>/dev/null >$(distdir)/revision; \
|
||||
fi
|
||||
|
||||
mrproper: clean cleandoc
|
||||
|
||||
1
NEWS
1
NEWS
@@ -61,6 +61,7 @@ Changes since 1.4.0:
|
||||
* Added 'ethercat eoe' command to display Ethernet over EtherCAT statistics.
|
||||
* Added 'ethercat cstruct' command to output PDO information in C language.
|
||||
* Significantly improved EoE bandwidth by running EoE processing in a kthread.
|
||||
* Switched version control from Subversion to Mercurial.
|
||||
* Implemented CompleteAccess for SDO downloads.
|
||||
|
||||
Changes in 1.4.0:
|
||||
|
||||
@@ -31,24 +31,24 @@
|
||||
#
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
REV := $(shell if test -s $(src)/../svnrevision; then \
|
||||
cat $(src)/../svnrevision; \
|
||||
REV := $(shell if test -s $(src)/../revision; then \
|
||||
cat $(src)/../revision; \
|
||||
else \
|
||||
svnversion $(src)/.. 2>/dev/null || echo "unknown"; \
|
||||
hg id -i $(src)/.. 2>/dev/null || echo "unknown"; \
|
||||
fi)
|
||||
|
||||
ifeq (@ENABLE_8139TOO@,1)
|
||||
EC_8139TOO_OBJ := 8139too-@KERNEL_8139TOO@-ethercat.o
|
||||
obj-m += ec_8139too.o
|
||||
ec_8139too-objs := $(EC_8139TOO_OBJ)
|
||||
CFLAGS_$(EC_8139TOO_OBJ) = -DSVNREV=$(REV)
|
||||
CFLAGS_$(EC_8139TOO_OBJ) = -DREV=$(REV)
|
||||
endif
|
||||
|
||||
ifeq (@ENABLE_E100@,1)
|
||||
EC_E100_OBJ := e100-@KERNEL_E100@-ethercat.o
|
||||
obj-m += ec_e100.o
|
||||
ec_e100-objs := $(EC_E100_OBJ)
|
||||
CFLAGS_$(EC_E100_OBJ) = -DSVNREV=$(REV)
|
||||
CFLAGS_$(EC_E100_OBJ) = -DREV=$(REV)
|
||||
endif
|
||||
|
||||
ifeq (@ENABLE_E1000@,1)
|
||||
@@ -59,7 +59,7 @@ ifeq (@ENABLE_R8169@,1)
|
||||
EC_R8169_OBJ := r8169-@KERNEL_R8169@-ethercat.o
|
||||
obj-m += ec_r8169.o
|
||||
ec_r8169-objs := $(EC_R8169_OBJ)
|
||||
CFLAGS_$(EC_R8169_OBJ) = -DSVNREV=$(REV)
|
||||
CFLAGS_$(EC_R8169_OBJ) = -DREV=$(REV)
|
||||
endif
|
||||
|
||||
KBUILD_EXTRA_SYMBOLS := \
|
||||
|
||||
@@ -33,10 +33,10 @@
|
||||
|
||||
TOPDIR := $(src)/../..
|
||||
|
||||
REV := $(shell if test -s $(TOPDIR)/svnrevision; then \
|
||||
cat $(TOPDIR)/svnrevision; \
|
||||
REV := $(shell if test -s $(TOPDIR)/revision; then \
|
||||
cat $(TOPDIR)/revision; \
|
||||
else \
|
||||
svnversion $(TOPDIR) 2>/dev/null || echo "unknown"; \
|
||||
hg id -i $(TOPDIR) 2>/dev/null || echo "unknown"; \
|
||||
fi)
|
||||
|
||||
ifeq (@ENABLE_E1000@,1)
|
||||
@@ -47,7 +47,7 @@ ifeq (@ENABLE_E1000@,1)
|
||||
e1000_param-@KERNEL_E1000@-ethercat.o
|
||||
obj-m += ec_e1000.o
|
||||
ec_e1000-objs := $(EC_E1000_OBJ)
|
||||
CFLAGS_e1000_main-@KERNEL_E1000@-ethercat.o = -DSVNREV=$(REV)
|
||||
CFLAGS_e1000_main-@KERNEL_E1000@-ethercat.o = -DREV=$(REV)
|
||||
endif
|
||||
|
||||
KBUILD_EXTRA_SYMBOLS := \
|
||||
|
||||
@@ -57,7 +57,7 @@
|
||||
|
||||
/** Master version string
|
||||
*/
|
||||
#define EC_MASTER_VERSION VERSION " r" EC_STR(SVNREV)
|
||||
#define EC_MASTER_VERSION VERSION " " EC_STR(REV)
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
|
||||
@@ -71,12 +71,12 @@ ifeq (@ENABLE_DEBUG_IF@,1)
|
||||
ec_master-objs += debug.o
|
||||
endif
|
||||
|
||||
REV := $(shell if test -s $(src)/../svnrevision; then \
|
||||
cat $(src)/../svnrevision; \
|
||||
REV := $(shell if test -s $(src)/../revision; then \
|
||||
cat $(src)/../revision; \
|
||||
else \
|
||||
svnversion $(src)/.. 2>/dev/null || echo "unknown"; \
|
||||
hg id -i $(src)/.. 2>/dev/null || echo "unknown"; \
|
||||
fi)
|
||||
|
||||
CFLAGS_module.o := -DSVNREV=$(REV)
|
||||
CFLAGS_module.o := -DREV=$(REV)
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
@@ -108,12 +108,12 @@ else
|
||||
EXTRA_DIST += CommandEoe.h
|
||||
endif
|
||||
|
||||
REV = `if test -s $(top_srcdir)/svnrevision; then \
|
||||
cat $(top_srcdir)/svnrevision; \
|
||||
REV = `if test -s $(top_srcdir)/revision; then \
|
||||
cat $(top_srcdir)/revision; \
|
||||
else \
|
||||
svnversion $(srcdir)/.. 2>/dev/null || echo "unknown"; \
|
||||
hg id -i $(top_srcdir) 2>/dev/null || echo "unknown"; \
|
||||
fi`
|
||||
|
||||
ethercat_CXXFLAGS = -I$(top_srcdir)/master -Wall -DSVNREV=$(REV)
|
||||
ethercat_CXXFLAGS = -I$(top_srcdir)/master -Wall -DREV=$(REV)
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user