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

Changed files (3)

• modified scripts/build.py
• modified scripts/mac_build.py
• modified scripts/version.py

Diff

diff --git a/scripts/build.py b/scripts/build.pyindex 4c010ae..4503fb4 100644--- a/scripts/build.py+++ b/scripts/build.py@@ -23,16 +23,20 @@ from run import run  import config -def libbirdfont(prefix, cc, cflags, ldflags, valac, valaflags, library):+def libbirdfont(prefix, cc, cflags, ldflags, valac, valaflags, library, nonNull = True): 	#libbirdfont 	run("mkdir -p build/libbirdfont") 	run("mkdir -p build/bin") +	experimentalNonNull = ""+	if nonNull:+		experimentalNonNull = "--enable-experimental-non-null"+ 	run(valac + """\ 		-C \ 		""" + valaflags + """ \ 		--basedir build/libbirdfont/ \-		--enable-experimental-non-null \+		""" + experimentalNonNull + """ \ 		--enable-experimental \ 		--library libbirdfont \ 		-H build/libbirdfont/birdfont.h \@@ -100,13 +104,17 @@ def libbirdfont(prefix, cc, cflags, ldflags, valac, valaflags, library): 		run("gzip build/birdfont-export.1")  				 	-def birdfont_export(prefix, cc, cflags, ldflags, valac, valaflags, library):+def birdfont_export(prefix, cc, cflags, ldflags, valac, valaflags, library, nonNull = True): 	# birdfont-export 	run("mkdir -p build/birdfont-export")-	++	experimentalNonNull = ""+	if nonNull:+		experimentalNonNull = "--enable-experimental-non-null"+			 	run(valac + """ \ 		-C \-		--enable-experimental-non-null \+		""" + experimentalNonNull + """ \ 		--enable-experimental \ 		--define=MAC birdfont-export/* \ 		--vapidir=./ \@@ -154,14 +162,18 @@ def birdfont_export(prefix, cc, cflags, ldflags, valac, valaflags, library): 	run("touch build/installed") 	run("touch build/configured") 	-def birdfont_gtk(prefix, cc, cflags, ldflags, valac, valaflags, library):+def birdfont_gtk(prefix, cc, cflags, ldflags, valac, valaflags, library, nonNull = True): 	# birdfont 	run("mkdir -p build/birdfont")-	++	experimentalNonNull = ""+	if nonNull:+		experimentalNonNull = "--enable-experimental-non-null"+			 	run(valac + " " + valaflags  + """\ 		-C \ 		birdfont/* \-		--enable-experimental-non-null \+		""" + experimentalNonNull + """ \ 		--enable-experimental \ 		--vapidir=./ \ 		--pkg """ + config.GEE + """ \diff --git a/scripts/mac_build.py b/scripts/mac_build.pyindex d057ce9..6c485e8 100644--- a/scripts/mac_build.py+++ b/scripts/mac_build.py@@ -55,10 +55,10 @@ library_cflags = "-fno-common -fPIC " + cflags  configfile.write_config (prefix) compile_translations()-build.libbirdfont(prefix, cc, library_cflags, library_ldflags, valac, valaflags, library)-build.birdfont_export(prefix, cc, cflags, ldflags, valac, valaflags, library)+build.libbirdfont(prefix, cc, library_cflags, library_ldflags, valac, valaflags, library, False)+build.birdfont_export(prefix, cc, cflags, ldflags, valac, valaflags, library, False)  if not options.nogtk:-	build.birdfont_gtk(prefix, cc, cflags, ldflags, valac, valaflags, library)+	build.birdfont_gtk(prefix, cc, cflags, ldflags, valac, valaflags, library, False)  print ("Done")diff --git a/scripts/version.py b/scripts/version.pyindex ce19bd1..b9481d8 100644--- a/scripts/version.py+++ b/scripts/version.py@@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. """ -VERSION = '0.36'-SO_VERSION_MAJOR = '10'+VERSION = '0.37'+SO_VERSION_MAJOR = '11' SO_VERSION_MINOR = '0' SO_VERSION = SO_VERSION_MAJOR + '.' + SO_VERSION_MINOR