Merge lp:~ivaldi/midori/midori-database-get-os into lp:midori

[André Stösel]

new sqlite function "midori_get_os()"

[André Stösel (ivaldi)]

I need this function in order to change the extension name (.so|.dll) based on the os.
(In flummi Update$.sql files.)

[André Stösel (ivaldi)]

example use case is something like this:

INSERT INTO tasks (command) VALUES (CASE WHEN midori_get_os() == 'linux' THEN 'libcolorful-tabs.so=true' ELSE 'libcolorful-tabs.dll=true' END);

[Cris Dywan (kalikiana)]

I feel this bleeds too much logic which will have to be adjusted in all occurences if other os values or extensions come up. Either we need to eliminate the need for the extension or we should have function of the sort expand_filename(foo) that contains the logic.

review: Needs Fixing

[Olivier Duchateau (duchateau-olivier)]

Currently BSD systems are not supported, beside they also use dynamics libs.

Why lets CMake detect system host. There're UNIX, WIN32 and APPLE variables.

Unmerged revisions

6515. By André Stösel on 2013-12-10

new sqlite function "midori_get_os()"

=== modified file 'midori/midori-database.vala'
--- midori/midori-database.vala	2013-12-10 21:51:01 +0000
+++ midori/midori-database.vala	2013-12-10 23:29:57 +0000
@@ -158,6 +158,8 @@
                 db.exec ("PRAGMA synchronous = NORMAL; PRAGMA temp_store = MEMORY;");
             db.exec ("PRAGMA count_changes = OFF;");
 
+            db.create_function ("midori_get_os", 0, Sqlite.UTF8, null, SqliteHelper.get_os, null, null);
+
             int64 user_version;
             Sqlite.Statement stmt;
             if (db.prepare_v2 ("PRAGMA user_version;", -1, out stmt, null) != Sqlite.OK)
@@ -239,4 +241,15 @@
             return statement;
         }
     }
+
+    namespace SqliteHelper {
+        internal static void get_os (Sqlite.Context context, Sqlite.Value[] values) {
+            #if HAVE_WIN32
+            string os = "win";
+            #else
+            string os = "linux";
+            #endif
+            context.result_text (os);
+        }
+    }
 }