Skip to content

Commit

Permalink
make sure pod and man do NOT get rebuilt -> 0.8.6
Browse files Browse the repository at this point in the history
  • Loading branch information
oetiker committed Jul 30, 2014
1 parent f3ebbad commit 984d0ce
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 25 deletions.
2 changes: 2 additions & 0 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ BIN = bin/@PACKAGE@ bin/znapzendzetup bin/znapzendztatz
PM := $(shell find lib/ -name "*.pm")

MAN = man/znapzend.1 man/znapzendzetup.1 man/znapzendztatz.1
POD = doc/znapzend.pod doc/znapzendzetup.pod doc/znapzendztatz.pod

GENERATED_EXTRADIST = $(MAN) $(POD)
EXTRA_DIST = VERSION COPYRIGHT README.md LICENSE CHANGES AUTHORS setup/build-thirdparty.sh setup/sdbs.inc $(BIN) $(PM) $(GENERATED_EXTRADIST) init/znapzend.xml.in
Expand Down Expand Up @@ -54,6 +55,7 @@ install-exec-hook:

dist-hook:
$(AM_V_GEN)cd $(distdir) && $(PERL) -i -p -e '"$(PACKAGE_VERSION)" =~ /(\d+)\.(\d+)\.(\d+)/ and $$v = sprintf("%d.%03d%03d",$$1,$$2,$$3) and s/^\$$VERSION\s+=\s+".+?"/\$$VERSION = "$$d"/;' $(BIN)
$(AM_V_GEN)cd $(distdir) && touch doc/* man/*



Expand Down
2 changes: 2 additions & 0 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ SUFFIXES = .1 .man .pm
BIN = bin/@PACKAGE@ bin/znapzendzetup bin/znapzendztatz
PM := $(shell find lib/ -name "*.pm")
MAN = man/znapzend.1 man/znapzendzetup.1 man/znapzendztatz.1
POD = doc/znapzend.pod doc/znapzendzetup.pod doc/znapzendztatz.pod
GENERATED_EXTRADIST = $(MAN) $(POD)
EXTRA_DIST = VERSION COPYRIGHT README.md LICENSE CHANGES AUTHORS setup/build-thirdparty.sh setup/sdbs.inc $(BIN) $(PM) $(GENERATED_EXTRADIST) init/znapzend.xml.in
YEAR := $(shell date +%Y)
Expand Down Expand Up @@ -637,6 +638,7 @@ install-exec-hook:

dist-hook:
$(AM_V_GEN)cd $(distdir) && $(PERL) -i -p -e '"$(PACKAGE_VERSION)" =~ /(\d+)\.(\d+)\.(\d+)/ and $$v = sprintf("%d.%03d%03d",$$1,$$2,$$3) and s/^\$$VERSION\s+=\s+".+?"/\$$VERSION = "$$d"/;' $(BIN)
$(AM_V_GEN)cd $(distdir) && touch doc/* man/*

#END

Expand Down
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ZnapZend 0.8.5
ZnapZend 0.8.6
==============

[![Build Status](https://travis-ci.org/oetiker/znapzend.svg?branch=master)](https://travis-ci.org/oetiker/znapzend)
Expand All @@ -17,15 +17,15 @@ Zetup
To zetup znapzend follow these zimple inztructionz

```sh
wget https://github.com/oetiker/znapzend/releases/download/v0.8.5/znapzend-0.8.5.tar.gz
tar zxvf znapzend-0.8.5.tar.gz
cd znapzend-0.8.5
./configure --prefix=/opt/znapzend-0.8.5
wget https://github.com/oetiker/znapzend/releases/download/v0.8.6/znapzend-0.8.6.tar.gz
tar zxvf znapzend-0.8.6.tar.gz
cd znapzend-0.8.6
./configure --prefix=/opt/znapzend-0.8.6
```
if configure complains about missing perl modules, run

```sh
./setup/build-thirdparty.sh /opt/znapzend-0.8.5/thirdparty
./setup/build-thirdparty.sh /opt/znapzend-0.8.6/thirdparty
```

to install the missing modules into the specified directry. This will NOT messup your local perl installation!
Expand All @@ -50,19 +50,19 @@ The [znapzend](doc/znapzend.pod) demon is responsible for doing the actual backu
To see if your configuration is any good, run znapzend in noaction mode first.

```sh
/opt/znapzend-0.8.5/bin/znapzend --noaction --debug
/opt/znapzend-0.8.6/bin/znapzend --noaction --debug
```

If you don't want to wait for the scheduler to actually schedule work, you can also force immediate action by calling

```sh
/opt/znapzend-0.8.5/bin/znapzend --noaction --debug --runonce=<src_dataset>
/opt/znapzend-0.8.6/bin/znapzend --noaction --debug --runonce=<src_dataset>
```

then when you are happy with what you got, start it in daemon mode.

```sh
/opt/znapzend-0.8.5/bin/znapzend --daemonize
/opt/znapzend-0.8.6/bin/znapzend --daemonize
```

Best is to integrate znapzend into your system startup sequence, but you can also
Expand All @@ -71,8 +71,8 @@ run it by hand.
For illumos OSes you can import the znapzend service manifest provided in the install directory:

```sh
svccfg validate /opt/znapzend-0.8.5/init/znapzend.xml
svccfg import /opt/znapzend-0.8.5/init/znapzend.xml
svccfg validate /opt/znapzend-0.8.6/init/znapzend.xml
svccfg import /opt/znapzend-0.8.6/init/znapzend.xml
```

and then enable the service
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.8.5
0.8.6
20 changes: 10 additions & 10 deletions configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for znapzend 0.8.5.
# Generated by GNU Autoconf 2.68 for znapzend 0.8.6.
#
# Report bugs to <[email protected]>.
#
Expand Down Expand Up @@ -559,8 +559,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='znapzend'
PACKAGE_TARNAME='znapzend'
PACKAGE_VERSION='0.8.5'
PACKAGE_STRING='znapzend 0.8.5'
PACKAGE_VERSION='0.8.6'
PACKAGE_STRING='znapzend 0.8.6'
PACKAGE_BUGREPORT='[email protected]'
PACKAGE_URL=''

Expand Down Expand Up @@ -1195,7 +1195,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures znapzend 0.8.5 to adapt to many kinds of systems.
\`configure' configures znapzend 0.8.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1261,7 +1261,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of znapzend 0.8.5:";;
short | recursive ) echo "Configuration of znapzend 0.8.6:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1346,7 +1346,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
znapzend configure 0.8.5
znapzend configure 0.8.6
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
Expand All @@ -1363,7 +1363,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by znapzend $as_me 0.8.5, which was
It was created by znapzend $as_me 0.8.6, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -2186,7 +2186,7 @@ fi

# Define the identity of the package.
PACKAGE='znapzend'
VERSION='0.8.5'
VERSION='0.8.6'


cat >>confdefs.h <<_ACEOF
Expand Down Expand Up @@ -3159,7 +3159,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by znapzend $as_me 0.8.5, which was
This file was extended by znapzend $as_me 0.8.6, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -3212,7 +3212,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
znapzend config.status 0.8.5
znapzend config.status 0.8.6
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
Expand Down
2 changes: 1 addition & 1 deletion man/znapzend.1
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
.\" ========================================================================
.\"
.IX Title "ZNAPZEND 1"
.TH ZNAPZEND 1 "2014-07-30" "0.8.5" "znapzend"
.TH ZNAPZEND 1 "2014-07-30" "0.8.6" "znapzend"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
Expand Down
2 changes: 1 addition & 1 deletion man/znapzendzetup.1
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
.\" ========================================================================
.\"
.IX Title "ZNAPZENDZETUP 1"
.TH ZNAPZENDZETUP 1 "2014-07-30" "0.8.5" "znapzend"
.TH ZNAPZENDZETUP 1 "2014-07-30" "0.8.6" "znapzend"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
Expand Down
2 changes: 1 addition & 1 deletion man/znapzendztatz.1
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
.\" ========================================================================
.\"
.IX Title "ZNAPZENDZTATZ 1"
.TH ZNAPZENDZTATZ 1 "2014-07-30" "0.8.5" "znapzend"
.TH ZNAPZENDZTATZ 1 "2014-07-30" "0.8.6" "znapzend"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
Expand Down

0 comments on commit 984d0ce

Please sign in to comment.