Skip to content

Commit

Permalink
jq 1.3 release
Browse files Browse the repository at this point in the history
  • Loading branch information
stedolan committed May 19, 2013
1 parent fd1ac5d commit 0535e72
Show file tree
Hide file tree
Showing 8 changed files with 45 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ endif
### Packaging

docs/site.yml: configure.ac
sed 's/^jq_version: .*/jq_version: $(VERSION)/' $@ > $@.new
sed 's/^jq_version: .*/jq_version: "$(VERSION)"/' $@ > $@.new
mv $@.new $@

install-binaries: $(BUILT_SOURCES)
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AC_INIT([jq], [1.2], [mu@netsoc.tcd.ie],
AC_INIT([jq], [1.3], [mu@netsoc.tcd.ie],
[jq], [http://stedolan.github.com/jq/])

dnl Created autoconf implementation thompson@dtosolutions, 26NOV12
Expand Down
20 changes: 16 additions & 4 deletions docs/content/2.download/default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ body:
manually by following instructions on [Arch Linux's
Wiki](https://wiki.archlinux.org/index.php/Arch_UseRepository).
* Debian/Ubuntu packages are coming Real Soon Now.
* jq 1.2 is [in Debian](http://packages.debian.org/jq)
### OS X
Expand All @@ -42,18 +42,28 @@ body:
### From source on Linux or OS X
* [Source tarball for jq $JQ_VERSION](source/jq-$JQ_VERSION.tar.gz)
You can build it using the usual `./configure && make && sudo
make install` rigmarole.
If you're interested in using the lastest development version, try:
git clone https://github.com/stedolan/jq.git
cd jq
make && sudo make install
autoreconf
./configure
make
sudo make install
To build it from a git clone, you'll need to install a few
packages first:
* [Flex](http://www.gnu.org/software/flex/)
* [Bison](http://www.gnu.org/software/bison/)
* [Python](http://www.python.org)
* [GCC](http://gcc.gnu.org)
* [Make](http://www.gnu.org/software/make)
* [Autotools](http://www.gnu.org/software/automake)
For Linux systems, these will all be in your system's package
manager, and if you do development on the machine they're most
Expand All @@ -73,6 +83,8 @@ body:
jq's documentation is compiled into static HTML using
[Bonsai](http://www.tinytree.info). To view the documentation
locally, run `rake serve` from the docs/ subdirectory.
locally, run `rake serve` from the docs/ subdirectory. You'll
need a few Ruby dependencies, which can be installed by
following the instructions in `docs/README.md`.
9 changes: 8 additions & 1 deletion docs/content/index/index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,11 @@ body3: |
tail: |
Go read the [tutorial](tutorial/) for more, or the [manual](manual/)
for *way* more.
for *way* more.
news:
- date: 2013-05-19
body: |
jq 1.3 (finally) released! Get it on the [download](download/) page.
7 changes: 7 additions & 0 deletions docs/public/css/base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -89,4 +89,11 @@ h3 code {

footer {
text-align: center;
}

#news {
font-size: 12pt;
.date {
font-style: italic;
}
}
2 changes: 1 addition & 1 deletion docs/site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

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

root: '/jq'
footer: |
Expand Down
2 changes: 1 addition & 1 deletion docs/templates/default.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<h1>{{headline}}</h1>
{% for item in body %}
{% if item.text %}
{{ item.text | markdownify }}
{{ item.text | replace: '$JQ_VERSION', jq_version | markdownify }}
{% endif %}

{% if item.command %}
Expand Down
10 changes: 10 additions & 0 deletions docs/templates/index.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,16 @@
<div class="row" style="text-align:center; margin-top: 30px">
{{tail | markdownify}}
</div>
<div class="row">
<h2>News</h2>
<div id="news">
<ul>
{% for item in news %}
<li><span class="date">{{ item.date | date: '%m %B %Y' }}</span>{{item.body | markdownify}}</li>
{% endfor %}
</ul>
</div>
</div>
</div>
{% include "shared/footer" %}
</body>
Expand Down

0 comments on commit 0535e72

Please sign in to comment.