From: Jérémie D. <Ba...@us...> - 2011-03-20 19:53:46
|
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 a414b505a146c51f221aaa54266e42584d4ebc33 (commit) via 1731b5b47d5adf3683718e89626696bad72cbdce (commit) via 838ebbba06f9f20d274c14c0441bed671b6d2656 (commit) from 83c186985a65096c7239b31b96be7dc1d5bef443 (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 a414b505a146c51f221aaa54266e42584d4ebc33 Author: Jérémie Dimino <je...@di...> Date: Sun Mar 20 20:53:16 2011 +0100 [info] remove Krobot_init commit 1731b5b47d5adf3683718e89626696bad72cbdce Author: Jérémie Dimino <je...@di...> Date: Sun Mar 20 12:30:20 2011 +0100 [info] install the D-Bus configuration file commit 838ebbba06f9f20d274c14c0441bed671b6d2656 Author: Jérémie Dimino <je...@di...> Date: Sun Mar 20 20:48:58 2011 +0100 [info] merge ----------------------------------------------------------------------- Changes: diff --git a/info/control2011/_oasis b/info/control2011/_oasis index 93f2fed..3d6033b 100644 --- a/info/control2011/_oasis +++ b/info/control2011/_oasis @@ -13,6 +13,7 @@ BuildTools: ocamlbuild Plugins: DevFiles (0.2), META (0.2) Synopsis: [Kro]bot Description: Control program for the Eurobot robotic cup. +FilesAB: src/driver/bus.conf.ab # +-------------------------------------------------------------------+ # | Libraries | @@ -29,8 +30,7 @@ Library krobot Krobot_can, Krobot_bus, Krobot_message, - Krobot_service, - Krobot_init + Krobot_service Library "krobot-can" FindlibName: can @@ -64,6 +64,7 @@ Executable "krobot-driver" CompiledObject: best MainIs: krobot_driver.ml BuildDepends: krobot.can, lwt.syntax + DataFiles: bus.conf # +-------------------------------------------------------------------+ # | Tools | @@ -111,6 +112,7 @@ Executable "krobot-plot" MainIs: krobot_plot.ml BuildDepends: krobot, lwt.syntax, cairo.lablgtk2, lwt.glib, threads + # +-------------------------------------------------------------------+ # | Examples | # +-------------------------------------------------------------------+ diff --git a/info/control2011/krobot-api.odocl b/info/control2011/krobot-api.odocl index c80c72a..f4916e1 100644 --- a/info/control2011/krobot-api.odocl +++ b/info/control2011/krobot-api.odocl @@ -1,9 +1,8 @@ # OASIS_START -# DO NOT EDIT (digest: 979bfe64930f512bd800c4336aa992aa) +# DO NOT EDIT (digest: 0d5bc1930a2026d83d7053264b79ba8f) src/lib/Krobot_can src/lib/Krobot_bus src/lib/Krobot_message src/lib/Krobot_service -src/lib/Krobot_init src/can/Krobot_can_bus # OASIS_STOP diff --git a/info/control2011/setup.ml b/info/control2011/setup.ml index 523013d..b2af3c8 100644 --- a/info/control2011/setup.ml +++ b/info/control2011/setup.ml @@ -1,9 +1,9 @@ (* setup.ml generated for the first time by OASIS v0.2.0~alpha1 *) (* OASIS_START *) -(* DO NOT EDIT (digest: c9d539f09d0003ab7eefa01ee368b5d6) *) +(* DO NOT EDIT (digest: 80867cfdd6884c39f5a6799ecb9f747d) *) (* - Regenerated by OASIS v0.2.0 + Regenerated by OASIS v0.2.0~alpha1 Visit http://oasis.forge.ocamlcore.org for more information and documentation about functions used in this file. *) @@ -5039,7 +5039,7 @@ let setup_t = pre_command = [(OASISExpr.EBool true, None)]; post_command = [(OASISExpr.EBool true, None)]; }; - files_ab = []; + files_ab = ["src/driver/bus.conf.ab"]; sections = [ Library @@ -5105,8 +5105,7 @@ let setup_t = "Krobot_can"; "Krobot_bus"; "Krobot_message"; - "Krobot_service"; - "Krobot_init" + "Krobot_service" ]; lib_internal_modules = []; lib_findlib_parent = None; @@ -5233,7 +5232,7 @@ let setup_t = ]; bs_build_tools = [ExternalTool "ocamlbuild"]; bs_c_sources = []; - bs_data_files = []; + bs_data_files = [("bus.conf", None)]; bs_ccopt = [(OASISExpr.EBool true, [])]; bs_cclib = [(OASISExpr.EBool true, [])]; bs_dlllib = [(OASISExpr.EBool true, [])]; @@ -5413,7 +5412,7 @@ let setup_t = schema_data = PropList.Data.create (); plugin_data = []; }; - version = "0.2.0"; + version = "0.2.0~alpha1"; };; let setup () = BaseSetup.setup setup_t;; diff --git a/info/control2011/src/driver/bus.conf.ab b/info/control2011/src/driver/bus.conf.ab new file mode 100644 index 0000000..ae988d4 --- /dev/null +++ b/info/control2011/src/driver/bus.conf.ab @@ -0,0 +1 |