[Pkg-ocaml-maint-commits] [marionnet] 15/19: New upstream version 0.90.6+bzr508
Lucas Nussbaum
lucas at moszumanska.debian.org
Mon Oct 30 22:28:55 UTC 2017
This is an automated email from the git hooks/post-receive script.
lucas pushed a commit to branch master
in repository marionnet.
commit 154c694f87471033312d5a628a004e25139954bd
Author: Lucas Nussbaum <lucas at debian.org>
Date: Mon Oct 30 23:21:08 2017 +0100
New upstream version 0.90.6+bzr508
---
Makefile | 4 +--
Makefile.local | 5 +++-
meta.ml.released | 10 ++++----
po/messages.pot | 74 ++++++++++++++++++++++++++---------------------------
router.ml | 16 +++++++++---
simulation_level.ml | 4 +--
6 files changed, 62 insertions(+), 51 deletions(-)
diff --git a/Makefile b/Makefile
index 6e301ed..e19ca85 100644
--- a/Makefile
+++ b/Makefile
@@ -935,8 +935,8 @@ meta.ml: META CONFIGME
meta.ml.released: meta.ml
if [ -d .bzr ]; then \
- cp $< $@ ; \
- fi
+ cp $< $@; \
+ fi; \
###########################################################################
# Include the project-dependant file (if any) which implements the '-local'
diff --git a/Makefile.local b/Makefile.local
index af2035a..17712db 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -30,7 +30,10 @@ OCAMLBRICKS=$(LIBRARYPREFIX)/ocamlbricks
# Empty for OCaml 3.x.y series, set to "-DOCAML4_02_OR_LATER" for 4.02.y or later:
OCAML4_02_OR_LATER=$(shell if grep -q "^\([5-9]\)\|\(4[.]\([1-9]\|0[2-9]\)\)" <<<"$(OCAML_VERSION)"; then echo "-DOCAML4_02_OR_LATER"; fi)
-PP_OPTION = camlp4of $(OCAML4_02_OR_LATER) -I $(OCAMLBRICKS) gettext_extract_pot_p4.cmo option_extract_p4.cmo raise_p4.cmo log_module_loading_p4.cmo
+# Empty for OCaml 3.x.y series, set to "-DOCAML4_04_OR_LATER" for 4.04.y or later:
+OCAML4_04_OR_LATER=$(shell if grep -q "^\([5-9]\)\|\(4[.]\([1-9]\|0[4-9]\)\)" <<<"$(OCAML_VERSION)"; then echo "-DOCAML4_04_OR_LATER"; fi)
+
+PP_OPTION = camlp4of $(OCAML4_02_OR_LATER) $(OCAML4_04_OR_LATER) -I $(OCAMLBRICKS) gettext_extract_pot_p4.cmo option_extract_p4.cmo raise_p4.cmo log_module_loading_p4.cmo
OBJECTS_TO_LINK = gtkThread
BYTE_PROGRAMS = marionnet.byte
diff --git a/meta.ml.released b/meta.ml.released
index 2adcb56..7cf8a8d 100644
--- a/meta.ml.released
+++ b/meta.ml.released
@@ -11,8 +11,8 @@ let libraryprefix = "/usr/lib/ocaml";;
let configurationprefix = "/etc";;
let localeprefix = "/usr/local/share/locale";;
let documentationprefix = "/usr/local/share/doc";;
-let uname = "Linux 4.9.0-3-amd64 #1 SMP Debian 4.9.30-2+deb9u3 (2017-08-06) x86_64 GNU/Linux";;
-let build_date = "2017-10-09 8:02:20 +0200";;
-let revision = "506";;
-let source_date = "2017-09-22 13:06:28 +0200";;
-let source_date_utc_yy_mm_dd = "2017-09-22";;
+let uname = "Linux 4.9.0-3-amd64 #1 SMP Debian 4.9.30-2+deb9u5 (2017-09-19) x86_64 GNU/Linux";;
+let build_date = "2017-10-30 23:20:42 +0100";;
+let revision = "508";;
+let source_date = "2017-10-30 20:41:49 +0100";;
+let source_date_utc_yy_mm_dd = "2017-10-30";;
diff --git a/po/messages.pot b/po/messages.pot
index 28328df..4b6084d 100644
--- a/po/messages.pot
+++ b/po/messages.pot
@@ -20,7 +20,7 @@ msgid "%s configuration file"
msgstr ""
#. generated by gettext_extract_pot_p4
-#: router.ml:759
+#: router.ml:767
msgid "%s startup config."
msgstr ""
@@ -96,7 +96,7 @@ msgid "ADD OR MODIFY A HUB"
msgstr ""
#. generated by gettext_extract_pot_p4
-#: router.ml:929
+#: router.ml:937
msgid "ADD OR MODIFY A ROUTER"
msgstr ""
@@ -166,7 +166,7 @@ msgid "Add machine"
msgstr ""
#. generated by gettext_extract_pot_p4
-#: router.ml:425
+#: router.ml:433
msgid "Add router"
msgstr ""
@@ -204,7 +204,7 @@ msgid ""
msgstr ""
#. generated by gettext_extract_pot_p4
-#: world_gateway.ml:155
+#: machine.ml:211
msgid ""
"Are you sure that you want to remove %s\n"
"and all the cables connected to this %s?"
@@ -303,7 +303,7 @@ msgid "Check to activate"
msgstr ""
#. generated by gettext_extract_pot_p4
-#: router.ml:716
+#: machine.ml:364
msgid "Check to activate a startup configuration"
msgstr ""
@@ -345,12 +345,12 @@ msgid "Collapse all"
msgstr ""
#. generated by gettext_extract_pot_p4
-#: treeview_documents.ml:268
+#: treeview_history.ml:441
msgid "Comment"
msgstr ""
#. generated by gettext_extract_pot_p4
-#: router.ml:750
+#: router.ml:758
msgid "Configure Quagga's services"
msgstr ""
@@ -460,19 +460,19 @@ msgid "Distance between labels and icons"
msgstr ""
#. generated by gettext_extract_pot_p4
-#: router.ml:653
+#: machine.ml:315
msgid "Distribution"
msgstr ""
#. generated by gettext_extract_pot_p4
-#: router.ml:814
+#: router.ml:822
msgid ""
"Do you want access the router also by a Quagga terminal (CISCO-IOS-like "
"commands)?"
msgstr ""
#. generated by gettext_extract_pot_p4
-#: router.ml:744
+#: router.ml:752
msgid "Do you want access the router also by a Unix terminal?"
msgstr ""
@@ -626,7 +626,7 @@ msgid "From"
msgstr ""
#. generated by gettext_extract_pot_p4
-#: router.ml:693
+#: router.ml:701
msgid "GNU/Linux distribution installed on the router."
msgstr ""
@@ -646,7 +646,7 @@ msgid "Gracefully stop every element of the network"
msgstr ""
#. generated by gettext_extract_pot_p4
-#: gui/gui_menubar_MARIONNET.ml:388
+#: gui/simple_dialogs.ml:44
msgid "Help"
msgstr ""
@@ -678,12 +678,12 @@ msgid "Hub ports number"
msgstr ""
#. generated by gettext_extract_pot_p4
-#: world_gateway.ml:249
+#: treeview_ifconfig.ml:408
msgid "IPv4 address"
msgstr ""
#. generated by gettext_extract_pot_p4
-#: router.ml:674
+#: router.ml:682
msgid "IPv4 configuration of the first router port (0)"
msgstr ""
@@ -875,7 +875,7 @@ msgid ""
msgstr ""
#. generated by gettext_extract_pot_p4
-#: router.ml:930
+#: router.ml:938
msgid ""
"In this dialog window you can define the name of an IP router and set many "
"parameters for it:\n"
@@ -946,7 +946,7 @@ msgid "Information"
msgstr ""
#. generated by gettext_extract_pot_p4
-#: router.ml:697
+#: router.ml:705
msgid ""
"Initial hard disk state. The router will start by default with this variant "
"of the chosen distribution."
@@ -1012,7 +1012,7 @@ msgid "Keep all snapshots when saving (not only the most recent ones)"
msgstr ""
#. generated by gettext_extract_pot_p4
-#: router.ml:655
+#: machine.ml:317
msgid "Kernel"
msgstr ""
@@ -1037,7 +1037,7 @@ msgid "License"
msgstr ""
#. generated by gettext_extract_pot_p4
-#: router.ml:701
+#: router.ml:709
msgid "Linux kernel version used for this router."
msgstr ""
@@ -1141,7 +1141,7 @@ msgid "Modify machine"
msgstr ""
#. generated by gettext_extract_pot_p4
-#: router.ml:473
+#: router.ml:481
msgid "Modify router"
msgstr ""
@@ -1166,7 +1166,7 @@ msgid "Modify world gateway"
msgstr ""
#. generated by gettext_extract_pot_p4
-#: treeview.ml:1668
+#: cable.ml:260
msgid "Name"
msgstr ""
@@ -1221,7 +1221,7 @@ msgid "Number of ethernet cards (eth0, eth1 ...) of the virtual machine"
msgstr ""
#. generated by gettext_extract_pot_p4
-#: router.ml:667
+#: router.ml:675
msgid "Number of router ports"
msgstr ""
@@ -1246,7 +1246,7 @@ msgid "Opening"
msgstr ""
#. generated by gettext_extract_pot_p4
-#: router.ml:681
+#: router.ml:689
msgid ""
"Optional IPv6 configuration of the first router port (0). For instance 2001:"
"db9::ff/32"
@@ -1282,17 +1282,17 @@ msgid "Port"
msgstr ""
#. generated by gettext_extract_pot_p4
-#: router.ml:651
+#: router.ml:659
msgid "Port 0 IPv4 address"
msgstr ""
#. generated by gettext_extract_pot_p4
-#: router.ml:652
+#: router.ml:660
msgid "Port 0 Ipv6 address"
msgstr ""
#. generated by gettext_extract_pot_p4
-#: router.ml:650
+#: hub.ml:196
msgid "Ports number"
msgstr ""
@@ -1362,7 +1362,7 @@ msgid "Reboot"
msgstr ""
#. generated by gettext_extract_pot_p4
-#: gui/gui_toolbar_COMPONENTS_layouts.ml:85
+#: machine.ml:210
msgid "Remove"
msgstr ""
@@ -1402,12 +1402,12 @@ msgid "Reverse an edge"
msgstr ""
#. generated by gettext_extract_pot_p4
-#: router.ml:411
+#: router.ml:419
msgid "Router"
msgstr ""
#. generated by gettext_extract_pot_p4
-#: router.ml:641
+#: router.ml:649
msgid ""
"Router name. This name must be unique in the virtual network. Suggested: R1, "
"R2, ..."
@@ -1439,7 +1439,7 @@ msgid "Second byte of the IPv4 address"
msgstr ""
#. generated by gettext_extract_pot_p4
-#: router.ml:658
+#: router.ml:666
msgid "Services"
msgstr ""
@@ -1449,12 +1449,12 @@ msgid "Should the gateway provide a DHCP service?"
msgstr ""
#. generated by gettext_extract_pot_p4
-#: router.ml:760
+#: router.ml:768
msgid "Show %s terminal"
msgstr ""
#. generated by gettext_extract_pot_p4
-#: router.ml:657
+#: router.ml:665
msgid "Show Unix terminal"
msgstr ""
@@ -1511,7 +1511,7 @@ msgid "Starting"
msgstr ""
#. generated by gettext_extract_pot_p4
-#: router.ml:656
+#: machine.ml:318
msgid "Startup configuration"
msgstr ""
@@ -1555,7 +1555,7 @@ msgid "Surface"
msgstr ""
#. generated by gettext_extract_pot_p4
-#: gui/gui_window_MARIONNET.ml:126
+#: gui/gui_toolbar_COMPONENTS_layouts.ml:122
msgid "Suspend"
msgstr ""
@@ -1826,7 +1826,7 @@ msgid ""
msgstr ""
#. generated by gettext_extract_pot_p4
-#: treeview_defects.ml:347
+#: treeview_ifconfig.ml:378
msgid "Type"
msgstr ""
@@ -1850,7 +1850,7 @@ msgid "Unsatisfied dependency"
msgstr ""
#. generated by gettext_extract_pot_p4
-#: router.ml:654
+#: machine.ml:316
msgid "Variant"
msgstr ""
@@ -1880,7 +1880,7 @@ msgid "Wait please..."
msgstr ""
#. generated by gettext_extract_pot_p4
-#: gui/simple_dialogs.ml:52
+#: gui/talking.ml:82
msgid "Warning"
msgstr ""
@@ -2040,7 +2040,7 @@ msgid "machine"
msgstr ""
#. generated by gettext_extract_pot_p4
-#: router.ml:537
+#: router.ml:545
msgid "router"
msgstr ""
diff --git a/router.ml b/router.ml
index 450f394..ec1240e 100644
--- a/router.ml
+++ b/router.ml
@@ -17,6 +17,14 @@
open Gettext;;
+IFNDEF OCAML4_04_OR_LATER THEN
+let lowercase = String.lowercase
+let uppercase = String.uppercase
+ELSE
+let lowercase = String.lowercase_ascii
+let uppercase = String.uppercase_ascii
+ENDIF
+
(** Gui-related stuff for the user-level component "router". *)
(* The module containing the add/update dialog is defined later,
@@ -318,7 +326,7 @@ enable password zebra
Array.map (fun m -> Scanf.sscanf m "%s" (fun s->s)) message_array
in
let lowercase_acronym_array =
- Array.map (String.lowercase) uppercase_acronym_array
+ Array.map (lowercase) uppercase_acronym_array
in
let lowercase_acronym_list =
Array.to_list (lowercase_acronym_array)
@@ -755,7 +763,7 @@ let make
Array.map
(* --- *)
(fun acronym ->
- let u = (String.uppercase acronym) in
+ let u = (uppercase acronym) in
let text_startup_config : string = Printf.sprintf (f_ "%s startup config.") u in (* dynamically sensitive *)
let text_show_terminal : string = Printf.sprintf (f_ "Show %s terminal") u in
let form =
@@ -783,7 +791,7 @@ let make
~packing:(subform#add_with_tooltip (s_ "Check to activate a startup configuration" ))
~active:(fst rc_config)
~content:(snd rc_config)
- ~device_name:(Printf.sprintf "%s (%s)" old_name (String.uppercase acronym))
+ ~device_name:(Printf.sprintf "%s (%s)" old_name (uppercase acronym))
~language:("quagga_zebra") (* special syntax TODO: ("quagga_"^acronym) *)
()
in
@@ -1348,7 +1356,7 @@ class ['parent] router =
(fun acronym ->
let name = parent#get_name in
let host = self#ip_address_eth42 in
- let protocol = String.uppercase acronym in
+ let protocol = uppercase acronym in
let port_number = Const.quagga_alternatives#port_of_lowercase_acronym (acronym) in
let xterm_title = Printf.sprintf "%s Quagga terminal (CISCO-IOS-like %s)" name (protocol) in
self#add_accessory_process
diff --git a/simulation_level.ml b/simulation_level.ml
index 552328f..81dad9c 100644
--- a/simulation_level.ml
+++ b/simulation_level.ml
@@ -47,7 +47,7 @@ let an_input_descriptor_never_sending_anything =
within a [device] class (see the comments about DFA states below).
It makes no sense to implement {e two} distinct protection mechanisms
performing the same checks *)
-exception ProcessIsntInTheRightState of string;;
+(* exception ProcessIsntInTheRightState of string;; *) (* <- defined in the interface (simulation_level.mli) *)
(** This is used to spawn and control a concurrent Unix process: *)
class virtual process =
@@ -1240,7 +1240,7 @@ let device_state_to_string s =
Off -> "off" | On -> "on" | Sleeping -> "sleeping" | Destroyed -> "destroyed";;
(** What happens the user tries to follow a non-existing DFA transition *)
-exception CantGoFromStateToState of device_state * device_state;;
+(* exception CantGoFromStateToState of device_state * device_state;; *) (* <- defined in the interface (simulation_level.mli) *)
(** The base class of simulated devices. Either one parameter or the other one must be
supplied (note the ugly hack in which which both parameters are shadows to compute
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git
More information about the Pkg-ocaml-maint-commits
mailing list