request tracker stuff

scripts/build_bootstrap.sh

@@ -121,6 +121,8 @@ EOF
 # This both checks out ZMap module and sets variables for use later by this script!
 . ./$gen_checkout_script ||  { echo "Failed to load ./$gen_checkout_script"; exit 1; }
 
+# N.B. $gen_checkout_script is now an absolute path
+
 if [ "x$ZMAP_MASTER_BUILD_DEVELOPMENT_DIR" != "x" ]; then
     # Here we copy from the development dir to the checked out one.  
     _checkout_message_out "*** WARNING: Developing! Using $ZMAP_MASTER_BUILD_DEVELOPMENT_DIR ***"
@@ -166,6 +168,15 @@ ZMAP_RELEASE_VERSION=$($SCRIPTS_DIR/versioner \
 
 zmap_message_out "*** INFORMATION: Version of zmap being built is $ZMAP_RELEASE_VERSION ***"
 
+# This needs to happen _before_ building and _before_ possibly freezing the cvs
+# as we lock the release notes to the binary using a #define
+
+if [ "x$ZMAP_MASTER_RT_RELEASE_NOTES" == "x$ZMAP_TRUE" ]; then
+    $SCRIPTS_DIR/zmap_build_rt_release_notes.sh  || \
+	zmap_message_exit "Failed to build release notes from Request Tracker"
+fi
+
+
 # If requested, tag cvs to 'freeze' the code.
 # Logic is: To tag using  the version _in_  cvs. This would  have been
 # incremented the last time this script was run!
@@ -318,12 +329,6 @@ if [ "x$ZMAP_MASTER_CVS_RELEASE_NOTES" == "x$ZMAP_TRUE" ]; then
     $SCRIPTS_DIR/zmap_build_cvs_release_notes.sh || zmap_message_exit "Failed to successfully build release notes from cvs."
 fi
 
-if [ "x$ZMAP_MASTER_RT_RELEASE_NOTES" == "x$ZMAP_TRUE" ]; then
-    zmap_message_err "Need to code release notes bit..."
-
-    $SCRIPTS_DIR/zmap_build_rt_release_notes.sh  || zmap_message_exit "Failed to build release notes from Request Tracker"
-fi
-
 if [ "x$ZMAP_MASTER_BUILD_DOCS" == "x$ZMAP_TRUE" ]; then
     zmap_message_out "Running $SCRIPTS_DIR/zmap_make_docs $ZMAP_BUILD_CONTAINER..."
 

scripts/build_config.sh

@@ -96,7 +96,7 @@ ZMAP_MASTER_BUILD_DOCS=no
 ZMAP_MASTER_BUILD_DOXYGEN_DOCS=no
 ZMAP_MASTER_BUILD_DIST=yes
 ZMAP_MASTER_CVS_RELEASE_NOTES=no
-ZMAP_MASTER_RT_RELEASE_NOTES=no
+ZMAP_MASTER_RT_RELEASE_NOTES=yes
 ZMAP_MASTER_DOCS2WEB=yes
 ZMAP_MASTER_WEBPUBLISH=no
 ZMAP_MASTER_REMOVE_FOLDER=yes
@@ -109,6 +109,11 @@ ZMAP_MAKE_INSTALL=yes
 ZMAP_RELEASES_DIR=~zmap/BUILDS
 ZMAP_ACEDB_RELEASE_CONTAINER=~acedb
 ZMAP_ACEDB_BINARIES='tace xace sgifaceserver giface makeUserPasswd blixem dotter xremote'
+ZMAP_ACEDB_VERSION_DIR=4
+
+ZMAP_RELEASE_NOTES_TIMESTAMP=LAST_RELEASE_DATE.txt
+ZMAP_VERSION_HEADER=zmapUtils_P.h
+ZMAP_WEBPAGE_HEADER=zmapWebPages.h
 
 WEBPUBLISH=webpublish
 ENSCRIPT_EXE=enscript

scripts/getRTtickets

@@ -15,8 +15,8 @@ usage=" $0 <date> <list of queues>
     queues should be a blank separated list of valid RT queues.
 "
 
+[ "x$start_date" != "x" ] || start_date=$1
 
-start_date=$1
 if [ -z "$start_date" ] ; then
   echo $usage
   exit 1
@@ -24,7 +24,7 @@ fi
 shift
 
 # A list of blank separated queues is allowed.
-OPS_QUEUES="$*"
+[ "x$OPS_QUEUES" != "x" ] || OPS_QUEUES="$*"
 if  [ -z "$OPS_QUEUES" ] ; then
   echo $usage
   exit 1