Skip to content

Commit 0535e72

Browse files
committed
jq 1.3 release
1 parent fd1ac5d commit 0535e72

File tree

8 files changed

+45
-9
lines changed

8 files changed

+45
-9
lines changed

Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ endif
7777
### Packaging
7878

7979
docs/site.yml: configure.ac
80-
sed 's/^jq_version: .*/jq_version: $(VERSION)/' $@ > $@.new
80+
sed 's/^jq_version: .*/jq_version: "$(VERSION)"/' $@ > $@.new
8181
mv $@.new $@
8282

8383
install-binaries: $(BUILT_SOURCES)

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
AC_INIT([jq], [1.2], [[email protected]],
1+
AC_INIT([jq], [1.3], [[email protected]],
22
[jq], [http://stedolan.github.com/jq/])
33

44
dnl Created autoconf implementation thompson@dtosolutions, 26NOV12

docs/content/2.download/default.yml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ body:
2727
manually by following instructions on [Arch Linux's
2828
Wiki](https://wiki.archlinux.org/index.php/Arch_UseRepository).
2929
30-
* Debian/Ubuntu packages are coming Real Soon Now.
30+
* jq 1.2 is [in Debian](http://packages.debian.org/jq)
3131
3232
### OS X
3333
@@ -42,18 +42,28 @@ body:
4242
4343
### From source on Linux or OS X
4444
45+
* [Source tarball for jq $JQ_VERSION](source/jq-$JQ_VERSION.tar.gz)
46+
47+
You can build it using the usual `./configure && make && sudo
48+
make install` rigmarole.
49+
50+
If you're interested in using the lastest development version, try:
51+
4552
git clone https://github.com/stedolan/jq.git
4653
cd jq
47-
make && sudo make install
54+
autoreconf
55+
./configure
56+
make
57+
sudo make install
4858
4959
To build it from a git clone, you'll need to install a few
5060
packages first:
5161
5262
* [Flex](http://www.gnu.org/software/flex/)
5363
* [Bison](http://www.gnu.org/software/bison/)
54-
* [Python](http://www.python.org)
5564
* [GCC](http://gcc.gnu.org)
5665
* [Make](http://www.gnu.org/software/make)
66+
* [Autotools](http://www.gnu.org/software/automake)
5767
5868
For Linux systems, these will all be in your system's package
5969
manager, and if you do development on the machine they're most
@@ -73,6 +83,8 @@ body:
7383
7484
jq's documentation is compiled into static HTML using
7585
[Bonsai](http://www.tinytree.info). To view the documentation
76-
locally, run `rake serve` from the docs/ subdirectory.
86+
locally, run `rake serve` from the docs/ subdirectory. You'll
87+
need a few Ruby dependencies, which can be installed by
88+
following the instructions in `docs/README.md`.
7789
7890

docs/content/index/index.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,11 @@ body3: |
2424
2525
tail: |
2626
Go read the [tutorial](tutorial/) for more, or the [manual](manual/)
27-
for *way* more.
27+
for *way* more.
28+
29+
news:
30+
- date: 2013-05-19
31+
body: |
32+
33+
jq 1.3 (finally) released! Get it on the [download](download/) page.
34+

docs/public/css/base.scss

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,4 +89,11 @@ h3 code {
8989

9090
footer {
9191
text-align: center;
92+
}
93+
94+
#news {
95+
font-size: 12pt;
96+
.date {
97+
font-style: italic;
98+
}
9299
}

docs/site.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
# This line is modified by the Makefile. To change the version number,
66
# edit the Autoconf version number at the top of configure.ac
7-
jq_version: 1.2
7+
jq_version: "1.3"
88

99
root: '/jq'
1010
footer: |

docs/templates/default.liquid

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<h1>{{headline}}</h1>
1111
{% for item in body %}
1212
{% if item.text %}
13-
{{ item.text | markdownify }}
13+
{{ item.text | replace: '$JQ_VERSION', jq_version | markdownify }}
1414
{% endif %}
1515

1616
{% if item.command %}

docs/templates/index.liquid

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,16 @@
3535
<div class="row" style="text-align:center; margin-top: 30px">
3636
{{tail | markdownify}}
3737
</div>
38+
<div class="row">
39+
<h2>News</h2>
40+
<div id="news">
41+
<ul>
42+
{% for item in news %}
43+
<li><span class="date">{{ item.date | date: '%m %B %Y' }}</span>{{item.body | markdownify}}</li>
44+
{% endfor %}
45+
</ul>
46+
</div>
47+
</div>
3848
</div>
3949
{% include "shared/footer" %}
4050
</body>

0 commit comments

Comments
 (0)