summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLauri Aarnio <Lauri.Aarnio@iki.fi>2009-03-20 12:31:06 +0200
committerLauri Leukkunen <lle@rahina.org>2009-03-23 01:37:48 +0200
commitee12d82a51bf7f22ab359c5449488ae672767d12 (patch)
tree73cace48117f62ddf8f4ed66be791c6b6a2f98c4
parent0e70f99a714d39f52583ad3dce42ce2f5523d8d7 (diff)
Interface version numbers were incremented
- Both the C <-> Lua and the rule file interfaces were changed by a previous patch ("l10n: message catalogs are now mapped based on active exec policy"), but the interface numbers were not changed, this commit fixes that
-rw-r--r--include/sb2.h4
-rw-r--r--lua_scripts/main.lua5
-rw-r--r--lua_scripts/mapping.lua4
-rw-r--r--lua_scripts/pathmaps/devel/00_default.lua2
-rw-r--r--lua_scripts/pathmaps/emulate/00_default.lua2
-rw-r--r--lua_scripts/pathmaps/install/00_default.lua2
-rw-r--r--lua_scripts/pathmaps/maemo_simple/00_default.lua2
-rw-r--r--lua_scripts/pathmaps/simple/00_default.lua2
-rw-r--r--lua_scripts/pathmaps/tools/00_default.lua2
9 files changed, 14 insertions, 11 deletions
diff --git a/include/sb2.h b/include/sb2.h
index 119a2d0..cc63176 100644
--- a/include/sb2.h
+++ b/include/sb2.h
@@ -52,10 +52,12 @@ struct lua_instance {
* - added execve_map_script_interpreter()
* * Differences between "62" and "61"
* - added sb.test_if_listed_in_envvar()
+ * * Differences between "63" and "62"
+ * - sb_find_exec_policy() has been removed.
*
* NOTE: the corresponding identifier for Lua is in lua_scripts/main.lua
*/
-#define SB2_LUA_C_INTERFACE_VERSION "62"
+#define SB2_LUA_C_INTERFACE_VERSION "63"
extern struct lua_instance *get_lua(void);
extern void release_lua(struct lua_instance *ptr);
diff --git a/lua_scripts/main.lua b/lua_scripts/main.lua
index f338386..d45dad4 100644
--- a/lua_scripts/main.lua
+++ b/lua_scripts/main.lua
@@ -10,12 +10,11 @@ debug_messages_enabled = sb.debug_messages_enabled()
-- This version string is used to check that the lua scripts offer
-- what the C files expect, and v.v.
--- Increment the serial number (first number) and update the initials
--- and date whenever the interface beween Lua and C is changed.
+-- Increment the number whenever the interface beween Lua and C is changed.
--
-- NOTE: the corresponding identifier for C is in include/sb2.h,
-- see that file for description about differences
-sb2_lua_c_interface_version = "62"
+sb2_lua_c_interface_version = "63"
function do_file(filename)
if (debug_messages_enabled) then
diff --git a/lua_scripts/mapping.lua b/lua_scripts/mapping.lua
index 8052030..a8dd3c2 100644
--- a/lua_scripts/mapping.lua
+++ b/lua_scripts/mapping.lua
@@ -135,6 +135,8 @@ function load_and_check_rules()
-- exec mapping code (argvenp.lua) and the
-- rule files:
--
+ -- Version 21: native_app_message_catalog_prefix has
+ -- been removed (it was an exec policy attribute.)
-- Version 20 changed "script_interpreter_rule" field in
-- exec policies to "script_interpreter_rules"; find_rule()
-- is now used to select the rule (there may be more than one!)
@@ -154,7 +156,7 @@ function load_and_check_rules()
-- (previously only one was expected)
-- - variables "esc_tools_root" and "esc_target_root"
-- were removed
- local current_rule_interface_version = "20"
+ local current_rule_interface_version = "21"
do_file(rule_file_path)
diff --git a/lua_scripts/pathmaps/devel/00_default.lua b/lua_scripts/pathmaps/devel/00_default.lua
index aabeee2..4ab0830 100644
--- a/lua_scripts/pathmaps/devel/00_default.lua
+++ b/lua_scripts/pathmaps/devel/00_default.lua
@@ -8,7 +8,7 @@
-- Rule file interface version, mandatory.
--
-rule_file_interface_version = "20"
+rule_file_interface_version = "21"
----------------------------------
tools = tools_root
diff --git a/lua_scripts/pathmaps/emulate/00_default.lua b/lua_scripts/pathmaps/emulate/00_default.lua
index f22a1c4..55f3eda 100644
--- a/lua_scripts/pathmaps/emulate/00_default.lua
+++ b/lua_scripts/pathmaps/emulate/00_default.lua
@@ -3,7 +3,7 @@
-- Rule file interface version, mandatory.
--
-rule_file_interface_version = "20"
+rule_file_interface_version = "21"
----------------------------------
sb1_compat_dir = sbox_target_root .. "/scratchbox1-compat"
diff --git a/lua_scripts/pathmaps/install/00_default.lua b/lua_scripts/pathmaps/install/00_default.lua
index 38afa23..93f978a 100644
--- a/lua_scripts/pathmaps/install/00_default.lua
+++ b/lua_scripts/pathmaps/install/00_default.lua
@@ -4,7 +4,7 @@
-- Rule file interface version, mandatory.
--
-rule_file_interface_version = "20"
+rule_file_interface_version = "21"
----------------------------------
if (tools_root and tools_root ~= "/") then
diff --git a/lua_scripts/pathmaps/maemo_simple/00_default.lua b/lua_scripts/pathmaps/maemo_simple/00_default.lua
index 6102e0d..5eda6f6 100644
--- a/lua_scripts/pathmaps/maemo_simple/00_default.lua
+++ b/lua_scripts/pathmaps/maemo_simple/00_default.lua
@@ -7,7 +7,7 @@
-- Rule file interface version, mandatory.
--
-rule_file_interface_version = "20"
+rule_file_interface_version = "21"
----------------------------------
tools = tools_root
diff --git a/lua_scripts/pathmaps/simple/00_default.lua b/lua_scripts/pathmaps/simple/00_default.lua
index e5dac6a..a1f6cee 100644
--- a/lua_scripts/pathmaps/simple/00_default.lua
+++ b/lua_scripts/pathmaps/simple/00_default.lua
@@ -7,7 +7,7 @@
-- Rule file interface version, mandatory.
--
-rule_file_interface_version = "20"
+rule_file_interface_version = "21"
----------------------------------
tools = tools_root
diff --git a/lua_scripts/pathmaps/tools/00_default.lua b/lua_scripts/pathmaps/tools/00_default.lua
index 2f5569f..229f9d7 100644
--- a/lua_scripts/pathmaps/tools/00_default.lua
+++ b/lua_scripts/pathmaps/tools/00_default.lua
@@ -6,7 +6,7 @@
-- Rule file interface version, mandatory.
--
-rule_file_interface_version = "20"
+rule_file_interface_version = "21"
----------------------------------
tools = tools_root