From 01fe8d708c77a4df8fbacbc13ae44741ac36404c Mon Sep 17 00:00:00 2001 From: "Blake J. Harnden" Date: Thu, 15 Mar 2018 10:36:54 -0700 Subject: [PATCH] updates to simplify tracking the copyright and an update to 2018, still room for improvement --- LICENSE | 2 +- README.md | 2 +- configure.ac | 8 -------- daemon/doc/conf.py.in | 4 ++-- daemon/examples/emanemodel2core.py | 14 -------------- daemon/examples/myservices/sample.py | 5 ----- daemon/sbin/core-daemon | 9 --------- daemon/sbin/core-manage | 7 ------- daemon/sbin/coresendmsg | 7 ------- doc/conf.py.in | 4 ++-- gui/addons/ipsecservice.tcl | 5 ----- gui/annotations.tcl | 5 ----- gui/api.tcl | 8 -------- gui/canvas.tcl | 5 ----- gui/cfgparse.tcl | 5 ----- gui/core-gui.in | 5 ----- gui/core.tcl | 5 ----- gui/debug.tcl | 8 -------- gui/editor.tcl | 5 ----- gui/exceptions.tcl | 5 ----- gui/exec.tcl | 5 ----- gui/filemgmt.tcl | 5 ----- gui/gpgui.tcl | 5 ----- gui/graph_partitioning.tcl | 5 ----- gui/help.tcl | 7 +------ gui/initgui.tcl | 5 ----- gui/ipv4.tcl | 5 ----- gui/ipv6.tcl | 5 ----- gui/linkcfg.tcl | 5 ----- gui/mobility.tcl | 5 ----- gui/nodecfg.tcl | 5 ----- gui/nodes.tcl | 5 ----- gui/ns2imunes.tcl | 5 ----- gui/plugins.tcl | 5 ----- gui/services.tcl | 5 ----- gui/tooltips.tcl | 5 ----- gui/topogen.tcl | 5 ----- gui/traffic.tcl | 5 ----- gui/util.tcl | 5 ----- gui/version.tcl.in | 5 ----- gui/widget.tcl | 5 ----- gui/wlan.tcl | 5 ----- gui/wlanscript.tcl | 5 ----- 43 files changed, 7 insertions(+), 228 deletions(-) diff --git a/LICENSE b/LICENSE index 657c1a89..768b8d13 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2005-2017, the Boeing Company. +Copyright (c) 2005-2018, the Boeing Company. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/README.md b/README.md index 1b295ecf..78ed828f 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ CORE CORE: Common Open Research Emulator -Copyright (c)2005-2017 the Boeing Company. +Copyright (c)2005-2018 the Boeing Company. See the LICENSE file included in this distribution. diff --git a/configure.ac b/configure.ac index 3881eef5..5d1719a9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,3 @@ -# -# Copyright (c) 2010-2013 the Boeing Company -# See the LICENSE file included in this distribution. -# -# CORE configure script -# -# author: Jeff Ahrenholz -# # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. diff --git a/daemon/doc/conf.py.in b/daemon/doc/conf.py.in index c9041fae..eee03477 100644 --- a/daemon/doc/conf.py.in +++ b/daemon/doc/conf.py.in @@ -42,7 +42,7 @@ master_doc = 'index' # General information about the project. project = u'CORE Python modules' -copyright = u'2017, core-dev' +copyright = u'2005-2018, core-dev' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -223,7 +223,7 @@ man_pages = [ epub_title = u'CORE Python' epub_author = u'core-dev' epub_publisher = u'core-dev' -epub_copyright = u'2017, core-dev' +epub_copyright = u'2005-2018, core-dev' # The language of the text. It defaults to the language option # or en if the language is not set. diff --git a/daemon/examples/emanemodel2core.py b/daemon/examples/emanemodel2core.py index dd0ffbea..bc48fda2 100755 --- a/daemon/examples/emanemodel2core.py +++ b/daemon/examples/emanemodel2core.py @@ -1,11 +1,4 @@ #!/usr/bin/env python -# -# CORE -# Copyright (c) 2013 the Boeing Company. -# See the LICENSE file included in this distribution. -# -# author: Jeff Ahrenholz -# ''' emanemodel2core.py: scans an EMANE model source file (e.g. emane/models/rfpipe/maclayer/rfpipemaclayer.cc) and outputs Python @@ -18,13 +11,6 @@ emanemodel2core.py: scans an EMANE model source file import os, sys, optparse MODEL_TEMPLATE_PART1 = """ -# -# CORE -# Copyright (c)2013 Company. -# See the LICENSE file included in this distribution. -# -# author: Name -# ''' xyz.py: EMANE XYZ model bindings for CORE ''' diff --git a/daemon/examples/myservices/sample.py b/daemon/examples/myservices/sample.py index 1beeebf7..bd4a05b3 100644 --- a/daemon/examples/myservices/sample.py +++ b/daemon/examples/myservices/sample.py @@ -1,8 +1,3 @@ -# -# CORE -# Copyright (c)2010-2012 the Boeing Company. -# See the LICENSE file included in this distribution. -# """ Sample user-defined service. """ diff --git a/daemon/sbin/core-daemon b/daemon/sbin/core-daemon index edee959b..495e193f 100755 --- a/daemon/sbin/core-daemon +++ b/daemon/sbin/core-daemon @@ -1,13 +1,4 @@ #!/usr/bin/env python -# -# CORE -# Copyright (c)2010-2013 the Boeing Company. -# See the LICENSE file included in this distribution. -# -# authors: Tom Goff -# Jeff Ahrenholz -# - """ core-daemon: the CORE daemon is a server process that receives CORE API messages and instantiates emulated nodes and networks within the kernel. Various diff --git a/daemon/sbin/core-manage b/daemon/sbin/core-manage index 82857fe5..87d23a24 100755 --- a/daemon/sbin/core-manage +++ b/daemon/sbin/core-manage @@ -1,11 +1,4 @@ #!/usr/bin/env python -# -# CORE -# Copyright (c)2014 the Boeing Company. -# See the LICENSE file included in this distribution. -# -# author: Jeff Ahrenholz -# """ core-manage: Helper tool to add, remove, or check for services, models, and node types in a CORE installation. diff --git a/daemon/sbin/coresendmsg b/daemon/sbin/coresendmsg index 43c07cfd..5470bfca 100755 --- a/daemon/sbin/coresendmsg +++ b/daemon/sbin/coresendmsg @@ -1,11 +1,4 @@ #!/usr/bin/env python -# -# CORE -# Copyright (c)2011-2012 the Boeing Company. -# See the LICENSE file included in this distribution. -# -# authors: Jeff Ahrenholz -# """ coresendmsg: utility for generating CORE messages """ diff --git a/doc/conf.py.in b/doc/conf.py.in index 210c372f..3de261be 100644 --- a/doc/conf.py.in +++ b/doc/conf.py.in @@ -42,7 +42,7 @@ master_doc = 'index' # General information about the project. project = u'CORE' -copyright = u'2017, core-dev' +copyright = u'2005-2018, core-dev' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -223,7 +223,7 @@ man_pages = [ epub_title = u'CORE' epub_author = u'core-dev' epub_publisher = u'core-dev' -epub_copyright = u'2017, core-dev' +epub_copyright = u'2005-2018, core-dev' # The language of the text. It defaults to the language option # or en if the language is not set. diff --git a/gui/addons/ipsecservice.tcl b/gui/addons/ipsecservice.tcl index aea78b3e..c859852a 100644 --- a/gui/addons/ipsecservice.tcl +++ b/gui/addons/ipsecservice.tcl @@ -1,9 +1,4 @@ # -# Copyright 2012 the Boeing Company. -# See the LICENSE file included in this distribution. -# -# author: Jeff Ahrenholz -# # This is a separate "addons" file because it is closely tied to Python # service definition for the IPsec service. # diff --git a/gui/annotations.tcl b/gui/annotations.tcl index 8352a92d..8a2184d3 100644 --- a/gui/annotations.tcl +++ b/gui/annotations.tcl @@ -1,8 +1,3 @@ -# -# Copyright 2007-2013 the Boeing Company. -# See the LICENSE file included in this distribution. -# - # # Copyright 2007-2008 University of Zagreb, Croatia. # diff --git a/gui/api.tcl b/gui/api.tcl index 34658431..310e5ddc 100644 --- a/gui/api.tcl +++ b/gui/api.tcl @@ -1,11 +1,3 @@ -# -# CORE API -# Copyright 2005-2013 the Boeing Company. -# See the LICENSE file included in this distribution. -# -# author: Jeff Ahrenholz -# - # version of the API document that is used set CORE_API_VERSION 1.23 diff --git a/gui/canvas.tcl b/gui/canvas.tcl index bbcdfa24..11c8217b 100644 --- a/gui/canvas.tcl +++ b/gui/canvas.tcl @@ -1,8 +1,3 @@ -# -# Copyright 2005-2013 the Boeing Company. -# See the LICENSE file included in this distribution. -# - # # Copyright 2005-2008 University of Zagreb, Croatia. # diff --git a/gui/cfgparse.tcl b/gui/cfgparse.tcl index 6e730886..41f25594 100644 --- a/gui/cfgparse.tcl +++ b/gui/cfgparse.tcl @@ -1,8 +1,3 @@ -# -# Copyright 2005-2013 the Boeing Company. -# See the LICENSE file included in this distribution. -# - # # Copyright 2005-2008 University of Zagreb, Croatia. # diff --git a/gui/core-gui.in b/gui/core-gui.in index a93fd72b..efda3880 100755 --- a/gui/core-gui.in +++ b/gui/core-gui.in @@ -1,9 +1,4 @@ #!/bin/sh -# -# Copyright 2005-2013 the Boeing Company. -# See the LICENSE file included in this distribution. -# - # # Copyright 2004-2008 University of Zagreb, Croatia. # diff --git a/gui/core.tcl b/gui/core.tcl index 8ed9c90a..aad43fd4 100644 --- a/gui/core.tcl +++ b/gui/core.tcl @@ -1,8 +1,3 @@ -# -# Copyright 2005-2013 the Boeing Company. -# See the LICENSE file included in this distribution. -# - # # Copyright 2004-2008 University of Zagreb, Croatia. # diff --git a/gui/debug.tcl b/gui/debug.tcl index c1bd0ef1..60e45cbc 100644 --- a/gui/debug.tcl +++ b/gui/debug.tcl @@ -1,11 +1,3 @@ -# -# CORE Debugger -# Copyright 2005-2013 the Boeing Company. -# See the LICENSE file included in this distribution. -# -# author: Jeff Ahrenholz -# - .menubar.tools add command -label "Debugger..." -command popupDebugger set g_last_debug_cmd "puts \"Hello world\"" diff --git a/gui/editor.tcl b/gui/editor.tcl index 1195ee18..fec8a499 100644 --- a/gui/editor.tcl +++ b/gui/editor.tcl @@ -1,8 +1,3 @@ -# -# Copyright 2005-2013 the Boeing Company. -# See the LICENSE file included in this distribution. -# - # # Copyright 2004-2008 University of Zagreb, Croatia. # diff --git a/gui/exceptions.tcl b/gui/exceptions.tcl index 22f3be2f..40fbc6b5 100644 --- a/gui/exceptions.tcl +++ b/gui/exceptions.tcl @@ -1,8 +1,3 @@ -# -# Copyright 2011-2013 the Boeing Company. -# See the LICENSE file included in this distribution. -# - array set g_exceptions {} global execMode if { $execMode == "interactive" } { diff --git a/gui/exec.tcl b/gui/exec.tcl index 2105ac35..8e60f97b 100644 --- a/gui/exec.tcl +++ b/gui/exec.tcl @@ -1,8 +1,3 @@ -# -# Copyright 2005-2013 the Boeing Company. -# See the LICENSE file included in this distribution. -# - # # Copyright 2004-2008 University of Zagreb, Croatia. # diff --git a/gui/filemgmt.tcl b/gui/filemgmt.tcl index e76874a7..7dc1d795 100644 --- a/gui/filemgmt.tcl +++ b/gui/filemgmt.tcl @@ -1,8 +1,3 @@ -# -# Copyright 2005-2014 the Boeing Company. -# See the LICENSE file included in this distribution. -# - # # Copyright 2004-2008 University of Zagreb, Croatia. # diff --git a/gui/gpgui.tcl b/gui/gpgui.tcl index e507436a..b7188399 100644 --- a/gui/gpgui.tcl +++ b/gui/gpgui.tcl @@ -1,8 +1,3 @@ -# -# Copyright 2007-2013 the Boeing Company. -# See the LICENSE file included in this distribution. -# - # # Copyright 2007 Petra Schilhard. # diff --git a/gui/graph_partitioning.tcl b/gui/graph_partitioning.tcl index e21fe69f..87e215df 100644 --- a/gui/graph_partitioning.tcl +++ b/gui/graph_partitioning.tcl @@ -1,8 +1,3 @@ -# -# Copyright 2007-2013 the Boeing Company. -# See the LICENSE file included in this distribution. -# - # # Copyright 2007 Petra Schilhard. # diff --git a/gui/help.tcl b/gui/help.tcl index 9741b570..3d4c4ad9 100644 --- a/gui/help.tcl +++ b/gui/help.tcl @@ -1,8 +1,3 @@ -# -# Copyright 2005-2013 the Boeing Company. -# See the LICENSE file included in this distribution. -# - # # Copyright 2004-2008 University of Zagreb, Croatia. # @@ -86,7 +81,7 @@ proc popupAbout {} { # version info label .about.text1 -text "CORE version $CORE_VERSION ($CORE_VERSION_DATE)" \ -foreground #500000 -padx 5 -pady 10 - label .about.text2 -text "Copyright (c)2005-2013\ + label .about.text2 -text "Copyright \ the Boeing Company. See the LICENSE file included in this\ distribution." pack .about.text1 -side top -anchor n -padx 4 -pady 4 diff --git a/gui/initgui.tcl b/gui/initgui.tcl index ed1a428b..c75acf5c 100644 --- a/gui/initgui.tcl +++ b/gui/initgui.tcl @@ -1,8 +1,3 @@ -# -# Copyright 2005-2014 the Boeing Company. -# See the LICENSE file included in this distribution. -# - # # Copyright 2004-2008 University of Zagreb, Croatia. # diff --git a/gui/ipv4.tcl b/gui/ipv4.tcl index f1f721d0..76901060 100644 --- a/gui/ipv4.tcl +++ b/gui/ipv4.tcl @@ -1,8 +1,3 @@ -# -# Copyright 2005-2013 the Boeing Company. -# See the LICENSE file included in this distribution. -# - # # Copyright 2005-2008 University of Zagreb, Croatia. # diff --git a/gui/ipv6.tcl b/gui/ipv6.tcl index 63596512..bb330a23 100644 --- a/gui/ipv6.tcl +++ b/gui/ipv6.tcl @@ -1,8 +1,3 @@ -# -# Copyright 2005-2013 the Boeing Company. -# See the LICENSE file included in this distribution. -# - # # Copyright 2005-2008 University of Zagreb, Croatia. # diff --git a/gui/linkcfg.tcl b/gui/linkcfg.tcl index adaa75bc..5c773097 100644 --- a/gui/linkcfg.tcl +++ b/gui/linkcfg.tcl @@ -1,8 +1,3 @@ -# -# Copyright 2005-2013 the Boeing Company. -# See the LICENSE file included in this distribution. -# - # # Copyright 2004-2008 University of Zagreb, Croatia. # diff --git a/gui/mobility.tcl b/gui/mobility.tcl index 67a0006c..7c0d46d6 100644 --- a/gui/mobility.tcl +++ b/gui/mobility.tcl @@ -1,8 +1,3 @@ -# -# Copyright 2005-2013 the Boeing Company. -# See the LICENSE file included in this distribution. -# - # shows the Two-node Tool proc popupTwoNodeDialog { } { global twonodePID lastTwoNodeHop g_twoNodeSelect g_twoNodeSelectCallback diff --git a/gui/nodecfg.tcl b/gui/nodecfg.tcl index 0a974ebb..b979fdcb 100644 --- a/gui/nodecfg.tcl +++ b/gui/nodecfg.tcl @@ -1,8 +1,3 @@ -# -# Copyright 2005-2013 the Boeing Company. -# See the LICENSE file included in this distribution. -# - # # Copyright 2004-2008 University of Zagreb, Croatia. # diff --git a/gui/nodes.tcl b/gui/nodes.tcl index 1ddcbd6d..cabad158 100644 --- a/gui/nodes.tcl +++ b/gui/nodes.tcl @@ -1,9 +1,4 @@ # -# Copyright 2010-2013 the Boeing Company. -# See the LICENSE file included in this distribution. -# -# author: Jeff Ahrenholz -# # GUI support for node types and profiles. # diff --git a/gui/ns2imunes.tcl b/gui/ns2imunes.tcl index 72cde399..1d5f1a04 100644 --- a/gui/ns2imunes.tcl +++ b/gui/ns2imunes.tcl @@ -1,8 +1,3 @@ -# -# Copyright 2005-2013 the Boeing Company. -# See the LICENSE file included in this distribution. -# - # # Copyright 2004-2008 University of Zagreb, Croatia. # diff --git a/gui/plugins.tcl b/gui/plugins.tcl index 04376c73..45ad77e1 100644 --- a/gui/plugins.tcl +++ b/gui/plugins.tcl @@ -1,9 +1,4 @@ # -# Copyright 2010-2013 the Boeing Company. -# See the LICENSE file included in this distribution. -# -# author: Jeff Ahrenholz -# # Support for managing CORE plugins from the GUI. # diff --git a/gui/services.tcl b/gui/services.tcl index 2f559e50..305917a5 100644 --- a/gui/services.tcl +++ b/gui/services.tcl @@ -1,9 +1,4 @@ # -# Copyright 2010-2013 the Boeing Company. -# See the LICENSE file included in this distribution. -# -# author: Jeff Ahrenholz -# # GUI support for managing CORE node services. # diff --git a/gui/tooltips.tcl b/gui/tooltips.tcl index 6fbb74c8..91479d84 100644 --- a/gui/tooltips.tcl +++ b/gui/tooltips.tcl @@ -1,8 +1,3 @@ -# -# Copyright 2005-2013 the Boeing Company. -# See the LICENSE file included in this distribution. -# - array set left_tooltips { select "selection tool" start "start the session" diff --git a/gui/topogen.tcl b/gui/topogen.tcl index fd9bd829..2d7f84a6 100644 --- a/gui/topogen.tcl +++ b/gui/topogen.tcl @@ -1,8 +1,3 @@ -# -# Copyright 2007-2013 the Boeing Company. -# See the LICENSE file included in this distribution. -# - # # Copyright 2007-2008 University of Zagreb, Croatia. # diff --git a/gui/traffic.tcl b/gui/traffic.tcl index 44354560..41b8ac85 100644 --- a/gui/traffic.tcl +++ b/gui/traffic.tcl @@ -1,8 +1,3 @@ -# -# Copyright 2011-2013 the Boeing Company. -# See the LICENSE file included in this distribution. -# - set g_traffic_start_opt 0 set g_traffic_flows "" diff --git a/gui/util.tcl b/gui/util.tcl index 3052f73b..8078f447 100644 --- a/gui/util.tcl +++ b/gui/util.tcl @@ -1,8 +1,3 @@ -# -# Copyright 2005-2014 the Boeing Company. -# See the LICENSE file included in this distribution. -# - set g_imageFileTypes {{"images" {.gif}} {"images" {.jpg}} {"images" {.png}} {"images" {.bmp}} {"images" {.pcx}} {"images" {.tga}} {"images" {.tif}} {"images" {.ps}} {"images" {.ppm}} diff --git a/gui/version.tcl.in b/gui/version.tcl.in index 242a0e82..5a2f86be 100644 --- a/gui/version.tcl.in +++ b/gui/version.tcl.in @@ -1,8 +1,3 @@ -# -# Copyright 2005-2013 the Boeing Company. -# See the LICENSE file included in this distribution. -# - # # define the version number and release date here # diff --git a/gui/widget.tcl b/gui/widget.tcl index ec1d48e7..1a8f6b7a 100644 --- a/gui/widget.tcl +++ b/gui/widget.tcl @@ -1,8 +1,3 @@ -# -# Copyright 2005-2013 the Boeing Company. -# See the LICENSE file included in this distribution. -# - set vtysh_cmd vtysh set vtysh_search_path {/usr/bin /usr/local/bin /usr/lib/quagga} diff --git a/gui/wlan.tcl b/gui/wlan.tcl index 6136f326..4f103fe0 100644 --- a/gui/wlan.tcl +++ b/gui/wlan.tcl @@ -1,8 +1,3 @@ -# -# Copyright 2005-2013 the Boeing Company. -# See the LICENSE file included in this distribution. -# - # # Copyright 2005-2008 University of Zagreb, Croatia. # diff --git a/gui/wlanscript.tcl b/gui/wlanscript.tcl index 6b1788f1..f7bfba42 100644 --- a/gui/wlanscript.tcl +++ b/gui/wlanscript.tcl @@ -1,8 +1,3 @@ -# -# Copyright 2005-2013 the Boeing Company. -# See the LICENSE file included in this distribution. -# - # # run a scengen mobility script proc wlanRunMobilityScript { wlan } {