The Birdfont Source Code


All Repositories / birdfont.git / commit – RSS feed

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

These changes was commited to the Birdfont repository Sat, 07 Mar 2015 13:50:30 +0000.

Contributing

Send patches or pull requests to johan.mattsson.m@gmail.com.
Clone this repository: git clone https://github.com/johanmattssonm/birdfont.git
author Johan Mattsson <johan.mattsson.m@gmail.com>
Sat, 07 Mar 2015 13:50:30 +0000 (14:50 +0100)
committer Johan Mattsson <johan.mattsson.m@gmail.com>
Sat, 07 Mar 2015 13:50:30 +0000 (14:50 +0100)
commit 966d3d72be4def495d229a051b4a90c42b45ae47
tree 2353f37c1510423a4f4bd88d551fee9e72effdc4
parent d36f05cd36d38373bd4957eb42bdf037db3155b8
parent 40788e1a9151fdc85fd547afb728ceb4b0238840
Merge branch 'master' of gitorious.org:birdfont/birdfont

libbirdfont/KeyBindings.vala
libbirdfont/TooltipArea.vala
scripts/build.py
scripts/linux_build.py
scripts/mac_build.py
scripts/windows_build.py
--- a/libbirdfont/KeyBindings.vala +++ b/libbirdfont/KeyBindings.vala @@ -11,8 +11,6 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. */ - - using Gdk; namespace BirdFont {
--- a/libbirdfont/TooltipArea.vala +++ b/libbirdfont/TooltipArea.vala @@ -13,7 +13,6 @@ */ using Cairo; - using Gdk; namespace BirdFont {
--- a/scripts/build.py +++ b/scripts/build.py @@ -23,7 +23,7 @@ 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 @@ --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 @@ $(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 @@ $(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 @@ -H build/libbirdxml/birdxml.h \ libbirdxml/*.vala \ """) - + if cc == "": print ("Skipping compilation"); else: @@ -178,15 +175,15 @@ 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 @@ $(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 @@ $(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 @@ 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 @@ $(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 @@ $(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 @@ 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 @@ run(valac + " " + valaflags + """\ -C \ - birdfont/* \ + birdfont/*.vala \ """ + experimentalNonNull + """ \ --enable-experimental \ --vapidir=./ \
--- a/scripts/linux_build.py +++ b/scripts/linux_build.py @@ -43,10 +43,10 @@ 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
--- a/scripts/mac_build.py +++ b/scripts/mac_build.py @@ -44,10 +44,10 @@ 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"""
--- a/scripts/windows_build.py +++ b/scripts/windows_build.py @@ -38,9 +38,10 @@ 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")