Merge pull request #209 from nasa/integration-candidate

cFS-GroundSystem Integration candidate: Caelum-rc4+dev7

GroundSystem.py

@@ -1,26 +1,23 @@
+# !/usr/bin/env python3
+
 #
-#  GSC-18128-1, "Core Flight Executive Version 6.7"
+#  NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes”
 #
-#  Copyright (c) 2006-2019 United States Government as represented by
-#  the Administrator of the National Aeronautics and Space Administration.
+#  Copyright (c) 2020 United States Government as represented by the
+#  Administrator of the National Aeronautics and Space Administration.
 #  All Rights Reserved.
 #
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
+#  Licensed under the Apache License, Version 2.0 (the "License"); you may
+#  not use this file except in compliance with the License. You may obtain
+#  a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
 #
 #  Unless required by applicable law or agreed to in writing, software
 #  distributed under the License is distributed on an "AS IS" BASIS,
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-# cFS Ground System Version 2.0.0
-#
-# !/usr/bin/env python3
-#
+
 import shlex
 import subprocess
 import sys

README.md

@@ -11,6 +11,12 @@ See [Guide-GroundSystem.md](https://github.com/nasa/cFS-GroundSystem/blob/master
 
 ## Version History
 
+### Development Build: v3.0.0-rc4+dev19
+
+- Update Copyright Headers
+- Standardize version information 
+- See <https://github.com/nasa/cFS-GroundSystem/pull/209> and <https://github.com/nasa/cFS/445>
+
 ### Development Build: v3.0.0-rc4+dev12
 
 - Apply header guard standard

RoutingService.py

@@ -1,24 +1,22 @@
+#!/usr/bin/env python3
+
 #
-#  GSC-18128-1, "Core Flight Executive Version 6.7"
+#  NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes”
 #
-#  Copyright (c) 2006-2019 United States Government as represented by
-#  the Administrator of the National Aeronautics and Space Administration.
+#  Copyright (c) 2020 United States Government as represented by the
+#  Administrator of the National Aeronautics and Space Administration.
 #  All Rights Reserved.
 #
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
+#  Licensed under the Apache License, Version 2.0 (the "License"); you may
+#  not use this file except in compliance with the License. You may obtain
+#  a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
 #
 #  Unless required by applicable law or agreed to in writing, software
 #  distributed under the License is distributed on an "AS IS" BASIS,
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-#!/usr/bin/env python3
-#
 
 import socket
 from struct import unpack

Subsystems/cmdGui/CHeaderParser.py

@@ -1,25 +1,22 @@
 #
-#  GSC-18128-1, "Core Flight Executive Version 6.7"
+#  NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes”
 #
-#  Copyright (c) 2006-2019 United States Government as represented by
-#  the Administrator of the National Aeronautics and Space Administration.
+#  Copyright (c) 2020 United States Government as represented by the
+#  Administrator of the National Aeronautics and Space Administration.
 #  All Rights Reserved.
 #
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
+#  Licensed under the Apache License, Version 2.0 (the "License"); you may
+#  not use this file except in compliance with the License. You may obtain
+#  a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
 #
 #  Unless required by applicable law or agreed to in writing, software
 #  distributed under the License is distributed on an "AS IS" BASIS,
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
+
 ##############################################################################
-# Filename: CHeaderParser.py
-#
 # Created in Winter 2014-15
 # Created by Winter Intern for NASA GSFC Code 582
 #

Subsystems/cmdGui/CommandParser.py

@@ -1,22 +1,21 @@
 #
-#  GSC-18128-1, "Core Flight Executive Version 6.7"
+#  NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes”
 #
-#  Copyright (c) 2006-2019 United States Government as represented by
-#  the Administrator of the National Aeronautics and Space Administration.
+#  Copyright (c) 2020 United States Government as represented by the
+#  Administrator of the National Aeronautics and Space Administration.
 #  All Rights Reserved.
 #
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
+#  Licensed under the Apache License, Version 2.0 (the "License"); you may
+#  not use this file except in compliance with the License. You may obtain
+#  a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
 #
 #  Unless required by applicable law or agreed to in writing, software
 #  distributed under the License is distributed on an "AS IS" BASIS,
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
+
 import glob
 import pickle
 import re

Subsystems/cmdGui/CommandSystem.py

@@ -1,24 +1,23 @@
+# !/usr/bin/env python3
+
 #
-#  GSC-18128-1, "Core Flight Executive Version 6.7"
+#  NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes”
 #
-#  Copyright (c) 2006-2019 United States Government as represented by
-#  the Administrator of the National Aeronautics and Space Administration.
+#  Copyright (c) 2020 United States Government as represented by the
+#  Administrator of the National Aeronautics and Space Administration.
 #  All Rights Reserved.
 #
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
+#  Licensed under the Apache License, Version 2.0 (the "License"); you may
+#  not use this file except in compliance with the License. You may obtain
+#  a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
 #
 #  Unless required by applicable law or agreed to in writing, software
 #  distributed under the License is distributed on an "AS IS" BASIS,
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-# !/usr/bin/env python3
-#
+
 import csv
 import pickle
 import shlex

Subsystems/cmdGui/HTMLDocsParser.py

@@ -1,15 +1,13 @@
 #
-#  GSC-18128-1, "Core Flight Executive Version 6.7"
+#  NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes”
 #
-#  Copyright (c) 2006-2019 United States Government as represented by
-#  the Administrator of the National Aeronautics and Space Administration.
+#  Copyright (c) 2020 United States Government as represented by the
+#  Administrator of the National Aeronautics and Space Administration.
 #  All Rights Reserved.
 #
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
+#  Licensed under the Apache License, Version 2.0 (the "License"); you may
+#  not use this file except in compliance with the License. You may obtain
+#  a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
 #
 #  Unless required by applicable law or agreed to in writing, software
 #  distributed under the License is distributed on an "AS IS" BASIS,

Subsystems/cmdGui/MiniCmdUtil.py

@@ -1,15 +1,13 @@
 #
-#  GSC-18128-1, "Core Flight Executive Version 6.7"
+#  NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes”
 #
-#  Copyright (c) 2006-2019 United States Government as represented by
-#  the Administrator of the National Aeronautics and Space Administration.
+#  Copyright (c) 2020 United States Government as represented by the
+#  Administrator of the National Aeronautics and Space Administration.
 #  All Rights Reserved.
 #
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
+#  Licensed under the Apache License, Version 2.0 (the "License"); you may
+#  not use this file except in compliance with the License. You may obtain
+#  a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
 #
 #  Unless required by applicable law or agreed to in writing, software
 #  distributed under the License is distributed on an "AS IS" BASIS,

Subsystems/cmdGui/Parameter.py

@@ -1,22 +1,21 @@
 #
-#  GSC-18128-1, "Core Flight Executive Version 6.7"
+#  NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes”
 #
-#  Copyright (c) 2006-2019 United States Government as represented by
-#  the Administrator of the National Aeronautics and Space Administration.
+#  Copyright (c) 2020 United States Government as represented by the
+#  Administrator of the National Aeronautics and Space Administration.
 #  All Rights Reserved.
 #
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
+#  Licensed under the Apache License, Version 2.0 (the "License"); you may
+#  not use this file except in compliance with the License. You may obtain
+#  a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
 #
 #  Unless required by applicable law or agreed to in writing, software
 #  distributed under the License is distributed on an "AS IS" BASIS,
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
+
 import getopt
 import pickle
 import re

Subsystems/cmdGui/UdpCommands.py

@@ -1,23 +1,23 @@
+# !/usr/bin/env python3
+
 #
-#  GSC-18128-1, "Core Flight Executive Version 6.7"
+#  NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes”
 #
-#  Copyright (c) 2006-2019 United States Government as represented by
-#  the Administrator of the National Aeronautics and Space Administration.
+#  Copyright (c) 2020 United States Government as represented by the
+#  Administrator of the National Aeronautics and Space Administration.
 #  All Rights Reserved.
 #
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
+#  Licensed under the Apache License, Version 2.0 (the "License"); you may
+#  not use this file except in compliance with the License. You may obtain
+#  a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
 #
 #  Unless required by applicable law or agreed to in writing, software
 #  distributed under the License is distributed on an "AS IS" BASIS,
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-# !/usr/bin/env python3
+
 #
 # UdpCommands.py -- This is a class that creates a simple command dialog and
 #                   sends commands using the cmdUtil UDP C program.

Subsystems/cmdUtil/SendUdp.c

@@ -1,22 +1,20 @@
-/*
-**      GSC-18128-1, "Core Flight Executive Version 6.7"
-**
-**      Copyright (c) 2006-2019 United States Government as represented by
-**      the Administrator of the National Aeronautics and Space Administration.
-**      All Rights Reserved.
-**
-**      Licensed under the Apache License, Version 2.0 (the "License");
-**      you may not use this file except in compliance with the License.
-**      You may obtain a copy of the License at
-**
-**        http://www.apache.org/licenses/LICENSE-2.0
-**
-**      Unless required by applicable law or agreed to in writing, software
-**      distributed under the License is distributed on an "AS IS" BASIS,
-**      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-**      See the License for the specific language governing permissions and
-**      limitations under the License.
-*/
+/************************************************************************
+ * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes”
+ *
+ * Copyright (c) 2020 United States Government as represented by the
+ * Administrator of the National Aeronautics and Space Administration.
+ * All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may obtain
+ * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ************************************************************************/
 
 /*
  * Udp packet send routine

Subsystems/cmdUtil/SendUdp.h

@@ -1,22 +1,21 @@
-/*
-**      GSC-18128-1, "Core Flight Executive Version 6.7"
-**
-**      Copyright (c) 2006-2019 United States Government as represented by
-**      the Administrator of the National Aeronautics and Space Administration.
-**      All Rights Reserved.
-**
-**      Licensed under the Apache License, Version 2.0 (the "License");
-**      you may not use this file except in compliance with the License.
-**      You may obtain a copy of the License at
-**
-**        http://www.apache.org/licenses/LICENSE-2.0
-**
-**      Unless required by applicable law or agreed to in writing, software
-**      distributed under the License is distributed on an "AS IS" BASIS,
-**      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-**      See the License for the specific language governing permissions and
-**      limitations under the License.
-*/
+/************************************************************************
+ * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes”
+ *
+ * Copyright (c) 2020 United States Government as represented by the
+ * Administrator of the National Aeronautics and Space Administration.
+ * All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may obtain
+ * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ************************************************************************/
+
 #ifndef SENDUDP_H
 #define SENDUDP_H