Remove git support for 1.0

Changed files (4)

• modified libbirdfont/BirdFontPart.vala
• modified libbirdfont/SearchPaths.vala
• modified libbirdfont/SpacingClassTab.vala
• modified scripts/build.py

Diff

diff --git a/libbirdfont/BirdFontPart.vala b/libbirdfont/BirdFontPart.valaindex 2495ba2..2fceb0a 100644--- a/libbirdfont/BirdFontPart.vala+++ b/libbirdfont/BirdFontPart.vala@@ -12,7 +12,7 @@     Lesser General Public License for more details. */ -using Git;+// FIXME: using Git;  namespace BirdFont { @@ -25,10 +25,10 @@ namespace BirdFont {  */ public class BirdFontPart : GLib.Object{ 	Font font;-	List<string> parts;+	Gee.ArrayList<string> parts; 	string root_directory;-	Index git_index;-	Repository? git_repository;+	// Index git_index;+	// Repository? git_repository;  	static string FILE_ATTRIBUTES = "standard::*"; @@ -36,13 +36,13 @@ public class BirdFontPart : GLib.Object{  	public BirdFontPart (Font font) {	 		this.font = font;-		parts = new List<string> ();+		parts = new Gee.ArrayList<string> (); 		root_directory = ""; 	}  	public static void git_init () { 		if (!running_git) {-			Git.Threads.init ();+// FIXME: 			Git.Threads.init (); 		} 		 		running_git = true;@@ -50,7 +50,7 @@ public class BirdFontPart : GLib.Object{  	public static void git_shutdown () { 		if (running_git) {-			Git.Threads.shutdown ();+// FIXME: 			Git.Threads.shutdown (); 		} 		 		running_git = false;@@ -95,6 +95,8 @@ public class BirdFontPart : GLib.Object{ 	} 	 	bool create_git_repository () {+		// FIXME: +		/* 		File root = File.new_for_path (root_directory); 		File git = root.get_child (".git"); 		Repository repo;@@ -111,9 +113,9 @@ public class BirdFontPart : GLib.Object{ 			return false; 		} 					-		((!) git_repository).get_index (out git_index);--		return true;;+		// FIXME: ((!) git_repository).get_index (out git_index);+*/+		return true; 	} 	 	public bool save () {@@ -123,11 +125,11 @@ public class BirdFontPart : GLib.Object{ 		string file_name; 		string glyph_dir_name; 		File glyph_file;-		Signature? sig;-		object_id id;-		Git.Tree tree;+// FIXME: 		Signature? sig;+// FIXME: 		object_id id;+// FIXME: 		Git.Tree tree; 		int nparents;-		Git.Commit[] parents;+// FIXME: 		Git.Commit[] parents; 		 		if (root_directory == "") { 			warning ("No directory is created for this birdfont part.");@@ -140,8 +142,8 @@ public class BirdFontPart : GLib.Object{ 			return false; 		} 		-		return_val_if_fail (!is_null (git_repository), false);-		+		// FIXME: return_val_if_fail (!is_null (git_repository), false);+		/* 		if (git_index.write_tree (out id) != Git.Error.OK) { 			warning ("write_tree failed"); 			error = true;@@ -258,7 +260,7 @@ public class BirdFontPart : GLib.Object{ 		} 		 		git_shutdown ();-		+		*/ 		return !error; 	} @@ -424,7 +426,7 @@ public class BirdFontPart : GLib.Object{ 				find_parts ((!) ((!) start.get_child (name)).get_path ()); 			} else if (name.has_suffix (".bfp")) { 				found = start.get_child (name);-				parts.append ((!) found.get_path ());+				parts.add ((!) found.get_path ()); 			} 		} 	}@@ -519,7 +521,7 @@ public class BirdFontPart : GLib.Object{ 			git_path = name; 		} 		-		git_index.add_path (git_path);+		// FIXME: git_index.add_path (git_path); 		 		return os; 	}diff --git a/libbirdfont/SearchPaths.vala b/libbirdfont/SearchPaths.valaindex df1380f..ef2c504 100644--- a/libbirdfont/SearchPaths.vala+++ b/libbirdfont/SearchPaths.vala@@ -81,6 +81,14 @@ public class SearchPaths { 		 	public static string get_locale_directory () { 		string f = "";+		string resources;++		resources = (is_null (resources_folder)) ? "" : resources_folder; ++		f = resources + "\\locale\\sv\\LC_MESSAGES\\birdfont.mo";+		if (exists (f)) {+			return resources + "\\Contents\\Resources\\locale";+		} 		 		f = BirdFont.exec_path + "/Contents/Resources/locale/sv/LC_MESSAGES/birdfont.mo"; 		if (exists (f)) {@@ -116,7 +124,6 @@ public class SearchPaths { 		return "/usr/share/locale"; 	} - 	public static File get_char_database () { 		File f; 		diff --git a/libbirdfont/SpacingClassTab.vala b/libbirdfont/SpacingClassTab.valaindex 9e5ca9f..0db072b 100644--- a/libbirdfont/SpacingClassTab.vala+++ b/libbirdfont/SpacingClassTab.vala@@ -65,7 +65,7 @@ public class SpacingClassTab : FontDisplay { 		} 		 		connections.sort ((a, b) => {-			return strcmp (a, b);+			return strcmp ((string) a, (string) b); 		}); 	} diff --git a/scripts/build.py b/scripts/build.pyindex a7a234a..42b7c64 100644--- a/scripts/build.py+++ b/scripts/build.py@@ -47,8 +47,8 @@ def libbirdfont(prefix, cc, cflags, ldflags, valac, valaflags, library, nonNull  		--pkg libxml-2.0 \ 		--pkg gio-2.0 \ 		--pkg cairo \-		--pkg gdk-pixbuf-2.0 \-		--pkg libgit2""")+		--pkg gdk-pixbuf-2.0+		""")  	#copy c sources  	run("cp libbirdfont/OpenFontFormat/*.c build/libbirdfont/")@@ -66,7 +66,6 @@ def libbirdfont(prefix, cc, cflags, ldflags, valac, valaflags, library, nonNull  			$(pkg-config --cflags cairo) \ 			$(pkg-config --cflags glib-2.0) \ 			$(pkg-config --cflags gdk-pixbuf-2.0) \-			$(pkg-config --cflags libgit2) \ 			-I ./build/mac/birdfont""") 		run("mv ./*.o build/libbirdfont/ ") @@ -86,7 +85,6 @@ def libbirdfont(prefix, cc, cflags, ldflags, valac, valaflags, library, nonNull  			$(pkg-config --libs cairo) \ 			$(pkg-config --libs glib-2.0) \ 			$(pkg-config --libs gdk-pixbuf-2.0) \-			$(pkg-config --libs libgit2) \ 			-o """ + library) 		run("mv " + library + " build/bin/")