Changeset a2ce0a6

Timestamp:

11/04/14 13:13:53 (7 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

21f3226

Parents:

3c54095

Message:

Fix broken LIBTRACE_SVN_REVISION macro

The macro is now a duplicate of the LIBTRACE_API_VERSION macro, so anything
that is using it (e.g. wdcap) will get a valid value even if it no
longer refers to an SVN revision number.

Files:

• Makefile.am (modified) (1 diff)
• lib/libtrace.h.in (modified) (1 diff)

Makefile.am

@@ -22 +22 @@
         $(RM) -rf autom4te.cache/
 
-dist-hook:
-        if which svnversion > /dev/null; then \
-                r=`svnversion -nc . | sed -e 's/^[^:]*://;s/[A-Za-z]//'` ;\
-                sed -i "s/SVN_REVISION.*/SVN_REVISION $$r/" $(distdir)/lib/libtrace.h.in; \
-        fi
-
 if HAS_DOXYGEN
 docs/doxygen/man/man3/*.3: docs

lib/libtrace.h.in

@@ -109 +109 @@
             ((@LIBTRACE_MAJOR@<<16)|(@LIBTRACE_MID@<<8)|(@LIBTRACE_MINOR@))
 
-/** Replaced with the current SVN revision number when 'make dist' is invoked
- *  to create a distributable tarball */
-#define LIBTRACE_SVN_REVISION 0
+/** This used to be replaced with the current SVN revision number when 
+ * 'make dist' was invoked to create a distributable tarball. We don't use
+ * SVN anymore and there probably isn't any need to know the exact revision
+ * number either these days. */
+#define LIBTRACE_SVN_REVISION LIBTRACE_API_VERSION
 
 /** DAG driver version installed on the current system */