Appendix of long paper added, optionally we can disable it

Given the referee reports, after discussing with the editors of CiSE, we
decided that it is important to include the complete appendix we had before
that included a thorough review of existing tools and methods. However, the
appendix will not be published in the paper (due to the strict word-count
limit). It will only be used in the arXiv/Zenodo versions of the paper.

This actually created a technical problem: we want the commit hash of the
project source to remain the same when the paper is built with an appendix
or without it.

To fix this problem the choice of including an appendix has gone into the
'project' script as a run-time option called '--no-appendix'. So by default
(when someone just runs './project make'), the PDF will have an appendix,
but when we want to submit to the journal, or when the appendix isn't
needed for a certain reason, we can use this new option. The appendix also
has its own separate bibliography.

Some other corrections made in this commit:
 1. Some new references were added that had an '_' in their source, they
    were corrected in 'references.tex'.
 2. I noticed that 'preamble-style.tex' is not actually used in this paper,
    so it has been deleted.

1 files changed, 6 insertions, 2 deletions

diff --git a/project b/project
index 3af3d40..88aa8fd 100755
--- a/project
+++ b/project
@@ -36,6 +36,7 @@ host_cc=0
 operation=
 build_dir=
 input_dir=
+noappendix=0
 check_config=
 make_targets=
 software_dir=
@@ -119,6 +120,7 @@ Configure and Make options:
   -?, --help               Print this help list.
 
 Make options:
+      --no-appendix        Don't include the appendix in the final paper.
   -d, --debug=FLAGS        Print various types of debugging information.
   -p, --prepare-redo       Re-do preparation (only done automatically once).
 
@@ -205,6 +207,8 @@ do
   #
   # Note that Make's `debug' can take values, but when called without any
   # value, it is like giving it a value of `a'):
+  --no-appendix)          noappendix=1;                                                    shift;;
+  --no-appendix=*)        on_off_option_error --no-appendix;;
   -d|--debug)             if [ x"$2" = x ]; then debug=a;          shift;
                           else debug="$2"; check_v debug "$debug"; shift;shift; fi;;
   -d=*|--debug=*)         debug="${1#*=}";                       check_v debug "$debug";   shift;;
@@ -370,8 +374,8 @@ controlled_env() {
     # Remove all existing environment variables (with `env -i') and only
     # use some pre-defined environment variables, then build the project.
     envmake=".local/bin/env -i HOME=$bdir sys_rm=$(which rm) $gopt"
-    envmake="$envmake .local/bin/make --no-builtin-rules"
-    envmake="$envmake --no-builtin-variables -f $1"
+    envmake="$envmake noappendix=$noappendix .local/bin/make"
+    envmake="$envmake --no-builtin-rules --no-builtin-variables -f $1"
     if ! [ x"$debug" = x  ]; then envmake="$envmake --debug=$debug"; fi
 
     # Set the number of jobs. Note that for the `configure.sh' script the