Makefile: version from HG arch / update HISTORY

diff --git a/.hgignore b/.hgignore
index 023c2bc4f1cf064aeee3958407eb67ef5f46a34f..44031d29680161ee87df1f8a451e89420e4893ff 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -12,6 +12,7 @@ po/*.pot
 *.bak
 version.c
 i18n.c
+dump.*
 
 syntax: regexp
 ^testing/test[^.]*$

diff --git a/HISTORY b/HISTORY
index f41595da10f725523f826c3ef486cc8f535d6786..7063371445dadb9878344c8162a0fe08d3bd8d78 100644 (file)
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,16 @@
 VDR Plugin 'sc' Revision History
 --------------------------------
 
+..2007: Version 0.8.7
+- Several changes to the Nagra2 code including HW reg mapper, map cycle counts,
+  0501 AU, 0101 auxed map57, tableless map3e and new build system.
+- Increased smartcard info buffer size.
+- Fixed memcpy in Seca ECM/EMM processing.
+- Fixed ExtAU to trigger on wrong key. Don't trigger on EMM keys.
+- Fixed RotateBytes to be robust against bad input.
+- Updated Makefile for HG.
+- Updated italian, russian translations.
+
 21.12.2007: Version 0.8.6
 - Added Nagra2 0501 dyn. AU execution fix.
 - Added Nagra2 4101 map58 AU (though already outdated). Using unified ECC code

diff --git a/Makefile b/Makefile
index f8e37d2b1d210e2809dec42b7e57ebd5953b6723..000c248862e1bd4ccba19647be672d4c95a722b9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -25,8 +25,17 @@ PLUGIN = sc
 ### The version number of this plugin
 
 DISTFILE = .distvers
+HGARCHIVE = .hg_archival.txt
 RELEASE := $(shell grep 'define SC_RELEASE' version.h | awk '{ print $$3 }' | sed -e 's/[";]//g')
-SUBREL  := $(shell if test -d .hg; then echo -n "HG-"; (hg identify 2>/dev/null || echo -n Unknown) | sed -e 's/ .*//'; else cat $(DISTFILE); fi)
+SUBREL  := $(shell if test -d .hg; then \
+                     echo -n "HG-"; (hg identify 2>/dev/null || echo -n "Unknown") | sed -e 's/ .*//'; \
+                   elif test -r $(HGARCHIVE); then \
+                     echo -n "AR-"; grep "^node" $(HGARCHIVE) | awk '{ printf "%.12s",$$2 }'; \
+                   elif test -r $(DISTFILE); then \
+                     cat $(DISTFILE); \
+                   else \
+                     echo -n "Unknown"; \
+                   fi)
 VERSION := $(RELEASE)-$(SUBREL)
 SCAPIVERS := $(shell sed -ne '/define SCAPIVERS/ s/^.[a-zA-Z ]*\([0-9]*\).*$$/\1/p' $(PLUGIN).c)