From dfa6e1f51228c2bb9989d840d12314e42e43827f Mon Sep 17 00:00:00 2001
From: pancake <pancake@nopcode.org>
Date: Wed, 12 Oct 2011 05:13:54 +0200
Subject: [PATCH] * Bump to 0.8.6 * Various fixes for the farm   - Build and
 push python + python-dist

---
 configure                 | 8 ++++----
 configure.acr             | 2 +-
 r2-bindings/configure     | 8 ++++----
 r2-bindings/configure.acr | 2 +-
 sys/farm/CONFIG           | 4 +++-
 sys/farm/Makefile         | 4 ++++
 sys/farm/bins.sh          | 1 +
 sys/farm/html.sh          | 2 +-
 8 files changed, 19 insertions(+), 12 deletions(-)
 create mode 100644 sys/farm/Makefile

diff --git a/configure b/configure
index 51851cdda9..d3bcb79ccc 100755
--- a/configure
+++ b/configure
@@ -104,12 +104,12 @@ done
 : ${INSTALL_PROGRAM:=${INSTALL} -m 755 -s}
 : ${INSTALL_MAN:=${INSTALL} -m 444}
 : ${INSTALL_LIB:=${INSTALL} -c}
- PKGNAME='radare2' ; VERSION='0.8.5' ; CONTACT_MAIL="pancake@nopcode.org" ; CONTACT_NAME="pancake" ; CONTACT="pancake <pancake@nopcode.org>" ;
+ PKGNAME='radare2' ; VERSION='0.8.6' ; CONTACT_MAIL="pancake@nopcode.org" ; CONTACT_NAME="pancake" ; CONTACT="pancake <pancake@nopcode.org>" ;
 }
                 
 show_usage() {
 cat <<EOF2
-'configure' configures radare2-0.8.5 to adapt to many kinds of systems.
+'configure' configures radare2-0.8.6 to adapt to many kinds of systems.
 
 Usage: ./configure [OPTION]... [VAR=VALUE]...
 
@@ -185,7 +185,7 @@ take_environ() {
 }
 
 show_version() {
-echo "radare2-0.8.5 configuration script done with acr v0.8.6.
+echo "radare2-0.8.6 configuration script done with acr v0.8.6.
 The 'Free Software Foundation' message is only for autodetection.
 Originally written by pancake <youterm.com>."
 exit 0
@@ -203,7 +203,7 @@ case $flag in
 	show_version ; ;;
 "-r"|"--r"|"--report")
 echo "PKGNAME:   radare2"
-echo "VERSION:   0.8.5"
+echo "VERSION:   0.8.6"
 echo "LANGS:     c"
 echo "REQUIRED:  libdl"
 echo "OPTIONAL:  libewf"
diff --git a/configure.acr b/configure.acr
index b44d6848e6..a81578a65a 100644
--- a/configure.acr
+++ b/configure.acr
@@ -1,5 +1,5 @@
 PKGNAME radare2
-VERSION 0.8.5
+VERSION 0.8.6
 CONTACT pancake ; pancake@nopcode.org
 
 LANG_C!
diff --git a/r2-bindings/configure b/r2-bindings/configure
index 725f8ed2cb..0f63e48e1c 100755
--- a/r2-bindings/configure
+++ b/r2-bindings/configure
@@ -96,12 +96,12 @@ done
 : ${INSTALL_PROGRAM:=${INSTALL} -m 755 -s}
 : ${INSTALL_MAN:=${INSTALL} -m 444}
 : ${INSTALL_LIB:=${INSTALL} -c}
- PKGNAME='radare2-bindings' ; VERSION='0.8.5' ; CONTACT_MAIL="pancake@nopcode.org" ; CONTACT_NAME="pancake" ; CONTACT="pancake <pancake@nopcode.org>" ;
+ PKGNAME='radare2-bindings' ; VERSION='0.8.6' ; CONTACT_MAIL="pancake@nopcode.org" ; CONTACT_NAME="pancake" ; CONTACT="pancake <pancake@nopcode.org>" ;
 }
                 
 show_usage() {
 cat <<EOF2
-'configure' configures radare2-bindings-0.8.5 to adapt to many kinds of systems.
+'configure' configures radare2-bindings-0.8.6 to adapt to many kinds of systems.
 
 Usage: ./configure [OPTION]... [VAR=VALUE]...
 
@@ -169,7 +169,7 @@ take_environ() {
 }
 
 show_version() {
-echo "radare2-bindings-0.8.5 configuration script done with acr v0.8.6.
+echo "radare2-bindings-0.8.6 configuration script done with acr v0.8.6.
 The 'Free Software Foundation' message is only for autodetection.
 Originally written by pancake <youterm.com>."
 exit 0
@@ -187,7 +187,7 @@ case $flag in
 	show_version ; ;;
 "-r"|"--r"|"--report")
 echo "PKGNAME:   radare2-bindings"
-echo "VERSION:   0.8.5"
+echo "VERSION:   0.8.6"
 echo "LANGS:     c c++"
 echo "PKG-CONFIG:  r_core"
 echo "FLAGS:     --enable-devel --with-cc=gcc --with-cxx=g++ --with-ostype=auto"
diff --git a/r2-bindings/configure.acr b/r2-bindings/configure.acr
index 9726dc44ac..d11efa0ef5 100644
--- a/r2-bindings/configure.acr
+++ b/r2-bindings/configure.acr
@@ -1,5 +1,5 @@
 PKGNAME radare2-bindings
-VERSION 0.8.5
+VERSION 0.8.6
 CONTACT pancake ; pancake@nopcode.org
 
 LANG_C!
diff --git a/sys/farm/CONFIG b/sys/farm/CONFIG
index 9682ac7a37..fba398d1fd 100644
--- a/sys/farm/CONFIG
+++ b/sys/farm/CONFIG
@@ -19,9 +19,11 @@ REMOTEDIR=""
 TARGETS="
 	build
 	bindist
+	python
+	python-dist
 	mingw32
 	android-arm
 	android-x86
-	python-dist
 "
+
 # mingw64 maemo
diff --git a/sys/farm/Makefile b/sys/farm/Makefile
new file mode 100644
index 0000000000..db15869b04
--- /dev/null
+++ b/sys/farm/Makefile
@@ -0,0 +1,4 @@
+all:
+	sh run.sh
+	sh html.sh
+	sh push.sh
diff --git a/sys/farm/bins.sh b/sys/farm/bins.sh
index 695182e979..09e34dd7e9 100755
--- a/sys/farm/bins.sh
+++ b/sys/farm/bins.sh
@@ -10,3 +10,4 @@ os=`uname -sm|sed -e 's, ,-,'|tr 'A-Z' 'a-z'`
 cp ../../$p-bin.tar.gz $b/$p-$os.tar.gz
 cp ../../$p-android*.gz $b
 cp ../../radare2-*.zip $b
+cp ../../r2-bindings-0.8.5.tar.gz $b
diff --git a/sys/farm/html.sh b/sys/farm/html.sh
index 00895122dd..8df09ef3e2 100755
--- a/sys/farm/html.sh
+++ b/sys/farm/html.sh
@@ -12,7 +12,7 @@ for a in log/*.log ; do
 	echo "<h1><a href=./>index</a></h1>" >> $b
 	echo "<h1>$a</h1>" >> $b
 	warnings=$(cat $a|grep warning: |wc -l)
-	errors=$(cat $a|grep error: |wc -l)
+	errors=$(cat $a|grep -e error: -e 'returned 1'|wc -l)
 	if [ -f $t ]; then
 		echo "<h2>time:</h2>" >> $b
 		echo "<pre>" >> $b