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 Fri, 26 Sep 2014 19:04: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>
Fri, 26 Sep 2014 19:04:30 +0000 (21:04 +0200)
committer Johan Mattsson <johan.mattsson.m@gmail.com>
Fri, 26 Sep 2014 19:04:30 +0000 (21:04 +0200)
commit b7177894083afc2da367cc59564439544b3ec02f
tree 3d3247bfc8c61089ce4a874b5257d25c17c53260
parent f68e788bf714fcd994eacbd942f72fbc8ff2c67b
parent d0811004a155f07320819b805ef83a4ce650b502
Merge branch 'master' of gitorious.org:birdfont/birdfont

scripts/build.py
scripts/mac_build.py
scripts/windows_build.py
--- a/scripts/build.py +++ b/scripts/build.py @@ -36,7 +36,6 @@ -C \ """ + valaflags + """ \ --vapidir=./ \ - --vapidir=./build \ --basedir build/libbirdfont/ \ """ + experimentalNonNull + """ \ --enable-experimental \ @@ -48,7 +47,7 @@ --pkg gio-2.0 \ --pkg cairo \ --pkg gdk-pixbuf-2.0 \ - --pkg birdxml \ + --pkg libbirdxml \ """) #copy c sources @@ -66,7 +65,7 @@ $(pkg-config --cflags cairo) \ $(pkg-config --cflags glib-2.0) \ $(pkg-config --cflags gdk-pixbuf-2.0) \ - -I ./build/mac/birdfont""") + -I ./build/libbirdxml""") run("mv ./*.o build/libbirdfont/ ") if library.endswith (".dylib"): @@ -84,6 +83,7 @@ $(pkg-config --libs cairo) \ $(pkg-config --libs glib-2.0) \ $(pkg-config --libs gdk-pixbuf-2.0) \ + -L./build/bin -l birdxml \ -o """ + library) run("mv " + library + " build/bin/") @@ -137,6 +137,7 @@ -c build/libbirdxml/*.c \ -fPIC \ $(pkg-config --cflags glib-2.0) \ + $(pkg-config --cflags gobject-2.0) \ """) run("mv ./*.o build/libbirdxml/ ") @@ -149,8 +150,9 @@ run(cc + " " + ldflags + """ \ -shared \ """ + sonameparam + """ \ - build/libbirdfont/*.o \ + build/libbirdxml/*.o \ $(pkg-config --libs glib-2.0) \ + $(pkg-config --libs gobject-2.0) \ -o """ + library) run("mv " + library + " build/bin/")
--- a/scripts/mac_build.py +++ b/scripts/mac_build.py @@ -57,14 +57,14 @@ configfile.write_config (prefix) compile_translations() - build.libbirdxml(prefix, cc, xml_library_cflags, xml_library_ldflags, valac, valaflags, "libbirdfont." + version.SO_VERSION + ".dylib", False) - build.libbirdfont(prefix, cc, library_cflags, library_ldflags, valac, valaflags, "libbirdxml." + version.LIBBIRDXML_SO_VERSION + ".dylib", False) - build.birdfont_autotrace(prefix, cc, cflags, ldflags, valac, valaflags, library, False) - build.birdfont_export(prefix, cc, cflags, ldflags, valac, valaflags, library, False) - build.birdfont_import(prefix, cc, cflags, ldflags, valac, valaflags, library, False) + build.libbirdxml(prefix, cc, xml_library_cflags, xml_library_ldflags, valac, valaflags, "libbirdxml." + version.LIBBIRDXML_SO_VERSION + ".dylib", False) + build.libbirdfont(prefix, cc, library_cflags, library_ldflags, valac, valaflags, "libbirdfont." + version.SO_VERSION + ".dylib", False) + build.birdfont_autotrace(prefix, cc, cflags, ldflags, valac, valaflags, False) + build.birdfont_export(prefix, cc, cflags, ldflags, valac, valaflags, False) + build.birdfont_import(prefix, cc, cflags, ldflags, valac, valaflags, False) if not options.nogtk: - build.birdfont_gtk(prefix, cc, cflags, ldflags, valac, valaflags, library, False) + build.birdfont_gtk(prefix, cc, cflags, ldflags, valac, valaflags, False) print ("Done")
--- a/scripts/windows_build.py +++ b/scripts/windows_build.py @@ -34,7 +34,7 @@ run("windres ./resources/win32/icon.rc -O coff -o ./build/icon.res") build.libbirdxml(prefix, cc, cflags, library_ldflags, valac, valaflags, "libbirdxml.dll") build.libbirdfont(prefix, cc, cflags, library_ldflags, valac, valaflags, "libbirdfont.dll") - build.birdfont_export(prefix, cc, cflags, ldflags, valac, valaflags, library) + build.birdfont_export(prefix, cc, cflags, ldflags, valac, valaflags) print ("Done")