Browse code
Fix unit test failure with non-English locale (bb #1922).
Drop the use of svnversion, we no longer use SVN, and svnversion was outputting
a localized message for 'exported', which broke version generation.
Török Edvin authored on 2010/04/04 02:31:25Showing 3 changed files
| ... | ... |
@@ -1,3 +1,7 @@ |
| 1 |
+Sat Apr 3 20:30:39 EEST 2010 (edwin) |
|
| 2 |
+------------------------------------- |
|
| 3 |
+ * libclamav/Makefile.{am,in}: Fix unit test failure with non-English locale (bb #1922)
|
|
| 4 |
+ |
|
| 1 | 5 |
Fri Apr 2 16:22:26 EEST 2010 (edwin) |
| 2 | 6 |
------------------------------------- |
| 3 | 7 |
* libclamav/c++/llvm/lib/Support/Allocator.cpp: Fix SpecificBumpPtrAllocator |
| ... | ... |
@@ -374,10 +374,7 @@ version.h.tmp: |
| 374 | 374 |
rm -f $@;\ |
| 375 | 375 |
REVISION="$$(LANG=C cd "$(top_srcdir)"; git describe --always 2>/dev/null || echo "exported")";\ |
| 376 | 376 |
if test "$$REVISION" = "exported"; then\ |
| 377 |
- REVISION="r$$(LANG=C svnversion "$(top_srcdir)" 2>/dev/null || echo exported)";\ |
|
| 378 |
- if test "$$REVISION" = "rexported"; then\ |
|
| 379 | 377 |
REVISION="";\ |
| 380 |
- fi;\ |
|
| 381 | 378 |
fi;\ |
| 382 | 379 |
if test -n "$$REVISION"; then\ |
| 383 | 380 |
echo "#define REPO_VERSION \"devel-$$REVISION\"" >> $@;\ |
| ... | ... |
@@ -2271,10 +2271,7 @@ version.h.tmp: |
| 2271 | 2271 |
rm -f $@;\ |
| 2272 | 2272 |
REVISION="$$(LANG=C cd "$(top_srcdir)"; git describe --always 2>/dev/null || echo "exported")";\ |
| 2273 | 2273 |
if test "$$REVISION" = "exported"; then\ |
| 2274 |
- REVISION="r$$(LANG=C svnversion "$(top_srcdir)" 2>/dev/null || echo exported)";\ |
|
| 2275 |
- if test "$$REVISION" = "rexported"; then\ |
|
| 2276 | 2274 |
REVISION="";\ |
| 2277 |
- fi;\ |
|
| 2278 | 2275 |
fi;\ |
| 2279 | 2276 |
if test -n "$$REVISION"; then\ |
| 2280 | 2277 |
echo "#define REPO_VERSION \"devel-$$REVISION\"" >> $@;\ |