diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-09-11 12:36:34 +0100 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-09-11 12:36:34 +0100 |
commit | 7eb8cc2d54f435f6a5d52c089282fc46380c043a (patch) | |
tree | 99e17b20a4df3f890b69e6ed0986c85bea8d5ad8 | |
parent | 7b73af4036b4b42c02906be5d8e47a6a361589bd (diff) | |
parent | 6ba490b9f6c3081eae3c6000288ecbf164d4809c (diff) | |
download | morph-7eb8cc2d54f435f6a5d52c089282fc46380c043a.tar.gz |
Merge branch 'sam/distbuild-gpl2'
Reviewed-By: Richard Ipsum <richard.ipsum@codethink.co.uk>
Reviewed-By: Daniel Silverstone <daniel.silverstone@codethink.co.uk>
29 files changed, 160 insertions, 40 deletions
diff --git a/distbuild/__init__.py b/distbuild/__init__.py index fa0c3831..52ad2cc2 100644 --- a/distbuild/__init__.py +++ b/distbuild/__init__.py @@ -1,6 +1,6 @@ # distbuild/__init__.py -- library for Morph's distributed build plugin # -# Copyright (C) 2014 Codethink Limited +# Copyright (C) 2012, 2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/distbuild/build_controller.py b/distbuild/build_controller.py index 987f01f4..e8a8dc37 100644 --- a/distbuild/build_controller.py +++ b/distbuild/build_controller.py @@ -1,6 +1,6 @@ # distbuild/build_controller.py -- control the steps for one build # -# Copyright (C) 2014 Codethink Limited +# Copyright (C) 2012, 2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/distbuild/connection_machine.py b/distbuild/connection_machine.py index 24eec8e9..e75ebe56 100644 --- a/distbuild/connection_machine.py +++ b/distbuild/connection_machine.py @@ -1,6 +1,6 @@ # distbuild/connection_machine.py -- state machine for connecting to server # -# Copyright (C) 2014 Codethink Limited +# Copyright (C) 2012, 2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/distbuild/crashpoint.py b/distbuild/crashpoint.py index 01bfbd6b..6e3eb3ef 100644 --- a/distbuild/crashpoint.py +++ b/distbuild/crashpoint.py @@ -1,6 +1,6 @@ # distbuild/crashpoint.py -- user-controlled crashing # -# Copyright (C) 2014 Codethink Limited +# Copyright (C) 2012, 2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/distbuild/crashpoint_tests.py b/distbuild/crashpoint_tests.py index 2761ccac..eb64115e 100644 --- a/distbuild/crashpoint_tests.py +++ b/distbuild/crashpoint_tests.py @@ -1,6 +1,6 @@ # distbuild/crashpoint_tests.py -- unit tests for crashpoint.py # -# Copyright (C) 2014 Codethink Limited +# Copyright (C) 2012, 2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/distbuild/distbuild_socket.py b/distbuild/distbuild_socket.py index 0408a2c1..ce69f29e 100644 --- a/distbuild/distbuild_socket.py +++ b/distbuild/distbuild_socket.py @@ -1,6 +1,6 @@ # distbuild/distbuild_socket.py -- wrapper around Python 'socket' module. # -# Copyright (C) 2014 Codethink Limited +# Copyright (C) 2012, 2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/distbuild/eventsrc.py b/distbuild/eventsrc.py index 11bb16e8..560b9b7a 100644 --- a/distbuild/eventsrc.py +++ b/distbuild/eventsrc.py @@ -1,7 +1,19 @@ # mainloop/eventsrc.py -- interface for event sources # -# Copyright 2012 Codethink Limited. -# All rights reserved. +# Copyright (C) 2012, 2014 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.. class EventSource(object): diff --git a/distbuild/helper_router.py b/distbuild/helper_router.py index 1f0ce45b..f7126093 100644 --- a/distbuild/helper_router.py +++ b/distbuild/helper_router.py @@ -1,6 +1,6 @@ # distbuild/helper_router.py -- state machine for controller's helper comms # -# Copyright (C) 2014 Codethink Limited +# Copyright (C) 2012, 2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/distbuild/idgen.py b/distbuild/idgen.py index b642bd98..41f2ffcf 100644 --- a/distbuild/idgen.py +++ b/distbuild/idgen.py @@ -1,6 +1,6 @@ # distbuild/idgen.py -- generate unique identifiers # -# Copyright (C) 2014 Codethink Limited +# Copyright (C) 2012, 2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/distbuild/initiator.py b/distbuild/initiator.py index 67f37764..b60700fd 100644 --- a/distbuild/initiator.py +++ b/distbuild/initiator.py @@ -1,6 +1,6 @@ # distbuild/initiator.py -- state machine for the initiator # -# Copyright (C) 2014 Codethink Limited +# Copyright (C) 2012, 2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/distbuild/initiator_connection.py b/distbuild/initiator_connection.py index b3769d7c..0f009fcc 100644 --- a/distbuild/initiator_connection.py +++ b/distbuild/initiator_connection.py @@ -1,7 +1,7 @@ # distbuild/initiator_connection.py -- communicate with initiator # -# Copyright (C) 2014 Codethink Limited -# +# Copyright (C) 2012, 2014 Codethink Limited +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. diff --git a/distbuild/jm.py b/distbuild/jm.py index 69fa5bd1..513c69fa 100644 --- a/distbuild/jm.py +++ b/distbuild/jm.py @@ -1,7 +1,19 @@ # mainloop/jm.py -- state machine for JSON communication between nodes # -# Copyright 2012 Codethink Limited. -# All rights reserved. +# Copyright (C) 2012, 2014 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.. import fcntl diff --git a/distbuild/json_router.py b/distbuild/json_router.py index 93533b2e..8b7b6457 100644 --- a/distbuild/json_router.py +++ b/distbuild/json_router.py @@ -1,6 +1,6 @@ # distbuild/json_router.py -- state machine to route JSON messages # -# Copyright (C) 2014 Codethink Limited +# Copyright (C) 2012, 2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/distbuild/mainloop.py b/distbuild/mainloop.py index c5b7d284..f0e5eebc 100644 --- a/distbuild/mainloop.py +++ b/distbuild/mainloop.py @@ -1,7 +1,19 @@ # mainloop/mainloop.py -- select-based main loop # -# Copyright 2012 Codethink Limited. -# All rights reserved. +# Copyright (C) 2012, 2014 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.. import fcntl diff --git a/distbuild/protocol.py b/distbuild/protocol.py index 561201bb..d5dfe2b7 100644 --- a/distbuild/protocol.py +++ b/distbuild/protocol.py @@ -1,6 +1,6 @@ # distbuild/protocol.py -- abstractions for the JSON messages # -# Copyright (C) 2014 Codethink Limited +# Copyright (C) 2012, 2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/distbuild/proxy_event_source.py b/distbuild/proxy_event_source.py index 5b35b741..20080800 100644 --- a/distbuild/proxy_event_source.py +++ b/distbuild/proxy_event_source.py @@ -1,6 +1,6 @@ # distbuild/proxy_event_source.py -- proxy for temporary event sources # -# Copyright (C) 2014 Codethink Limited +# Copyright (C) 2012, 2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/distbuild/route_map.py b/distbuild/route_map.py index f67bcb54..6dd90d78 100644 --- a/distbuild/route_map.py +++ b/distbuild/route_map.py @@ -1,6 +1,6 @@ # distbuild/route_map.py -- map message ids for routing purposes # -# Copyright (C) 2014 Codethink Limited +# Copyright (C) 2012, 2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/distbuild/route_map_tests.py b/distbuild/route_map_tests.py index c8ed69b3..b5ceca70 100644 --- a/distbuild/route_map_tests.py +++ b/distbuild/route_map_tests.py @@ -1,6 +1,6 @@ # distbuild/route_map_tests.py -- unit tests for message routing # -# Copyright (C) 2014 Codethink Limited +# Copyright (C) 2012, 2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/distbuild/serialise.py b/distbuild/serialise.py index efdb9588..d410b6cf 100644 --- a/distbuild/serialise.py +++ b/distbuild/serialise.py @@ -1,6 +1,6 @@ # distbuild/serialise.py -- (de)serialise Artifact object graphs # -# Copyright (C) 2014 Codethink Limited +# Copyright (C) 2012, 2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/distbuild/serialise_tests.py b/distbuild/serialise_tests.py index 2b4b3af7..2ad3a384 100644 --- a/distbuild/serialise_tests.py +++ b/distbuild/serialise_tests.py @@ -1,6 +1,6 @@ # distbuild/serialise_tests.py -- unit tests for Artifact serialisation # -# Copyright (C) 2014 Codethink Limited +# Copyright (C) 2012, 2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/distbuild/sm.py b/distbuild/sm.py index f50515c3..e773962b 100644 --- a/distbuild/sm.py +++ b/distbuild/sm.py @@ -1,7 +1,19 @@ # mainloop/sm.py -- state machine abstraction # -# Copyright 2012 Codethink Limited. -# All rights reserved. +# Copyright (C) 2012, 2014 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.. import logging diff --git a/distbuild/sm_tests.py b/distbuild/sm_tests.py index 3c33e494..59b9c023 100644 --- a/distbuild/sm_tests.py +++ b/distbuild/sm_tests.py @@ -1,7 +1,19 @@ # distbuild/sm_tests.py -- unit tests for state machine abstraction # -# Copyright 2012 Codethink Limited. -# All rights reserved. +# Copyright (C) 2012, 2014 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.. import unittest diff --git a/distbuild/sockbuf.py b/distbuild/sockbuf.py index c2cc8e2a..fc0315b0 100644 --- a/distbuild/sockbuf.py +++ b/distbuild/sockbuf.py @@ -1,7 +1,19 @@ # mainloop/sockbuf.py -- a buffering, non-blocking socket I/O state machine # -# Copyright 2012 Codethink Limited -# All rights reserved. +# Copyright (C) 2012, 2014 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.. import logging diff --git a/distbuild/socketsrc.py b/distbuild/socketsrc.py index 50e3baaf..15283140 100644 --- a/distbuild/socketsrc.py +++ b/distbuild/socketsrc.py @@ -1,7 +1,19 @@ # mainloop/socketsrc.py -- events and event sources for sockets # -# Copyright 2012 Codethink Limited. -# All rights reserved. +# Copyright (C) 2012, 2014 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.. import fcntl diff --git a/distbuild/sockserv.py b/distbuild/sockserv.py index 124d29b9..a5215e79 100644 --- a/distbuild/sockserv.py +++ b/distbuild/sockserv.py @@ -1,7 +1,19 @@ # mainloop/sockserv.py -- socket server state machines # -# Copyright 2012 Codethink Limited -# All rights reserved. +# Copyright (C) 2012, 2014 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.. import logging diff --git a/distbuild/stringbuffer.py b/distbuild/stringbuffer.py index 3349bb87..2b94dd19 100644 --- a/distbuild/stringbuffer.py +++ b/distbuild/stringbuffer.py @@ -1,7 +1,19 @@ # mainloop/stringbuffer.py -- efficient buffering of strings as a queue # -# Copyright 2012 Codethink Limited -# All rights reserved. +# Copyright (C) 2012, 2014 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.. class StringBuffer(object): diff --git a/distbuild/stringbuffer_tests.py b/distbuild/stringbuffer_tests.py index 29530560..da324f20 100644 --- a/distbuild/stringbuffer_tests.py +++ b/distbuild/stringbuffer_tests.py @@ -1,7 +1,19 @@ # distbuild/stringbuffer_tests.py -- unit tests # -# Copyright 2012 Codethink Limited -# All rights reserved. +# Copyright (C) 2012, 2014 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.. import unittest diff --git a/distbuild/timer_event_source.py b/distbuild/timer_event_source.py index f6141a73..4a2e81b7 100644 --- a/distbuild/timer_event_source.py +++ b/distbuild/timer_event_source.py @@ -1,6 +1,6 @@ # distbuild/timer_event_source.py -- event source for timer events # -# Copyright (C) 2014 Codethink Limited +# Copyright (C) 2012, 2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/distbuild/worker_build_scheduler.py b/distbuild/worker_build_scheduler.py index 39b7f021..6cda5972 100644 --- a/distbuild/worker_build_scheduler.py +++ b/distbuild/worker_build_scheduler.py @@ -1,6 +1,6 @@ # distbuild/worker_build_scheduler.py -- schedule worker-builds on workers # -# Copyright (C) 2014 Codethink Limited +# Copyright (C) 2012, 2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by |