mirror/stedolan-jq
1
0
Fork 0
mirror of https://github.com/stedolan/jq.git synced 2024-05-11 05:55:39 +00:00
Code Issues Releases Activity

Fix version for make dist on master

Browse Source 
- Re-remove VERSION file and all traces of it
 - Pass a decent version indicator to AC_INIT (using git describe)

When we tag 1.4 this will produce 1.4 as the version string when
building on the HEAD of that tag.
This commit is contained in:
Nicolas Williams
2013-12-31 17:15:44 -06:00
parent f60d83c15f
commit 99f170adc3
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
VERSION
View File

@@ -1 +0,0 @@
1.3

4
configure.ac
View File

@@ -1,4 +1,6 @@
AC_INIT([jq], [1.3], [mu@netsoc.tcd.ie], m4_define([jq_version], m4_esyscmd_s([git describe --always --dirty --match 'jq-*'|sed 's/^jq-//']))
AC_INIT([jq], [jq_version], [mu@netsoc.tcd.ie],
[jq], [http://stedolan.github.com/jq/]) [jq], [http://stedolan.github.com/jq/])
dnl Created autoconf implementation thompson@dtosolutions, 26NOV12 dnl Created autoconf implementation thompson@dtosolutions, 26NOV12

2
setup.sh
View File

@@ -14,7 +14,7 @@ if [ "clean" == "$1" ]; then
rm -f jv_utf8_tables.gen.h lexer.c lexer.h parser.c parser.h rm -f jv_utf8_tables.gen.h lexer.c lexer.h parser.c parser.h
elif [ "superclean" == "$1" ]; then elif [ "superclean" == "$1" ]; then
# if autoconf errors during distcheck, it leaves files that need chmod'ing # if autoconf errors during distcheck, it leaves files that need chmod'ing
ver=$(tr -d '\n' <VERSION) ver=$(scripts/version|tr -d '\n')
if [ "x${ver}" != "x" ]; then if [ "x${ver}" != "x" ]; then
if [ -d jq-${ver} ]; then if [ -d jq-${ver} ]; then
chmod -R u+w jq-${ver} chmod -R u+w jq-${ver}