Browse code
Generate proper version numbers for git (bb #1644).
Török Edvin authored on 2009/06/27 01:02:01Showing 2 changed files
| ... | ... |
@@ -306,15 +306,15 @@ version.h: version.h.tmp |
| 306 | 306 |
version.h.tmp: |
| 307 | 307 |
@test -f version.h || touch version.h;\ |
| 308 | 308 |
rm -f $@;\ |
| 309 |
- REVISION="$$(LANG=C svnversion "$(top_srcdir)" 2>/dev/null || echo exported)";\ |
|
| 310 |
- if test $$REVISION = "exported"; then\ |
|
| 311 |
- REVISION="$$(LANG=C cd "$(top_srcdir)"; git svn info configure 2>/dev/null| awk '/Revision:/ { print $$2 }' || echo)";\
|
|
| 312 |
- if test -n "$$REVISION"; then\ |
|
| 313 |
- REVISION="$$REVISION-$$(LANG=C cd "$(top_srcdir)"; git describe --always 2>/dev/null)";\ |
|
| 314 |
- fi;\ |
|
| 309 |
+ REVISION="$$(LANG=C cd "$(top_srcdir)"; git describe --always 2>/dev/null)";\ |
|
| 310 |
+ if test $$? -ne 0; then\ |
|
| 311 |
+ REVISION="r$$(LANG=C svnversion "$(top_srcdir)" 2>/dev/null || echo exported)";\ |
|
| 312 |
+ if test "$$REVISION" = "exported"; then\ |
|
| 313 |
+ REVISION="";\ |
|
| 314 |
+ fi;\ |
|
| 315 | 315 |
fi;\ |
| 316 | 316 |
if test -n "$$REVISION"; then\ |
| 317 |
- echo "#define REPO_VERSION \"devel-r$$REVISION\"" >> $@;\ |
|
| 317 |
+ echo "#define REPO_VERSION \"devel-$$REVISION\"" >> $@;\ |
|
| 318 | 318 |
else\ |
| 319 | 319 |
touch version.h.tmp;\ |
| 320 | 320 |
fi |
| ... | ... |
@@ -1753,15 +1753,15 @@ version.h: version.h.tmp |
| 1753 | 1753 |
version.h.tmp: |
| 1754 | 1754 |
@test -f version.h || touch version.h;\ |
| 1755 | 1755 |
rm -f $@;\ |
| 1756 |
- REVISION="$$(LANG=C svnversion "$(top_srcdir)" 2>/dev/null || echo exported)";\ |
|
| 1757 |
- if test $$REVISION = "exported"; then\ |
|
| 1758 |
- REVISION="$$(LANG=C cd "$(top_srcdir)"; git svn info configure 2>/dev/null| awk '/Revision:/ { print $$2 }' || echo)";\
|
|
| 1759 |
- if test -n "$$REVISION"; then\ |
|
| 1760 |
- REVISION="$$REVISION-$$(LANG=C cd "$(top_srcdir)"; git describe --always 2>/dev/null)";\ |
|
| 1761 |
- fi;\ |
|
| 1756 |
+ REVISION="$$(LANG=C cd "$(top_srcdir)"; git describe --always 2>/dev/null)";\ |
|
| 1757 |
+ if test $$? -ne 0; then\ |
|
| 1758 |
+ REVISION="r$$(LANG=C svnversion "$(top_srcdir)" 2>/dev/null || echo exported)";\ |
|
| 1759 |
+ if test "$$REVISION" = "exported"; then\ |
|
| 1760 |
+ REVISION="";\ |
|
| 1761 |
+ fi;\ |
|
| 1762 | 1762 |
fi;\ |
| 1763 | 1763 |
if test -n "$$REVISION"; then\ |
| 1764 |
- echo "#define REPO_VERSION \"devel-r$$REVISION\"" >> $@;\ |
|
| 1764 |
+ echo "#define REPO_VERSION \"devel-$$REVISION\"" >> $@;\ |
|
| 1765 | 1765 |
else\ |
| 1766 | 1766 |
touch version.h.tmp;\ |
| 1767 | 1767 |
fi |