Merge after minor bookkeeping error

cobcd

@@ -175,7 +175,6 @@ def Main() :
         print("Use it as you would 'cobc'")
         os._exit(1)
 
-
     ## We need to know the directory that our script is in.
     SCRIPTDIR = os.path.abspath(sys.argv[0]).replace('\\','/').split('/')[0:-1]
     SCRIPTDIR = '/'.join(SCRIPTDIR)
@@ -567,6 +566,42 @@ def Main() :
                 print("Copying",PYTHON,"to",DEST)
             shutil.copyfile(PYTHON,DEST)
 
+#^#  ## And we have a debuggable executable
+#^#
+#^#  ## Some operating systems, notably Windows, require that a
+#^#  ## copy of the Python code be placed next to the executable:
+#^#  if [ "$result" = "0" ]; then
+#^#    if [ -z $DASH_S ] && [ -z $DASH_F ]
+#^#      then
+#^#      ## Because we didn't embed a pointer or the script, we need to
+#^#      ## make a local copy
+#^#      if [ -f $PYTHON ]
+#^#        then
+#^#          if [ -z $PYTHON_DESTINATION ]
+#^#            then
+#^#            ## The destination is the first thing after the -o:
+#^#            PYTHON_DESTINATION=$(echo $FINAL_COMMAND | sed 's/.* -o //' | cut -d ' ' -f 1)
+#^#            PYTHON_DESTINATION=$(realpath $PYTHON_DESTINATION)
+#^#            PYTHON_DESTINATION=$(dirname $PYTHON_DESTINATION)
+#^#            echo $PYTHON_DESTINATION
+#^#            fi
+#^#          if [ -z $PYTHON_NAME ]
+#^#            then
+#^#            PYTHON_NAME="$FILE_ROOT-gdb.py"
+#^#            fi
+#^#
+#^#          if [ $ECHO ]
+#^#            then
+#^#            echo "cp $PYTHON $PYTHON_DESTINATION/$PYTHON_NAME"
+#^#            fi
+#^#        cp $PYTHON $PYTHON_DESTINATION/$PYTHON_NAME
+#^#      else
+#^#        echo ERROR: "Couldn't find a copy of cobcd.py"
+#^#        fi
+#^#      fi
+#^#    fi
+#^#
+>>>>>>> b7073a9eaa22a2b31441155e289452a39c13dbbd
     if COBCDNOCLEAN == "" :
         ## We are supposed to be cleaning up after ourselves:
         DeleteAFile(FILE_S    )

include/version.h

@@ -4,4 +4,4 @@
 // On the Unix side, there is scripting trickery to propogate this version
 // code into cobcd.py and the names of packages when they are created.
 
-#define VERSION "3.14"
+#define VERSION "3.16"

python/cobcd.py

@@ -3319,7 +3319,7 @@ if 'gdb' in sys.modules :
             ## The text "Version x.x" has to appear in square brackets.               #
             ## Don't mess with it!                                                    #
             ###########################################################################
-            print('registering CPrint (Usage is "print  <COBOL identifier>") [Version 3.14]')
+            print('registering CPrint (Usage is "print  <COBOL identifier>") [Version 3.16]')
             self.Worker = CPrintWorker()
             self.TabFile = TabFileInformation();
             self.TabFile.question_mark_range = self.Worker.question_mark_range