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

Changed files (6)

• modified libbirdfont/KeyBindings.vala
• modified libbirdfont/TooltipArea.vala
• modified scripts/build.py
• modified scripts/linux_build.py
• modified scripts/mac_build.py
• modified scripts/windows_build.py

Diff

diff --git a/libbirdfont/KeyBindings.vala b/libbirdfont/KeyBindings.valaindex 55f9aa6..4262458 100644--- a/libbirdfont/KeyBindings.vala+++ b/libbirdfont/KeyBindings.vala@@ -12,8 +12,6 @@     Lesser General Public License for more details. */ -using Gdk;- namespace BirdFont {  // FIXME a lot of these things have been replaced and can safely be removeddiff --git a/libbirdfont/TooltipArea.vala b/libbirdfont/TooltipArea.valaindex dc2ca6c..ab773b2 100644--- a/libbirdfont/TooltipArea.vala+++ b/libbirdfont/TooltipArea.vala@@ -13,7 +13,6 @@ */  using Cairo;-using Gdk;  namespace BirdFont { diff --git a/scripts/build.py b/scripts/build.pyindex c88360d..e82611f 100644--- a/scripts/build.py+++ b/scripts/build.py@@ -23,7 +23,7 @@ from run import run  import config -def libbirdfont(prefix, cc, cflags, ldflags, valac, valaflags, library, nonNull = True):+def libbirdfont(prefix, cc, cflags, ldflags, valac, valaflags, library, nonNull = True, usePixbuf = True): 	#libbirdfont 	run("mkdir -p build/libbirdfont") 	run("mkdir -p build/bin")@@ -47,10 +47,9 @@ def libbirdfont(prefix, cc, cflags, ldflags, valac, valaflags, library, nonNull  		--pkg """ + config.GEE + """ \ 		--pkg gio-2.0 \ 		--pkg cairo \-		--pkg gdk-pixbuf-2.0 \ 		--pkg libbirdxml \ 		""")-+	 	#copy c sources  	run("cp libbirdfont/OpenFontFormat/*.c build/libbirdfont/") @@ -65,7 +64,6 @@ def libbirdfont(prefix, cc, cflags, ldflags, valac, valaflags, library, nonNull  			$(pkg-config --cflags gio-2.0) \ 			$(pkg-config --cflags cairo) \ 			$(pkg-config --cflags glib-2.0) \-			$(pkg-config --cflags gdk-pixbuf-2.0) \ 			-I ./build/libbirdxml""") 		run("mv ./*.o build/libbirdfont/ ") @@ -83,7 +81,6 @@ def libbirdfont(prefix, cc, cflags, ldflags, valac, valaflags, library, nonNull  			$(pkg-config --libs gio-2.0) \ 			$(pkg-config --libs cairo) \ 			$(pkg-config --libs glib-2.0) \-			$(pkg-config --libs gdk-pixbuf-2.0) \ 			-L./build -L./build/bin -l birdxml \ 			-o """ + library) 		run("mv " + library + " build/bin/")@@ -131,7 +128,7 @@ def libbirdxml(prefix, cc, cflags, ldflags, valac, valaflags, library, nonNull = 		-H build/libbirdxml/birdxml.h \ 		libbirdxml/*.vala \ 		""")-		+	 	if cc == "": 		print ("Skipping compilation"); 	else:@@ -178,15 +175,15 @@ def birdfont_export(prefix, cc, cflags, ldflags, valac, valaflags, nonNull = Tru 			 	run(valac + """ \ 		-C \+		""" + valaflags + """ 		""" + experimentalNonNull + """ \ 		--enable-experimental \-		--define=MAC birdfont-export/* \+		--define=MAC \+		birdfont-export/*.vala \ 		--vapidir=./ \ 		--pkg """ + config.GEE + """ \ 		--pkg gio-2.0  \ 		--pkg cairo \-		--pkg gdk-pixbuf-2.0 \-		--pkg gtk+-2.0 \ 		--pkg libbirdfont""") 	run("mv birdfont-export/*.c build/birdfont-export/") @@ -197,7 +194,6 @@ def birdfont_export(prefix, cc, cflags, ldflags, valac, valaflags, nonNull = Tru 		$(pkg-config --cflags gio-2.0) \ 		$(pkg-config --cflags cairo) \ 		$(pkg-config --cflags glib-2.0) \-		$(pkg-config --cflags gdk-pixbuf-2.0) \ 		-I ./build/libbirdfont/""") 	run("mv ./*.o build/birdfont-export/") @@ -209,7 +205,6 @@ def birdfont_export(prefix, cc, cflags, ldflags, valac, valaflags, nonNull = Tru 		$(pkg-config --libs gio-2.0) \ 		$(pkg-config --libs cairo) \ 		$(pkg-config --libs glib-2.0) \-		$(pkg-config --libs gdk-pixbuf-2.0) \ 		-L./build -L./build/bin -l birdxml \ 		-o ./build/bin/birdfont-export""") @@ -238,15 +233,14 @@ def birdfont_import(prefix, cc, cflags, ldflags, valac, valaflags, nonNull = Tru 			 	run(valac + """ \ 		-C \+		""" + valaflags + """ 		""" + experimentalNonNull + """ \ 		--enable-experimental \-		--define=MAC birdfont-import/* \+		--define=MAC birdfont-import/*.vala \ 		--vapidir=./ \ 		--pkg """ + config.GEE + """ \ 		--pkg gio-2.0  \ 		--pkg cairo \-		--pkg gdk-pixbuf-2.0 \-		--pkg gtk+-2.0 \ 		--pkg libbirdfont""") 	run("mv birdfont-import/*.c build/birdfont-import/") @@ -257,7 +251,6 @@ def birdfont_import(prefix, cc, cflags, ldflags, valac, valaflags, nonNull = Tru 		$(pkg-config --cflags gio-2.0) \ 		$(pkg-config --cflags cairo) \ 		$(pkg-config --cflags glib-2.0) \-		$(pkg-config --cflags gdk-pixbuf-2.0) \ 		-I ./build/libbirdfont/""") 	run("mv ./*.o build/birdfont-import/") @@ -269,7 +262,6 @@ def birdfont_import(prefix, cc, cflags, ldflags, valac, valaflags, nonNull = Tru 		$(pkg-config --libs gio-2.0) \ 		$(pkg-config --libs cairo) \ 		$(pkg-config --libs glib-2.0) \-		$(pkg-config --libs gdk-pixbuf-2.0) \                 -L./build -L./build/bin -l birdxml \ 		-o ./build/bin/birdfont-import""") @@ -280,12 +272,13 @@ def birdfont_autotrace(prefix, cc, cflags, ldflags, valac, valaflags, nonNull =  	experimentalNonNull = "" 	if nonNull: 		experimentalNonNull = "--enable-experimental-non-null"-			+ 	run(valac + """ \ 		-C \ 		""" + experimentalNonNull + """ \ 		--enable-experimental \-		--define=MAC birdfont-autotrace/* \+		--define=MAC \+		birdfont-autotrace/*.vala \ 		--vapidir=./ \ 		--pkg """ + config.GEE + """ \ 		--pkg gio-2.0  \@@ -329,7 +322,7 @@ def birdfont_gtk(prefix, cc, cflags, ldflags, valac, valaflags, nonNull = True): 			 	run(valac + " " + valaflags  + """\ 		-C \-		birdfont/* \+		birdfont/*.vala \ 		""" + experimentalNonNull + """ \ 		--enable-experimental \ 		--vapidir=./ \diff --git a/scripts/linux_build.py b/scripts/linux_build.pyindex 3c510f9..c4d28cf 100755--- a/scripts/linux_build.py+++ b/scripts/linux_build.py@@ -43,10 +43,10 @@ if not options.valac:  prefix = options.prefix valac = options.valac-valaflags = ""+valaflags = "--pkg gdk-pixbuf-2.0 --pkg gtk+-2.0" cc = options.cc-cflags = options.cflags-ldflags = options.ldflags+cflags = options.cflags + " " + "$(pkg-config --cflags gdk-pixbuf-2.0)"+ldflags = options.ldflags + " " + "$(pkg-config --libs gdk-pixbuf-2.0)" library_cflags = options.cflags library_ldflags= options.ldflags + " -Wl,-soname," + "libbirdfont.so." + version.LIBBIRDXML_SO_VERSION diff --git a/scripts/mac_build.py b/scripts/mac_build.pyindex 48ddaf4..1c77d4e 100644--- a/scripts/mac_build.py+++ b/scripts/mac_build.py@@ -44,10 +44,10 @@ if not options.valac:  prefix = options.prefix valac = options.valac-valaflags = ""+valaflags = "--pkg gdk-pixbuf-2.0 --pkg gtk+-2.0" cc = options.cc-cflags = options.cflags-ldflags = options.ldflags+cflags = options.cflags + " " + "$(pkg-config --cflags gdk-pixbuf-2.0)"+ldflags = options.ldflags + " " + "$(pkg-config --libs gdk-pixbuf-2.0)"  library_cflags = "-fno-common -fPIC " + cflags  library_ldflags = options.ldflags + " " + """-dynamiclib -Wl,-headerpad_max_install_names,-undefined,dynamic_lookup,-compatibility_version,1.0,-current_version,1.0,-install_name,""" + prefix + """/lib/libbirdfont.dylib""" diff --git a/scripts/windows_build.py b/scripts/windows_build.pyindex a8c10b5..dfef08b 100644--- a/scripts/windows_build.py+++ b/scripts/windows_build.py@@ -38,8 +38,9 @@ run ("cp build/bin/libbirdfont.dll ./") run ("gcc -Wl,-subsystem,windows -Wl,--output-def,build/bin/libbirdfont.def,--out-implib -shared -Wl,-soname,libbirdfont.dll libbirdfont.dll") run ("rm libbirdfont.dll") -build.birdfont_export(prefix, cc, cflags, ldflags, valac, valaflags)-build.birdfont_import(prefix, cc, cflags, ldflags, valac, valaflags)-build.birdfont_autotrace(prefix, cc, cflags, ldflags, valac, valaflags)+#FIMXE+#build.birdfont_export(prefix, cc, cflags, ldflags, valac, valaflags)+#build.birdfont_import(prefix, cc, cflags, ldflags, valac, valaflags)+#build.birdfont_autotrace(prefix, cc, cflags, ldflags, valac, valaflags)  print ("Done")