From 6161473018386753caa925cc090e13b2205d207c Mon Sep 17 00:00:00 2001 From: Florian Pose Date: Thu, 13 Aug 2009 15:18:53 +0200 Subject: [PATCH] Switched from Subversion to Mercurial. --- Makefile.am | 11 +++++------ NEWS | 1 + devices/Kbuild.in | 12 ++++++------ devices/e1000/Kbuild.in | 8 ++++---- globals.h | 2 +- master/Kbuild.in | 8 ++++---- tool/Makefile.am | 8 ++++---- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Makefile.am b/Makefile.am index 04c9c5ba..34e54f54 100644 --- a/Makefile.am +++ b/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 diff --git a/NEWS b/NEWS index afbef8e1..c61e0edc 100644 --- a/NEWS +++ b/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: diff --git a/devices/Kbuild.in b/devices/Kbuild.in index 4832b7d1..248700c7 100644 --- a/devices/Kbuild.in +++ b/devices/Kbuild.in @@ -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 := \ diff --git a/devices/e1000/Kbuild.in b/devices/e1000/Kbuild.in index bbf56dde..7bd25e84 100644 --- a/devices/e1000/Kbuild.in +++ b/devices/e1000/Kbuild.in @@ -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 := \ diff --git a/globals.h b/globals.h index 370cd578..b5927729 100644 --- a/globals.h +++ b/globals.h @@ -57,7 +57,7 @@ /** Master version string */ -#define EC_MASTER_VERSION VERSION " r" EC_STR(SVNREV) +#define EC_MASTER_VERSION VERSION " " EC_STR(REV) /*****************************************************************************/ diff --git a/master/Kbuild.in b/master/Kbuild.in index 8d586920..be648f03 100644 --- a/master/Kbuild.in +++ b/master/Kbuild.in @@ -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) #------------------------------------------------------------------------------ diff --git a/tool/Makefile.am b/tool/Makefile.am index 5ea7eeb7..9bf6dde5 100644 --- a/tool/Makefile.am +++ b/tool/Makefile.am @@ -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) #------------------------------------------------------------------------------