Mercurial Mercurial > etherlabmaster / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | bz2 | zip | gz | help
Switched from Subversion to Mercurial.
authorFlorian Pose <fp@igh-essen.com>
Thu, 13 Aug 2009 15:18:53 +0200
changeset 1528 dbc617badc33
parent 1527 ec71329743a1
child 1529 079de3453c92
child 1533 bd150d066ea2
child 1543 373cd456dc26
Switched from Subversion to Mercurial.
Makefile.am file | annotate | diff | comparison | revisions
NEWS file | annotate | diff | comparison | revisions
devices/Kbuild.in file | annotate | diff | comparison | revisions
devices/e1000/Kbuild.in file | annotate | diff | comparison | revisions
globals.h file | annotate | diff | comparison | revisions
master/Kbuild.in file | annotate | diff | comparison | revisions
tool/Makefile.am file | annotate | diff | comparison | revisions 
--- a/Makefile.am	Thu Aug 13 13:55:53 2009 +0200
+++ b/Makefile.am	Thu Aug 13 15:18:53 2009 +0200
@@ -81,14 +81,13 @@
 	@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
--- a/NEWS	Thu Aug 13 13:55:53 2009 +0200
+++ b/NEWS	Thu Aug 13 15:18:53 2009 +0200
@@ -61,6 +61,7 @@
 * 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:
--- a/devices/Kbuild.in	Thu Aug 13 13:55:53 2009 +0200
+++ b/devices/Kbuild.in	Thu Aug 13 15:18:53 2009 +0200
@@ -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 @@
 	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 := \
--- a/devices/e1000/Kbuild.in	Thu Aug 13 13:55:53 2009 +0200
+++ b/devices/e1000/Kbuild.in	Thu Aug 13 15:18:53 2009 +0200
@@ -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 @@
 		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 := \
--- a/globals.h	Thu Aug 13 13:55:53 2009 +0200
+++ b/globals.h	Thu Aug 13 15:18:53 2009 +0200
@@ -57,7 +57,7 @@
 
 /** Master version string
  */
-#define EC_MASTER_VERSION VERSION " r" EC_STR(SVNREV)
+#define EC_MASTER_VERSION VERSION " " EC_STR(REV)
 
 /*****************************************************************************/
 
--- a/master/Kbuild.in	Thu Aug 13 13:55:53 2009 +0200
+++ b/master/Kbuild.in	Thu Aug 13 15:18:53 2009 +0200
@@ -71,12 +71,12 @@
 	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)
 
 #------------------------------------------------------------------------------
--- a/tool/Makefile.am	Thu Aug 13 13:55:53 2009 +0200
+++ b/tool/Makefile.am	Thu Aug 13 15:18:53 2009 +0200
@@ -108,12 +108,12 @@
 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)
 
 #------------------------------------------------------------------------------
etherlabmaster