new build script on linux

Changed files (5)

• modified README
• modified birdfont_install
• modified configure
• modified libbirdfont/BackgroundTool.vala
• modified scripts/build.py

Diff

diff --git a/README b/READMEindex 35cd30c..e06b516 100644--- a/README+++ b/README@@ -17,8 +17,7 @@ Install vala and all required libraries, they are most likely in packages with a -dev or -devel affix. 
 
 Install the following packages:
-valac 
-python-doit 
+valac
 libglib2.0-dev 
 libgtk2.0-dev 
 libxml2-dev 
@@ -27,22 +26,14 @@ unicode-data (unicode character database) 
 Configure, build and install:
 ./configure
-doit
-sudo ./install
+./script/linux_build.py
+sudo ./birdfont_install
 
-------------------------
-Bulding Windows Binaries
-------------------------
-
-Windows binaries are cross compiled with mingw on a Ubuntu system. Install
-all dependencies from Gregs repository as described here:
-
-http://greg.thehellings.com/2012/02/a-better-ubuntu-mingw-experience/
-
-You need wine and nsis windows installer as well.
-
-Compile and build the installer with:
-./scripts/build_win32.py
+BirdFont have two build systems one very simple python script that
+builds all binaries at once and a better build system based on doit
+(pydoit.org). The doit scripts will only rebuild the parts that has 
+changed and is the prefered way to compile BirdFont if you are working 
+on a new feature.
 
 ---------------------
 Building Mac binaries
@@ -58,16 +49,10 @@ Compile all dependencies using MacPorts and run: Precompiled Packages
 --------------------
 
-A Windows binary is avalilable at http://birdfont.org
-You need to install the windows version on drive C:.
+Windows binaries are avalilable at http://birdfont.org
 
 A Ubuntu package is avalilable at https://launchpad.net
 You can apt-get install birdfont form Olivier Bertens repository.
 
-A Debian packages is available at http://packages.debian.org
-
-A Machintosh binary image is available at http://birdfont.org
-You might need to install a more recent version of XOrg. Install 
-the server and run:
-sudo launchctl load -w /Library/LaunchAgents/org.macports.startx.plist
-
+A Machintosh binary image is available at http://birdfont.org and
+a GTK version for Mac can be installed with MacPorts.
diff --git a/birdfont_install b/birdfont_installindex e832519..3bea8b6 100755--- a/birdfont_install+++ b/birdfont_install@@ -59,8 +59,8 @@ install ('resources/linux/birdfont.png', '/share/icons/hicolor/48x48/apps')  install ('build/bin/birdfont', '/bin') install ('build/bin/birdfont-export', '/bin')-install ('build/libbirdfont.so.' +  version.SO_VERSION, '/lib')-install ('build/libbirdfont.so', '/lib')+install ('build/bin/libbirdfont.so.' + version.SO_VERSION, '/lib')+install ('build/bin/libbirdfont.so', '/lib')  if not bsd_manpages:     install ('build/birdfont.1.gz', '/share/man/man1')diff --git a/configure b/configureindex 6d41f6f..b2720a3 100755--- a/configure+++ b/configure@@ -50,10 +50,6 @@ def configure (): 		print (FAIL + "valac is too old." + ENDC) 		exit (1) -	if not test_program_version ("doit", 0, 20, 0):		-		print (FAIL + "doit is too old" + ENDC)-		exit (1)- 	libs = [ 			'cairo',  			'gdk-pixbuf-2.0', diff --git a/libbirdfont/BackgroundTool.vala b/libbirdfont/BackgroundTool.valaindex dec2f1f..87ac83a 100644--- a/libbirdfont/BackgroundTool.vala+++ b/libbirdfont/BackgroundTool.vala@@ -146,4 +146,3 @@ class BackgroundTool : Tool { }  }-diff --git a/scripts/build.py b/scripts/build.pyindex 2eac46c..beb6902 100644--- a/scripts/build.py+++ b/scripts/build.py@@ -100,7 +100,7 @@ def birdfont_export(prefix, cc, cflags, ldflags, valac, valaflags, library):  	run(cc + " " + ldflags + " \ 		build/birdfont-export/*.o \-		build/bin/""" + library + """ \+		-L build/bin/ -l""" + library + """ \ 		$(pkg-config --libs libxml-2.0) \ 		$(pkg-config --libs gio-2.0) \ 		$(pkg-config --libs cairo) \@@ -145,7 +145,7 @@ def birdfont_gtk(prefix, cc, cflags, ldflags, valac, valaflags, library):  	run(cc + " " + ldflags + """ \ 		build/birdfont/*.o \-		""" + library + """ \+		-L build/bin/ -l""" + library + """ \ 		$(pkg-config --libs libxml-2.0) \ 		$(pkg-config --libs gio-2.0) \ 		$(pkg-config --libs cairo) \