Menu
▾
▴
[Krobot-commits] [SCM] krobot branch, master, updated. f899b5a05ceb8f1181ca877a1cdf16a9dae90a6a
|
From: Jérémie D. <Ba...@us...> - 2011-03-29 21:47:24
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "krobot".
The branch, master has been updated
via f899b5a05ceb8f1181ca877a1cdf16a9dae90a6a (commit)
via baba502bff9b9ba9a1a93ea54bc3fc068b299610 (commit)
from 0db0f51619bea9184177ca44eda4366ae6d22488 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f899b5a05ceb8f1181ca877a1cdf16a9dae90a6a
Author: Jérémie Dimino <je...@di...>
Date: Tue Mar 29 23:22:58 2011 +0200
[info] typo (request were sent two times)
commit baba502bff9b9ba9a1a93ea54bc3fc068b299610
Author: [Kro]bot <kr...@wa...>
Date: Tue Mar 29 22:23:40 2011 +0200
[info] allow to disable the compilation of GTK programs
-----------------------------------------------------------------------
Changes:
diff --git a/info/control2011/_oasis b/info/control2011/_oasis
index 710ebee..450a1bc 100644
--- a/info/control2011/_oasis
+++ b/info/control2011/_oasis
@@ -16,6 +16,14 @@ Description: Control program for the Eurobot robotic cup.
FilesAB: src/driver/bus.conf.ab
# +-------------------------------------------------------------------+
+# | Flags |
+# +-------------------------------------------------------------------+
+
+Flag gtk
+ Description: Enable GTK programs
+ Default: true
+
+# +-------------------------------------------------------------------+
# | Libraries |
# +-------------------------------------------------------------------+
@@ -115,14 +123,16 @@ Executable "krobot-local"
Executable "krobot-plot"
Path: src/tools
- Install: true
+ Build$: flag(gtk)
+ Install$: flag(gtk)
CompiledObject: best
MainIs: krobot_plot.ml
BuildDepends: krobot, lwt.syntax, cairo.lablgtk2, lwt.glib, threads
Executable "krobot-viewer"
Path: src/tools
- Install: true
+ Build$: flag(gtk)
+ Install$: flag(gtk)
CompiledObject: best
MainIs: krobot_viewer.ml
BuildDepends: krobot, lwt.syntax, cairo.lablgtk2, lwt.glib, threads, lablgtk2.glade
diff --git a/info/control2011/myocamlbuild.ml b/info/control2011/myocamlbuild.ml
index 08cc900..58c15ed 100644
--- a/info/control2011/myocamlbuild.ml
+++ b/info/control2011/myocamlbuild.ml
@@ -1,7 +1,7 @@
(* OASIS_START *)
-(* DO NOT EDIT (digest: 570b31c8f48685aca9662d28e560f425) *)
+(* DO NOT EDIT (digest: 7b180d572761c507057af7fdf11b0222) *)
module OASISGettext = struct
-# 21 "/home/dim/sources/oasis/src/oasis/OASISGettext.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/oasis/OASISGettext.ml"
let ns_ str =
str
@@ -24,7 +24,7 @@ module OASISGettext = struct
end
module OASISExpr = struct
-# 21 "/home/dim/sources/oasis/src/oasis/OASISExpr.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/oasis/OASISExpr.ml"
@@ -115,7 +115,7 @@ end
module BaseEnvLight = struct
-# 21 "/home/dim/sources/oasis/src/base/BaseEnvLight.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/base/BaseEnvLight.ml"
module MapString = Map.Make(String)
@@ -212,7 +212,7 @@ end
module MyOCamlbuildFindlib = struct
-# 21 "/home/dim/sources/oasis/src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml"
(** OCamlbuild extension, copied from
* http://brion.inria.fr/gallium/index.php/Using_ocamlfind_with_ocamlbuild
@@ -320,7 +320,7 @@ module MyOCamlbuildFindlib = struct
end
module MyOCamlbuildBase = struct
-# 21 "/home/dim/sources/oasis/src/plugins/ocamlbuild/MyOCamlbuildBase.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/plugins/ocamlbuild/MyOCamlbuildBase.ml"
(** Base functions for writing myocamlbuild.ml
@author Sylvain Le Gall
@@ -335,7 +335,7 @@ module MyOCamlbuildBase = struct
type name = string
type tag = string
-# 55 "/home/dim/sources/oasis/src/plugins/ocamlbuild/MyOCamlbuildBase.ml"
+# 55 "/home/krobot/ocaml-stuff/oasis/src/plugins/ocamlbuild/MyOCamlbuildBase.ml"
type t =
{
diff --git a/info/control2011/setup.ml b/info/control2011/setup.ml
index 6f7ed53..3f22dfe 100644
--- a/info/control2011/setup.ml
+++ b/info/control2011/setup.ml
@@ -1,14 +1,14 @@
(* setup.ml generated for the first time by OASIS v0.2.0~alpha1 *)
(* OASIS_START *)
-(* DO NOT EDIT (digest: 4353dde9f1283d0e97c3df83edda68fd) *)
+(* DO NOT EDIT (digest: e7a994aa7e43385f1fc743e7a7663a49) *)
(*
Regenerated by OASIS v0.2.0
Visit http://oasis.forge.ocamlcore.org for more information and
documentation about functions used in this file.
*)
module OASISGettext = struct
-# 21 "/home/dim/sources/oasis/src/oasis/OASISGettext.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/oasis/OASISGettext.ml"
let ns_ str =
str
@@ -31,7 +31,7 @@ module OASISGettext = struct
end
module OASISContext = struct
-# 21 "/home/dim/sources/oasis/src/oasis/OASISContext.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/oasis/OASISContext.ml"
open OASISGettext
@@ -90,7 +90,7 @@ module OASISContext = struct
end
module OASISUtils = struct
-# 21 "/home/dim/sources/oasis/src/oasis/OASISUtils.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/oasis/OASISUtils.ml"
module MapString = Map.Make(String)
@@ -242,7 +242,7 @@ module OASISUtils = struct
end
module PropList = struct
-# 21 "/home/dim/sources/oasis/src/oasis/PropList.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/oasis/PropList.ml"
open OASISGettext
@@ -277,7 +277,7 @@ module PropList = struct
let clear t =
Hashtbl.clear t
-# 59 "/home/dim/sources/oasis/src/oasis/PropList.ml"
+# 59 "/home/krobot/ocaml-stuff/oasis/src/oasis/PropList.ml"
end
module Schema =
@@ -518,7 +518,7 @@ module PropList = struct
end
module OASISMessage = struct
-# 21 "/home/dim/sources/oasis/src/oasis/OASISMessage.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/oasis/OASISMessage.ml"
open OASISGettext
@@ -567,7 +567,7 @@ module OASISMessage = struct
end
module OASISVersion = struct
-# 21 "/home/dim/sources/oasis/src/oasis/OASISVersion.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/oasis/OASISVersion.ml"
open OASISGettext
@@ -751,7 +751,7 @@ module OASISVersion = struct
end
module OASISLicense = struct
-# 21 "/home/dim/sources/oasis/src/oasis/OASISLicense.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/oasis/OASISLicense.ml"
(** License for _oasis fields
@author Sylvain Le Gall
@@ -784,7 +784,7 @@ module OASISLicense = struct
end
module OASISExpr = struct
-# 21 "/home/dim/sources/oasis/src/oasis/OASISExpr.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/oasis/OASISExpr.ml"
@@ -874,7 +874,7 @@ module OASISExpr = struct
end
module OASISTypes = struct
-# 21 "/home/dim/sources/oasis/src/oasis/OASISTypes.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/oasis/OASISTypes.ml"
@@ -951,7 +951,7 @@ module OASISTypes = struct
type plugin_data = (all_plugin * plugin_data_purpose * (unit -> unit)) list
-# 102 "/home/dim/sources/oasis/src/oasis/OASISTypes.ml"
+# 102 "/home/krobot/ocaml-stuff/oasis/src/oasis/OASISTypes.ml"
type 'a conditional = 'a OASISExpr.choices
@@ -1105,7 +1105,7 @@ module OASISTypes = struct
end
module OASISUnixPath = struct
-# 21 "/home/dim/sources/oasis/src/oasis/OASISUnixPath.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/oasis/OASISUnixPath.ml"
type unix_filename = string
type unix_dirname = string
@@ -1184,7 +1184,7 @@ module OASISUnixPath = struct
end
module OASISSection = struct
-# 21 "/home/dim/sources/oasis/src/oasis/OASISSection.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/oasis/OASISSection.ml"
(** Manipulate section
@author Sylvain Le Gall
@@ -1246,12 +1246,12 @@ module OASISSection = struct
end
module OASISBuildSection = struct
-# 21 "/home/dim/sources/oasis/src/oasis/OASISBuildSection.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/oasis/OASISBuildSection.ml"
end
module OASISExecutable = struct
-# 21 "/home/dim/sources/oasis/src/oasis/OASISExecutable.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/oasis/OASISExecutable.ml"
open OASISTypes
@@ -1282,7 +1282,7 @@ module OASISExecutable = struct
end
module OASISLibrary = struct
-# 21 "/home/dim/sources/oasis/src/oasis/OASISLibrary.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/oasis/OASISLibrary.ml"
open OASISTypes
open OASISUtils
@@ -1573,33 +1573,33 @@ module OASISLibrary = struct
end
module OASISFlag = struct
-# 21 "/home/dim/sources/oasis/src/oasis/OASISFlag.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/oasis/OASISFlag.ml"
end
module OASISPackage = struct
-# 21 "/home/dim/sources/oasis/src/oasis/OASISPackage.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/oasis/OASISPackage.ml"
end
module OASISSourceRepository = struct
-# 21 "/home/dim/sources/oasis/src/oasis/OASISSourceRepository.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/oasis/OASISSourceRepository.ml"
end
module OASISTest = struct
-# 21 "/home/dim/sources/oasis/src/oasis/OASISTest.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/oasis/OASISTest.ml"
end
module OASISDocument = struct
-# 21 "/home/dim/sources/oasis/src/oasis/OASISDocument.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/oasis/OASISDocument.ml"
end
module BaseEnvLight = struct
-# 21 "/home/dim/sources/oasis/src/base/BaseEnvLight.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/base/BaseEnvLight.ml"
module MapString = Map.Make(String)
@@ -1696,7 +1696,7 @@ end
module BaseContext = struct
-# 21 "/home/dim/sources/oasis/src/base/BaseContext.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/base/BaseContext.ml"
open OASISContext
@@ -1707,7 +1707,7 @@ module BaseContext = struct
end
module BaseMessage = struct
-# 21 "/home/dim/sources/oasis/src/base/BaseMessage.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/base/BaseMessage.ml"
(** Message to user, overrid for Base
@author Sylvain Le Gall
@@ -1728,7 +1728,7 @@ module BaseMessage = struct
end
module BaseFilePath = struct
-# 21 "/home/dim/sources/oasis/src/base/BaseFilePath.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/base/BaseFilePath.ml"
open Filename
@@ -1760,7 +1760,7 @@ module BaseFilePath = struct
end
module BaseEnv = struct
-# 21 "/home/dim/sources/oasis/src/base/BaseEnv.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/base/BaseEnv.ml"
open OASISTypes
open OASISGettext
@@ -2219,7 +2219,7 @@ module BaseEnv = struct
end
module BaseExec = struct
-# 21 "/home/dim/sources/oasis/src/base/BaseExec.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/base/BaseExec.ml"
open OASISGettext
open OASISUtils
@@ -2279,7 +2279,7 @@ module BaseExec = struct
end
module BaseFileUtil = struct
-# 21 "/home/dim/sources/oasis/src/base/BaseFileUtil.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/base/BaseFileUtil.ml"
open OASISGettext
@@ -2457,7 +2457,7 @@ module BaseFileUtil = struct
end
module BaseArgExt = struct
-# 21 "/home/dim/sources/oasis/src/base/BaseArgExt.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/base/BaseArgExt.ml"
open OASISUtils
open OASISGettext
@@ -2485,7 +2485,7 @@ module BaseArgExt = struct
end
module BaseCheck = struct
-# 21 "/home/dim/sources/oasis/src/base/BaseCheck.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/base/BaseCheck.ml"
open BaseEnv
open BaseMessage
@@ -2611,7 +2611,7 @@ module BaseCheck = struct
end
module BaseOCamlcConfig = struct
-# 21 "/home/dim/sources/oasis/src/base/BaseOCamlcConfig.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/base/BaseOCamlcConfig.ml"
open BaseEnv
@@ -2713,7 +2713,7 @@ module BaseOCamlcConfig = struct
end
module BaseStandardVar = struct
-# 21 "/home/dim/sources/oasis/src/base/BaseStandardVar.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/base/BaseStandardVar.ml"
open OASISGettext
@@ -2973,7 +2973,7 @@ module BaseStandardVar = struct
end
module BaseFileAB = struct
-# 21 "/home/dim/sources/oasis/src/base/BaseFileAB.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/base/BaseFileAB.ml"
open BaseEnv
open OASISGettext
@@ -3021,7 +3021,7 @@ module BaseFileAB = struct
end
module BaseLog = struct
-# 21 "/home/dim/sources/oasis/src/base/BaseLog.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/base/BaseLog.ml"
open OASISUtils
@@ -3140,7 +3140,7 @@ module BaseLog = struct
end
module BaseBuilt = struct
-# 21 "/home/dim/sources/oasis/src/base/BaseBuilt.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/base/BaseBuilt.ml"
open OASISTypes
open OASISGettext
@@ -3287,7 +3287,7 @@ module BaseBuilt = struct
end
module BaseCustom = struct
-# 21 "/home/dim/sources/oasis/src/base/BaseCustom.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/base/BaseCustom.ml"
open BaseEnv
open BaseMessage
@@ -3337,7 +3337,7 @@ module BaseCustom = struct
end
module BaseDynVar = struct
-# 21 "/home/dim/sources/oasis/src/base/BaseDynVar.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/base/BaseDynVar.ml"
open OASISTypes
@@ -3381,7 +3381,7 @@ module BaseDynVar = struct
end
module BaseTest = struct
-# 21 "/home/dim/sources/oasis/src/base/BaseTest.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/base/BaseTest.ml"
open BaseEnv
open BaseMessage
@@ -3463,7 +3463,7 @@ module BaseTest = struct
end
module BaseDoc = struct
-# 21 "/home/dim/sources/oasis/src/base/BaseDoc.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/base/BaseDoc.ml"
open BaseEnv
open BaseMessage
@@ -3493,7 +3493,7 @@ module BaseDoc = struct
end
module BaseSetup = struct
-# 21 "/home/dim/sources/oasis/src/base/BaseSetup.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/base/BaseSetup.ml"
open BaseEnv
open BaseMessage
@@ -3911,7 +3911,7 @@ module BaseSetup = struct
end
module BaseDev = struct
-# 21 "/home/dim/sources/oasis/src/base/BaseDev.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/base/BaseDev.ml"
@@ -3969,7 +3969,7 @@ end
module InternalConfigurePlugin = struct
-# 21 "/home/dim/sources/oasis/src/plugins/internal/InternalConfigurePlugin.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/plugins/internal/InternalConfigurePlugin.ml"
(** Configure using internal scheme
@author Sylvain Le Gall
@@ -4185,7 +4185,7 @@ module InternalConfigurePlugin = struct
end
module InternalInstallPlugin = struct
-# 21 "/home/dim/sources/oasis/src/plugins/internal/InternalInstallPlugin.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/plugins/internal/InternalInstallPlugin.ml"
(** Install using internal scheme
@author Sylvain Le Gall
@@ -4584,7 +4584,7 @@ end
module OCamlbuildCommon = struct
-# 21 "/home/dim/sources/oasis/src/plugins/ocamlbuild/OCamlbuildCommon.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/plugins/ocamlbuild/OCamlbuildCommon.ml"
(** Functions common to OCamlbuild build and doc plugin
*)
@@ -4684,7 +4684,7 @@ module OCamlbuildCommon = struct
end
module OCamlbuildPlugin = struct
-# 21 "/home/dim/sources/oasis/src/plugins/ocamlbuild/OCamlbuildPlugin.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/plugins/ocamlbuild/OCamlbuildPlugin.ml"
(** Build using ocamlbuild
@author Sylvain Le Gall
@@ -4928,7 +4928,7 @@ module OCamlbuildPlugin = struct
end
module OCamlbuildDocPlugin = struct
-# 21 "/home/dim/sources/oasis/src/plugins/ocamlbuild/OCamlbuildDocPlugin.ml"
+# 21 "/home/krobot/ocaml-stuff/oasis/src/plugins/ocamlbuild/OCamlbuildDocPlugin.ml"
(* Create documentation using ocamlbuild .odocl files
@author Sylvain Le Gall
@@ -5289,8 +5289,16 @@ let setup_t =
cs_plugin_data = [];
},
{
- bs_build = [(OASISExpr.EBool true, true)];
- bs_install = [(OASISExpr.EBool true, true)];
+ bs_build =
+ [
+ (OASISExpr.EBool true, false);
+ (OASISExpr.EFlag "gtk", true)
+ ];
+ bs_install =
+ [
+ (OASISExpr.EBool true, false);
+ (OASISExpr.EFlag "gtk", true)
+ ];
bs_path = "src/tools";
bs_compiled_object = Best;
bs_build_depends =
@@ -5340,6 +5348,16 @@ let setup_t =
bs_nativeopt = [(OASISExpr.EBool true, [])];
},
{exec_custom = false; exec_main_is = "send_can.ml"; });
+ Flag
+ ({
+ cs_name = "gtk";
+ cs_data = PropList.Data.create ();
+ cs_plugin_data = [];
+ },
+ {
+ flag_description = Some "Enable GTK programs";
+ flag_default = [(OASISExpr.EBool true, true)];
+ });
Executable
({
cs_name = "krobot-remote";
@@ -5482,8 +5500,16 @@ let setup_t =
cs_plugin_data = [];
},
{
- bs_build = [(OASISExpr.EBool true, true)];
- bs_install = [(OASISExpr.EBool true, true)];
+ bs_build =
+ [
+ (OASISExpr.EBool true, false);
+ (OASISExpr.EFlag "gtk", true)
+ ];
+ bs_install =
+ [
+ (OASISExpr.EBool true, false);
+ (OASISExpr.EFlag "gtk", true)
+ ];
bs_path = "src/tools";
bs_compiled_object = Best;
bs_build_depends =
diff --git a/info/control2011/src/lib/krobot_message.ml b/info/control2011/src/lib/krobot_message.ml
index c0a5414..aff2580 100644
--- a/info/control2011/src/lib/krobot_message.ml
+++ b/info/control2011/src/lib/krobot_message.ml
@@ -233,7 +233,6 @@ let send_and_recv bus req f =
| None -> None)
(recv bus))
in
- lwt () = send bus (Unix.gettimeofday (), Req_motor_status) in
let rec loop () =
lwt () = send bus (Unix.gettimeofday (), req) in
match_lwt choose [t; Lwt_unix.sleep wait_timeout >|= fun () -> `Timeout] with
hooks/post-receive
--
krobot
|
