Remove preview on Mac OS X and other Mac specific things

Changed files (7)

• modified NEWS
• modified birdfont/GtkWindow.vala
• added birdfont_install
• deleted install
• modified libbirdfont/ExportTool.vala
• modified scripts/export.sh
• modified scripts/macport_build.py

Diff

diff --git a/NEWS b/NEWSindex ccde0e4..11c2d43 100644--- a/NEWS+++ b/NEWS@@ -1,3 +1,10 @@+birdfont (0.22) stable;++  * Bugfixes for changes to make BirdFont run on Mac OS X+  * Preview is removed on Mac OS X++ -- Johan Mattsson <johan.mattsson.m@gmail.com>  Sun Jul  6 21:28:000 CEST 2013+ birdfont (0.21) stable;    * Bugfixesdiff --git a/birdfont/GtkWindow.vala b/birdfont/GtkWindow.valaindex a407f61..52c0b32 100644--- a/birdfont/GtkWindow.vala+++ b/birdfont/GtkWindow.vala@@ -430,11 +430,13 @@ public class GtkWindow : Gtk.Window, NativeWindow { 		export_item.activate.connect (() => { ExportTool.export_all (); }); 		export_item.add_accelerator ("activate", accel_group, 'E', Gdk.ModifierType.CONTROL_MASK, Gtk.AccelFlags.VISIBLE); -		Gtk.MenuItem preview_item = new Gtk.MenuItem.with_mnemonic(_("_Preview"));-		file_menu.append (preview_item);-		preview_item.activate.connect (() => { MenuTab.preview (); });-		preview_item.add_accelerator ("activate", accel_group, 'P', Gdk.ModifierType.CONTROL_MASK, Gtk.AccelFlags.VISIBLE);-+		if (!BirdFont.mac) {+			Gtk.MenuItem preview_item = new Gtk.MenuItem.with_mnemonic(_("_Preview"));+			file_menu.append (preview_item);+			preview_item.activate.connect (() => { MenuTab.preview (); });+			preview_item.add_accelerator ("activate", accel_group, 'P', Gdk.ModifierType.CONTROL_MASK, Gtk.AccelFlags.VISIBLE);+		}+		 		Gtk.MenuItem description_item = new Gtk.MenuItem.with_mnemonic(_("Name and _description")); 		file_menu.append (description_item); 		description_item.activate.connect (() => { MenuTab.show_description (); });diff --git a/birdfont_install b/birdfont_installnew file mode 100755index 0000000..e832519--- /dev/null+++ b/birdfont_install@@ -0,0 +1,78 @@+#!/usr/bin/python +import os+import subprocess+import glob+from optparse import OptionParser+from scripts import config+from scripts import version++def install (file, dir):+	f = dest + prefix + dir + '/'+	s = file.rfind ('/')+	if s > -1:+		f += file[s + 1:]+	else:+		f += file+	print ("install: " + f)+	subprocess.check_output ('install -d ' + dest + prefix + dir, shell=True)+	subprocess.check_output ('install ' + file + ' ' + dest + prefix + dir + '/', shell=True)+	installed.write (f + "\n")++if not os.path.exists ("build/configured"):+	print ("Project is not configured")+	exit (1)++if not os.path.exists ("build/installed"):+        print ("Project is not built")+        exit (1)++parser = OptionParser()+parser.add_option ("-d", "--dest", dest="dest", help="install to this directory", metavar="DEST")+parser.add_option ("-m", "--bsd-manpages", dest="nogzip", help="don't gzip manpages")++(options, args) = parser.parse_args()++if not options.dest:+	options.dest = ""++if not options.nogzip:+    bsd_manpages = True+else:+    bsd_manpages = False+	+prefix = config.PREFIX+dest = options.dest++# create uninstall file+installed = open ('build/installed', 'w')+installed.write ('build/installed\n')++# install it:+for file in os.listdir('./layout'):+	install ('layout/' + file, '/share/birdfont/layout')++for file in os.listdir('./icons'):+	install ('icons/' + file, '/share/birdfont/icons')++install ('resources/linux/birdfont.desktop', '/share/applications')+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')++if not bsd_manpages:+    install ('build/birdfont.1.gz', '/share/man/man1')+    install ('build/birdfont-export.1.gz', '/share/man/man1')+else:+    install ('resources/linux/birdfont.1', '/man/man1')+    install ('resources/linux/birdfont-export.1', '/man/man1')+++# translations+for lang_dir in glob.glob('build/locale/*'):+	lc = lang_dir.replace ('build/locale/', "")+	install ('build/locale/' + lc + '/LC_MESSAGES/birdfont.mo', '/share/locale/' + lc + '/LC_MESSAGES' );++installed.close ()diff --git a/install b/installdeleted file mode 100755index e832519..0000000--- a/install+++ /dev/null@@ -1,78 +0,0 @@-#!/usr/bin/python -import os-import subprocess-import glob-from optparse import OptionParser-from scripts import config-from scripts import version--def install (file, dir):-	f = dest + prefix + dir + '/'-	s = file.rfind ('/')-	if s > -1:-		f += file[s + 1:]-	else:-		f += file-	print ("install: " + f)-	subprocess.check_output ('install -d ' + dest + prefix + dir, shell=True)-	subprocess.check_output ('install ' + file + ' ' + dest + prefix + dir + '/', shell=True)-	installed.write (f + "\n")--if not os.path.exists ("build/configured"):-	print ("Project is not configured")-	exit (1)--if not os.path.exists ("build/installed"):-        print ("Project is not built")-        exit (1)--parser = OptionParser()-parser.add_option ("-d", "--dest", dest="dest", help="install to this directory", metavar="DEST")-parser.add_option ("-m", "--bsd-manpages", dest="nogzip", help="don't gzip manpages")--(options, args) = parser.parse_args()--if not options.dest:-	options.dest = ""--if not options.nogzip:-    bsd_manpages = True-else:-    bsd_manpages = False-	-prefix = config.PREFIX-dest = options.dest--# create uninstall file-installed = open ('build/installed', 'w')-installed.write ('build/installed\n')--# install it:-for file in os.listdir('./layout'):-	install ('layout/' + file, '/share/birdfont/layout')--for file in os.listdir('./icons'):-	install ('icons/' + file, '/share/birdfont/icons')--install ('resources/linux/birdfont.desktop', '/share/applications')-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')--if not bsd_manpages:-    install ('build/birdfont.1.gz', '/share/man/man1')-    install ('build/birdfont-export.1.gz', '/share/man/man1')-else:-    install ('resources/linux/birdfont.1', '/man/man1')-    install ('resources/linux/birdfont-export.1', '/man/man1')---# translations-for lang_dir in glob.glob('build/locale/*'):-	lc = lang_dir.replace ('build/locale/', "")-	install ('build/locale/' + lc + '/LC_MESSAGES/birdfont.mo', '/share/locale/' + lc + '/LC_MESSAGES' );--installed.close ()diff --git a/libbirdfont/ExportTool.vala b/libbirdfont/ExportTool.valaindex b903667..8f1f1c3 100644--- a/libbirdfont/ExportTool.vala+++ b/libbirdfont/ExportTool.vala@@ -160,6 +160,7 @@ public class ExportTool : GLib.Object {  	public static void export_all () { 		bool f;+		Preview preview;  		f = export_ttf_font (); 		if (!f) {@@ -170,6 +171,10 @@ public class ExportTool : GLib.Object { 		if (!f) { 			warning ("Failed to export svg font"); 		}+		+		// create html file+		preview = new Preview ();+		preview.get_html_file (); 	}  	public static void generate_html_document (string html_file, Font font) {diff --git a/scripts/export.sh b/scripts/export.shindex f8dc8a9..990f47e 100755--- a/scripts/export.sh+++ b/scripts/export.sh@@ -23,7 +23,7 @@ cd export  git clone --no-hardlinks --local $rep -version=$(cat ../../scripts/version.py | grep "VERSION = '" | sed -e "s:VERSION = '::" | sed "s:'.*::g")+version=$(cat ../../scripts/version.py | grep "VERSION = '" | grep -v "SO_VERSION" | sed -e "s:VERSION = '::" | sed "s:'.*::g")  mv birdfont birdfont-$version diff --git a/scripts/macport_build.py b/scripts/macport_build.pyindex 6bc40e9..9a6c60d 100755--- a/scripts/macport_build.py+++ b/scripts/macport_build.py@@ -26,14 +26,14 @@ from run import run  import configfile -def build(prefix, cc, cflags, ldflags):+def build(prefix, cc, cflags, ldflags, valac): 	compile_translations () 	 	#libbirdfont 	run("mkdir -p build/libbirdfont") 	run("mkdir -p build/bin") -	run("""valac \+	run(valac + """\ 		-C \ 		--basedir build/libbirdfont/ \ 		--enable-experimental-non-null \@@ -78,7 +78,7 @@ def build(prefix, cc, cflags, ldflags): 	# birdfont 	run("mkdir -p build/birdfont") 	-	run("""valac \+	run(valac + """\ 		-C \ 		--enable-experimental-non-null \ 		--enable-experimental \@@ -120,7 +120,7 @@ def build(prefix, cc, cflags, ldflags): 	# birdfont-export 	run("mkdir -p build/birdfont-export") 	-	run("""valac \+	run(valac + """ \ 		-C \ 		--enable-experimental-non-null \ 		--enable-experimental \@@ -186,6 +186,7 @@ parser.add_option("-d", "--dest", dest="dest", help="install to this directory", parser.add_option("-c", "--cc", dest="cc", help="select the C compiler", metavar="CC") parser.add_option("-f", "--cflags", dest="cflags", help="set compiler flags", metavar="CFLAGS") parser.add_option("-l", "--ldflags", dest="ldflags", help="set linker flags", metavar="LDFLAGS")+parser.add_option("-v", "--valac", dest="valac", help="select vala compiler", metavar="VALAC")  (options, args) = parser.parse_args() @@ -197,9 +198,11 @@ if not options.cflags: 	options.cflags = "" if not options.ldflags: 	options.ldflags = ""+if not options.valac:+	options.valac = "valac"  build_app (options.prefix)	-build (options.prefix, options.cc, options.cflags, options.ldflags)+build (options.prefix, options.cc, options.cflags, options.ldflags, options.valac)