From aa411a96f0419f75d95078d7252de08bf9631fa6 Mon Sep 17 00:00:00 2001 From: persan Date: Sat, 28 Mar 2020 22:01:32 +0100 Subject: [PATCH] Update copyright --- Makefile | 23 +++++++++++++ configure | 24 ++++++++++++++ examples/zmq-examples-client.adb | 32 +++++++++---------- examples/zmq-examples-display.adb | 4 +-- examples/zmq-examples-hwserver.adb | 2 +- examples/zmq-examples-json_data.adb | 23 +++++++++++++ examples/zmq-examples-json_data.ads | 23 +++++++++++++ examples/zmq-examples-monitor.adb | 3 +- examples/zmq-examples-multi_thread_server.adb | 3 +- examples/zmq-examples-prompt.adb | 2 +- examples/zmq-examples-server.adb | 2 +- examples/zmq-examples-sparse.ads | 23 +++++++++++++ examples/zmq-examples.ads | 2 +- fixHeader.py | 23 +++++++++++++ rename.py | 27 ++++++++++++++-- src/gen/zmq-low_level.ads | 4 +-- src/zmq-contexts.adb | 2 +- src/zmq-contexts.ads | 2 +- src/zmq-messages.adb | 8 ++--- src/zmq-messages.ads | 2 +- src/zmq-pollsets.adb | 2 +- src/zmq-pollsets.ads | 2 +- src/zmq-proxys.adb | 2 +- src/zmq-proxys.ads | 2 +- src/zmq-sockets-indefinite_typed_generic.adb | 2 +- src/zmq-sockets-indefinite_typed_generic.ads | 2 +- src/zmq-sockets-typed_generic.adb | 2 +- src/zmq-sockets-typed_generic.ads | 2 +- src/zmq-sockets.adb | 2 +- src/zmq-sockets.ads | 2 +- src/zmq-utilities-memory_streams.adb | 2 +- src/zmq-utilities-memory_streams.ads | 2 +- ...q-utilities-stream_element_array_image.adb | 2 +- ...q-utilities-stream_element_array_image.ads | 2 +- src/zmq-utilities.ads | 2 +- src/zmq.adb | 2 +- src/zmq.ads | 2 +- tests/zmq-tests-testharnesess-test_all.adb | 16 +++++----- tests/zmq-tests-testharnesess.ads | 2 +- tests/zmq-tests-testsuits-test_all.adb | 2 +- tests/zmq-tests-testsuits-test_all.ads | 2 +- tests/zmq-tests-testsuits.ads | 2 +- tests/zmq-tests.ads | 2 +- zmq.ide.py | 23 +++++++++++++ 44 files changed, 251 insertions(+), 66 deletions(-) diff --git a/Makefile b/Makefile index 1423f14..dd38eb4 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,26 @@ +# --------------------------------------------------------------------------- +# Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files +# (the "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and / or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions : +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR +# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +# OTHER DEALINGS IN THE SOFTWARE. +# --------------------------------------------------------------------------- -include Makefile.config export GPR_PROJECT_PATH:=${CURDIR} all: compile diff --git a/configure b/configure index 96e370a..225a5ea 100755 --- a/configure +++ b/configure @@ -1,4 +1,28 @@ #!/usr/bin/env python +# --------------------------------------------------------------------------- +# Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files +# (the "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and / or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions : +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR +# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +# OTHER DEALINGS IN THE SOFTWARE. +# --------------------------------------------------------------------------- + import sys import os from os.path import * diff --git a/examples/zmq-examples-client.adb b/examples/zmq-examples-client.adb index cc20ba3..c870a28 100644 --- a/examples/zmq-examples-client.adb +++ b/examples/zmq-examples-client.adb @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright (c) 2011 Per Sandberg -- +-- Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files -- @@ -27,34 +27,34 @@ with ZMQ.Contexts; with ZMQ.Messages; with Ada.Text_IO; use Ada.Text_IO; -procedure ZMQ.examples.Client is - ctx : ZMQ.Contexts.Context; - s : ZMQ.Sockets.Socket; +procedure ZMQ.Examples.Client is + Ctx : ZMQ.Contexts.Context; + S : ZMQ.Sockets.Socket; begin -- Initialise 0MQ context, requesting a single application thread -- and a single I/O thread - ctx.Set_number_of_IO_threads (1); + Ctx.Set_Number_Of_IO_Threads (1); -- Create a ZMQ_REP socket to receive requests and send replies - s.Initialize (ctx, Sockets.REQ); + S.Initialize (Ctx, Sockets.REQ); -- Bind to the TCP transport and port 5555 on the 'lo' interface - s.Connect ("tcp://localhost:5555"); - for i in 1 .. 10 loop + S.Connect ("tcp://localhost:5555"); + for I in 1 .. 10 loop declare - query_string : constant String := "SELECT * FROM mytable"; - query : ZMQ.Messages.Message; + Query_String : constant String := "SELECT * FROM mytable"; + Query : ZMQ.Messages.Message; begin - query.Initialize (query_string & "(" & i'Img & ");"); - s.Send (query); + Query.Initialize (Query_String & "(" & I'Img & ");"); + S.Send (Query); end; declare - resultset : ZMQ.Messages.Message; + Resultset : ZMQ.Messages.Message; begin - resultset.Initialize(0); - s.Recv (resultset); - Put_Line ('"' & resultset.GetData & '"'); + Resultset.Initialize (0); + S.Recv (Resultset); + Put_Line ('"' & Resultset.GetData & '"'); end; end loop; end ZMQ.Examples.Client; diff --git a/examples/zmq-examples-display.adb b/examples/zmq-examples-display.adb index 8d756fc..b7a8761 100644 --- a/examples/zmq-examples-display.adb +++ b/examples/zmq-examples-display.adb @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright (c) 2011 Per Sandberg -- +-- Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files -- @@ -25,7 +25,7 @@ with ZMQ.Sockets; with ZMQ.Contexts; with Ada.Text_IO; -procedure ZMQ.examples.Display is +procedure ZMQ.Examples.Display is use Ada.Text_IO; Context : aliased Contexts.Context; Socket : Sockets.Socket; diff --git a/examples/zmq-examples-hwserver.adb b/examples/zmq-examples-hwserver.adb index 4890f4b..8aa8f23 100644 --- a/examples/zmq-examples-hwserver.adb +++ b/examples/zmq-examples-hwserver.adb @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright (c) 2010 Per Sandberg -- +-- Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files -- diff --git a/examples/zmq-examples-json_data.adb b/examples/zmq-examples-json_data.adb index c1ef2e2..77a69ff 100644 --- a/examples/zmq-examples-json_data.adb +++ b/examples/zmq-examples-json_data.adb @@ -1,3 +1,26 @@ +------------------------------------------------------------------------------- +-- Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se -- +-- -- +-- Permission is hereby granted, free of charge, to any person obtaining a -- +-- copy of this software and associated documentation files -- +-- (the "Software"), to deal in the Software without restriction, including -- +-- without limitation the rights to use, copy, modify, merge, publish, -- +-- distribute, sublicense, and / or sell copies of the Software, and to -- +-- permit persons to whom the Software is furnished to do so, subject to -- +-- the following conditions : -- +-- -- +-- The above copyright notice and this permission notice shall be included -- +-- in all copies or substantial portions of the Software. -- +-- -- +-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -- +-- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -- +-- MERCHANTABILITY, -- +-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -- +-- THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR -- +-- OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -- +-- ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -- +-- OTHER DEALINGS IN THE SOFTWARE. -- +------------------------------------------------------------------------------- package body ZMQ.Examples.JSON_Data is diff --git a/examples/zmq-examples-json_data.ads b/examples/zmq-examples-json_data.ads index 20a442a..a1c4fbc 100644 --- a/examples/zmq-examples-json_data.ads +++ b/examples/zmq-examples-json_data.ads @@ -1,3 +1,26 @@ +------------------------------------------------------------------------------- +-- Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se -- +-- -- +-- Permission is hereby granted, free of charge, to any person obtaining a -- +-- copy of this software and associated documentation files -- +-- (the "Software"), to deal in the Software without restriction, including -- +-- without limitation the rights to use, copy, modify, merge, publish, -- +-- distribute, sublicense, and / or sell copies of the Software, and to -- +-- permit persons to whom the Software is furnished to do so, subject to -- +-- the following conditions : -- +-- -- +-- The above copyright notice and this permission notice shall be included -- +-- in all copies or substantial portions of the Software. -- +-- -- +-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -- +-- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -- +-- MERCHANTABILITY, -- +-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -- +-- THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR -- +-- OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -- +-- ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -- +-- OTHER DEALINGS IN THE SOFTWARE. -- +------------------------------------------------------------------------------- with GNATCOLL.JSON; diff --git a/examples/zmq-examples-monitor.adb b/examples/zmq-examples-monitor.adb index 16e7636..d04476b 100644 --- a/examples/zmq-examples-monitor.adb +++ b/examples/zmq-examples-monitor.adb @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright (c) 2011 Per Sandberg -- +-- Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files -- @@ -22,6 +22,7 @@ -- OTHER DEALINGS IN THE SOFTWARE. -- ------------------------------------------------------------------------------- + with Ada.Text_IO; use Ada.Text_IO; with GNAT.Exception_Traces; diff --git a/examples/zmq-examples-multi_thread_server.adb b/examples/zmq-examples-multi_thread_server.adb index 4ccab33..dc0bf86 100644 --- a/examples/zmq-examples-multi_thread_server.adb +++ b/examples/zmq-examples-multi_thread_server.adb @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright (c) 2011 Per Sandberg -- +-- Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files -- @@ -22,6 +22,7 @@ -- OTHER DEALINGS IN THE SOFTWARE. -- ------------------------------------------------------------------------------- + with ZMQ.Sockets; with ZMQ.Contexts; with Ada.Strings.Unbounded; use Ada.Strings.Unbounded; diff --git a/examples/zmq-examples-prompt.adb b/examples/zmq-examples-prompt.adb index 21d9295..2be438f 100644 --- a/examples/zmq-examples-prompt.adb +++ b/examples/zmq-examples-prompt.adb @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright (c) 2011 Per Sandberg -- +-- Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files -- diff --git a/examples/zmq-examples-server.adb b/examples/zmq-examples-server.adb index 4b6d934..815ce41 100644 --- a/examples/zmq-examples-server.adb +++ b/examples/zmq-examples-server.adb @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright (c) 2011 Per Sandberg -- +-- Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files -- diff --git a/examples/zmq-examples-sparse.ads b/examples/zmq-examples-sparse.ads index a30c503..a693a32 100644 --- a/examples/zmq-examples-sparse.ads +++ b/examples/zmq-examples-sparse.ads @@ -1,3 +1,26 @@ +------------------------------------------------------------------------------- +-- Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se -- +-- -- +-- Permission is hereby granted, free of charge, to any person obtaining a -- +-- copy of this software and associated documentation files -- +-- (the "Software"), to deal in the Software without restriction, including -- +-- without limitation the rights to use, copy, modify, merge, publish, -- +-- distribute, sublicense, and / or sell copies of the Software, and to -- +-- permit persons to whom the Software is furnished to do so, subject to -- +-- the following conditions : -- +-- -- +-- The above copyright notice and this permission notice shall be included -- +-- in all copies or substantial portions of the Software. -- +-- -- +-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -- +-- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -- +-- MERCHANTABILITY, -- +-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -- +-- THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR -- +-- OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -- +-- ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -- +-- OTHER DEALINGS IN THE SOFTWARE. -- +------------------------------------------------------------------------------- diff --git a/examples/zmq-examples.ads b/examples/zmq-examples.ads index b2def3f..644340e 100644 --- a/examples/zmq-examples.ads +++ b/examples/zmq-examples.ads @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright (c) 2011 Per Sandberg -- +-- Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files -- diff --git a/fixHeader.py b/fixHeader.py index 3da7666..7126b87 100644 --- a/fixHeader.py +++ b/fixHeader.py @@ -1,4 +1,27 @@ #!/usr/bin/env python +# --------------------------------------------------------------------------- +# Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files +# (the "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and / or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions : +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR +# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +# OTHER DEALINGS IN THE SOFTWARE. +# --------------------------------------------------------------------------- import GPS from os.path import * diff --git a/rename.py b/rename.py index 71e4eba..7bb0083 100644 --- a/rename.py +++ b/rename.py @@ -1,8 +1,32 @@ #!/usr/bin/env python +# --------------------------------------------------------------------------- +# Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files +# (the "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and / or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions : +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR +# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +# OTHER DEALINGS IN THE SOFTWARE. +# --------------------------------------------------------------------------- import sys import re +from os.path import * header = """------------------------------------------------------------------------------- -- -- @@ -12,7 +36,7 @@ header = """-------------------------------------------------------------------- -- -- -- S p e c -- -- -- --- Copyright (C) 2010-2011, per.sandberg@bredband.net -- +-- Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files -- @@ -116,7 +140,6 @@ def main(path): with open(path, "w") as f: f.write(header) f.write(buffer) - f.write(tail) if not exists("zmq-case_exceptions.xml"): matcher = re.compile(r"\w+ (zmq_\w+) .*") with open("zmq-case_exceptions.xml", "w") as outf: diff --git a/src/gen/zmq-low_level.ads b/src/gen/zmq-low_level.ads index 9da7a56..d07703e 100644 --- a/src/gen/zmq-low_level.ads +++ b/src/gen/zmq-low_level.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 2010-2011, per.sandberg@bredband.net -- +-- Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files -- @@ -28,7 +28,6 @@ -- ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -- -- OTHER DEALINGS IN THE SOFTWARE. -- ------------------------------------------------------------------------------- --- begin read only -- -- The contents of this file is derived from zmq.h using the -- -fdump-ada-spec switch for gcc. @@ -1006,4 +1005,3 @@ package ZMQ.Low_Level is -- thread-safe sockets **************************************************************************** DRAFT Socket -- monitoring events end ZMQ.Low_Level; --- end read only diff --git a/src/zmq-contexts.adb b/src/zmq-contexts.adb index 58275af..992c29b 100644 --- a/src/zmq-contexts.adb +++ b/src/zmq-contexts.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 2013-2020, per.s.sandberg@bahnhof.se -- +-- Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files -- diff --git a/src/zmq-contexts.ads b/src/zmq-contexts.ads index b0106dc..37e2a0f 100644 --- a/src/zmq-contexts.ads +++ b/src/zmq-contexts.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 2013-2020, per.s.sandberg@bahnhof.se -- +-- Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files -- diff --git a/src/zmq-messages.adb b/src/zmq-messages.adb index 71be2df..e8d4991 100644 --- a/src/zmq-messages.adb +++ b/src/zmq-messages.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 2013-2020, per.s.sandberg@bahnhof.se -- +-- Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files -- @@ -47,7 +47,7 @@ package body ZMQ.Messages is Ret : int; begin if Size > 0 then - Ret := Low_Level.zmq_msg_init_size (Self.Msg'Access, size_t (Size)); + Ret := Low_Level.zmq_msg_init_size (Self.Msg'Access, Size_T (Size)); else Ret := Low_Level.zmq_msg_init (Self.Msg'Access); end if; @@ -94,9 +94,9 @@ package body ZMQ.Messages is is Ret : int; begin - Ret := Low_Level.zmq_msg_init_data (Self.Msg'Access, + Ret := Low_Level.Zmq_Msg_Init_Data (Self.Msg'Access, Message, - size_t (Size), + Size_T (Size), Free, Hint); if Ret /= 0 then diff --git a/src/zmq-messages.ads b/src/zmq-messages.ads index 74161f7..911f979 100644 --- a/src/zmq-messages.ads +++ b/src/zmq-messages.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 2013-2020, per.s.sandberg@bahnhof.se -- +-- Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files -- diff --git a/src/zmq-pollsets.adb b/src/zmq-pollsets.adb index 1d613fc..394bd81 100644 --- a/src/zmq-pollsets.adb +++ b/src/zmq-pollsets.adb @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 2013-2020, per.s.sandberg@bahnhof.se -- +-- Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files -- diff --git a/src/zmq-pollsets.ads b/src/zmq-pollsets.ads index d578508..030c85e 100644 --- a/src/zmq-pollsets.ads +++ b/src/zmq-pollsets.ads @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright (C) 2013-2020, per.s.sandberg@bahnhof.se -- +-- Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files -- diff --git a/src/zmq-proxys.adb b/src/zmq-proxys.adb index 0afcc42..0ec60b3 100644 --- a/src/zmq-proxys.adb +++ b/src/zmq-proxys.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 2013-2020, per.s.sandberg@bahnhof.se -- +-- Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files -- diff --git a/src/zmq-proxys.ads b/src/zmq-proxys.ads index a37e596..9687992 100644 --- a/src/zmq-proxys.ads +++ b/src/zmq-proxys.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 2013-2020, per.s.sandberg@bahnhof.se -- +-- Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files -- diff --git a/src/zmq-sockets-indefinite_typed_generic.adb b/src/zmq-sockets-indefinite_typed_generic.adb index 9fc6d9b..036ab99 100644 --- a/src/zmq-sockets-indefinite_typed_generic.adb +++ b/src/zmq-sockets-indefinite_typed_generic.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 2013-2020, per.s.sandberg@bahnhof.se -- +-- Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files -- diff --git a/src/zmq-sockets-indefinite_typed_generic.ads b/src/zmq-sockets-indefinite_typed_generic.ads index 510b456..e5884bc 100644 --- a/src/zmq-sockets-indefinite_typed_generic.ads +++ b/src/zmq-sockets-indefinite_typed_generic.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 2013-2020, per.s.sandberg@bahnhof.se -- +-- Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files -- diff --git a/src/zmq-sockets-typed_generic.adb b/src/zmq-sockets-typed_generic.adb index 3be5c29..7e1282c 100644 --- a/src/zmq-sockets-typed_generic.adb +++ b/src/zmq-sockets-typed_generic.adb @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 2013-2020, per.s.sandberg@bahnhof.se -- +-- Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files -- diff --git a/src/zmq-sockets-typed_generic.ads b/src/zmq-sockets-typed_generic.ads index 375543f..84a8101 100644 --- a/src/zmq-sockets-typed_generic.ads +++ b/src/zmq-sockets-typed_generic.ads @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 2013-2020, per.s.sandberg@bahnhof.se -- +-- Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files -- diff --git a/src/zmq-sockets.adb b/src/zmq-sockets.adb index 800fcfb..a6edc1c 100644 --- a/src/zmq-sockets.adb +++ b/src/zmq-sockets.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 2013-2020, per.s.sandberg@bahnhof.se -- +-- Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files -- diff --git a/src/zmq-sockets.ads b/src/zmq-sockets.ads index 6b1b2c7..b0b3084 100644 --- a/src/zmq-sockets.ads +++ b/src/zmq-sockets.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 2013-2020, per.s.sandberg@bahnhof.se -- +-- Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files -- diff --git a/src/zmq-utilities-memory_streams.adb b/src/zmq-utilities-memory_streams.adb index 18a0624..c79f3fc 100644 --- a/src/zmq-utilities-memory_streams.adb +++ b/src/zmq-utilities-memory_streams.adb @@ -1,6 +1,6 @@ ------------------------------------------------------------------------------- -- -- --- Copyright (C) 2013-2020, per.s.sandberg@bahnhof.se -- +-- Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files -- diff --git a/src/zmq-utilities-memory_streams.ads b/src/zmq-utilities-memory_streams.ads index 3e49015..b81ea11 100644 --- a/src/zmq-utilities-memory_streams.ads +++ b/src/zmq-utilities-memory_streams.ads @@ -1,6 +1,6 @@ ------------------------------------------------------------------------------- -- -- --- Copyright (C) 2013-2020, per.s.sandberg@bahnhof.se -- +-- Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files -- diff --git a/src/zmq-utilities-stream_element_array_image.adb b/src/zmq-utilities-stream_element_array_image.adb index 95adfba..91de9f4 100644 --- a/src/zmq-utilities-stream_element_array_image.adb +++ b/src/zmq-utilities-stream_element_array_image.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 2013-2020, per.s.sandberg@bahnhof.se -- +-- Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files -- diff --git a/src/zmq-utilities-stream_element_array_image.ads b/src/zmq-utilities-stream_element_array_image.ads index 9aaa505..04006bf 100644 --- a/src/zmq-utilities-stream_element_array_image.ads +++ b/src/zmq-utilities-stream_element_array_image.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 2013-2020, per.sandberg@bredband.net -- +-- Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files -- diff --git a/src/zmq-utilities.ads b/src/zmq-utilities.ads index 4bf7666..81844b9 100644 --- a/src/zmq-utilities.ads +++ b/src/zmq-utilities.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 2013-2020, per.s.sandberg@bahnhof.se -- +-- Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files -- diff --git a/src/zmq.adb b/src/zmq.adb index 4efa6d8..0a5aac1 100644 --- a/src/zmq.adb +++ b/src/zmq.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 2013-2020, per.s.sandberg@bahnhof.se -- +-- Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files -- diff --git a/src/zmq.ads b/src/zmq.ads index a7dd460..6029723 100644 --- a/src/zmq.ads +++ b/src/zmq.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 2013-2020, per.s.sandberg@bahnhof.se -- +-- Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files -- diff --git a/tests/zmq-tests-testharnesess-test_all.adb b/tests/zmq-tests-testharnesess-test_all.adb index cf68e93..60301a4 100644 --- a/tests/zmq-tests-testharnesess-test_all.adb +++ b/tests/zmq-tests-testharnesess-test_all.adb @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright (c) 2011 Per Sandberg -- +-- Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files -- @@ -40,22 +40,22 @@ procedure ZMQ.Tests.Testharnesess.Test_All is (ZMQ.Tests.TestSuits.Test_All.Suite); -- Reporter : AUnit.Reporter.Text.Text_Reporter; Reporter : AUnit.Reporter.XML.XML_Reporter; - task killer is - entry ok; - end killer; + task Killer is + entry Ok; + end Killer; - task body killer is + task body Killer is begin select - accept ok; + accept Ok; or delay 5.0; GNAT.IO.Put_Line ("Times up"); GNAT.OS_Lib.OS_Exit (-1); end select; - end killer; + end Killer; begin Run (Reporter); - killer.ok; + Killer.Ok; end ZMQ.Tests.TestHarnesess.Test_All; diff --git a/tests/zmq-tests-testharnesess.ads b/tests/zmq-tests-testharnesess.ads index a185deb..aa72cb7 100644 --- a/tests/zmq-tests-testharnesess.ads +++ b/tests/zmq-tests-testharnesess.ads @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright (c) 2011 Per Sandberg -- +-- Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files -- diff --git a/tests/zmq-tests-testsuits-test_all.adb b/tests/zmq-tests-testsuits-test_all.adb index 898e479..1e48d95 100644 --- a/tests/zmq-tests-testsuits-test_all.adb +++ b/tests/zmq-tests-testsuits-test_all.adb @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright (c) 2011 Per Sandberg -- +-- Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files -- diff --git a/tests/zmq-tests-testsuits-test_all.ads b/tests/zmq-tests-testsuits-test_all.ads index 0622005..3e20e74 100644 --- a/tests/zmq-tests-testsuits-test_all.ads +++ b/tests/zmq-tests-testsuits-test_all.ads @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright (c) 2011 Per Sandberg -- +-- Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files -- diff --git a/tests/zmq-tests-testsuits.ads b/tests/zmq-tests-testsuits.ads index 8dd55bd..7710f9a 100644 --- a/tests/zmq-tests-testsuits.ads +++ b/tests/zmq-tests-testsuits.ads @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright (c) 2011 Per Sandberg -- +-- Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files -- diff --git a/tests/zmq-tests.ads b/tests/zmq-tests.ads index 2c2f55f..9dab42c 100644 --- a/tests/zmq-tests.ads +++ b/tests/zmq-tests.ads @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright (c) 2011 Per Sandberg -- +-- Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files -- diff --git a/zmq.ide.py b/zmq.ide.py index 0360200..9b047ed 100644 --- a/zmq.ide.py +++ b/zmq.ide.py @@ -1,3 +1,26 @@ +# --------------------------------------------------------------------------- +# Copyright (C) 2020-2030, per.s.sandberg@bahnhof.se +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files +# (the "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and / or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions : +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR +# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +# OTHER DEALINGS IN THE SOFTWARE. +# --------------------------------------------------------------------------- import GPS from os.path import *