merge changes branch v0.6

.gitignore

@@ -17,7 +17,7 @@ dist
 *.egg-info
 docs/_*/*
 docs/autodoc/
-build/sphinx/
+build
 pyan/
 .buildozer/
 bin/

buildscripts/README.md

@@ -0,0 +1,2 @@
+This directory contains scripts that are helpful for developers when building
+or maintaining PyBitmessage.

buildscripts/osx.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# OS X Build script wrapper around the py2app script.
+# This build can only be generated on OS X.
+# Requires all build dependencies for Bitmessage
+# Especially important is OpenSSL installed through brew
+
+export ARCHFLAGS="-arch i386 -arch x86_64" 
+
+if [[ -z "$1" ]]; then
+  echo "Please supply a version number for this release as the first argument."
+  exit
+fi
+
+echo "Creating OS X packages for Bitmessage."
+
+export PYBITMESSAGEVERSION=$1
+
+cd src && python2.7 build_osx.py py2app
+
+if [[ $? = "0" ]]; then
+  hdiutil create -fs HFS+ -volname "Bitmessage" -srcfolder dist/Bitmessage.app dist/bitmessage-v$1.dmg
+else
+  echo "Problem creating Bitmessage.app, stopping."
+  exit
+fi

buildscripts/updatetranslations.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+if [ ! -f "$1" ]; then
+	echo "$1 not found, please specify the file name for source"
+	exit
+fi
+
+srcdir=`mktemp -d`
+
+unzip "$1" -d $srcdir
+
+for i in $srcdir/*ts; do
+	o=`basename $i|cut -b3-`
+	o="${o,,}"
+	o="${o//@/_}"
+	echo "$i -> $o"
+	mv "$i" "$HOME/src/PyBitmessage/src/translations/$o"
+done
+
+rm -rf -- $srcdir
+
+lrelease-qt4 "$HOME/src/PyBitmessage/src/translations/bitmessage.pro"

buildscripts/winbuild.sh

@@ -67,6 +67,10 @@ function install_python(){
 		echo "Installing vc_redist (2008) for 32 bit "
 		wine vcredist_x86.exe /Q
 	fi
+	# add cert
+	if [ -f /usr/local/share/ca-certificates/bitmessage-proxy.crt ]; then
+		wine python -m pip config set global.cert 'z:\usr\local\share\ca-certificates\bitmessage-proxy.crt'
+	fi
 	echo "Upgrading pip"
 	wine python -m pip install --upgrade pip
 }