Merge branch 'master' of gitorious.org:supplement/birdfont

Changed files (6)

• added icons/cubic_points.png
• added icons/quadratic_points.png
• added scripts/export.sh
• added scripts/run.py
• modified scripts/version.py
• modified scripts/win_build.py

Diff

diff --git a/icons/cubic_points.png b/icons/cubic_points.pngnew file mode 100644index 0000000..6d88c9bBinary files /dev/null and b/icons/cubic_points.png differdiff --git a/icons/quadratic_points.png b/icons/quadratic_points.pngnew file mode 100644index 0000000..482b3c1Binary files /dev/null and b/icons/quadratic_points.png differdiff --git a/scripts/export.sh b/scripts/export.shnew file mode 100755index 0000000..dfbdf00--- /dev/null+++ b/scripts/export.sh@@ -0,0 +1,26 @@+#!/bin/bash++rep="$(pwd)"++mkdir build+cd build+mkdir -p export+cd export ++git clone --no-hardlinks --local $rep++version=$(cat ../../scripts/version.py | grep "VERSION = '" | sed -e "s:VERSION = '::" | sed "s:'.*::g")++mv birdfont birdfont-$version++rm -rf birdfont-$version/.git+rm -rf birdfont-$version/.gitignore++tar -cf birdfont-$version.tar birdfont-$version++gzip birdfont-$version.tar++mv birdfont-$version.tar.gz ../+++rm -rf ../export/birdfont-$versiondiff --git a/scripts/run.py b/scripts/run.pynew file mode 100644index 0000000..a3c9b89--- /dev/null+++ b/scripts/run.py@@ -0,0 +1,9 @@+#!/usr/bin/python+import subprocess++def run(cmd):+	process = subprocess.Popen (cmd, shell=True)+	process.communicate()[0]+	if not process.returncode == 0:+		print("Error: " + cmd)+		exit(1)diff --git a/scripts/version.py b/scripts/version.pyindex 34a6bb3..5fa45da 100644--- a/scripts/version.py+++ b/scripts/version.py@@ -1,2 +1,2 @@ #!/usr/bin/python-VERSION = '0.14'+VERSION = '0.15'diff --git a/scripts/win_build.py b/scripts/win_build.pyindex 2e88c3e..d90ff5d 100755--- a/scripts/win_build.py+++ b/scripts/win_build.py@@ -240,7 +240,7 @@ def generate_nsi(): Name "Birdfont" """) -	f.write("OutFile \".\\")+	f.write("OutFile \"..\\") 	f.write("birdfont-") 	f.write(VERSION) 	f.write(".exe\"")