change build to allow us to specify which acedb RELEASE.XXX directory we want.

scripts/README

@@ -135,6 +135,15 @@ update version)
 
 build_config.sh etc can alter the behaviour.
 
+
+e.g. to use an acedb level other than DEVELOPMENT (the default) edit
+
+ZMAP_ACEDB_RELEASE_DIR=
+
+to point to the XXXXXX part of the ~acedb/RELEASE.XXXXXXX directory
+that you want to use.
+
+
 ********************** N.B. ***************************
 
 Each time we build a new release of zmap we tag the release so we can recreate

scripts/build_bootstrap.sh

@@ -344,7 +344,7 @@ _checkout_message_out "Running ./zmap_build_and_tar.sh $options TAR_TARGET=$tar_
 
 \$SCRIPTS_DIR/zmap_build_and_tar.sh $options TAR_TARGET=$tar_target || _checkout_message_exit "Failed to build"
 
-\$SCRIPTS_DIR/zmap_fetch_acedbbinaries.sh $tar_target || _checkout_message_exit "Failed to get acedb binaries."
+\$SCRIPTS_DIR/zmap_fetch_acedbbinaries.sh $tar_target $ZMAP_ACEDB_RELEASE_DIR || _checkout_message_exit "Failed to get acedb binaries."
 
 # Now we can clean up.
 cd \$ZMAP_BUILD_CONTAINER

scripts/build_config.sh

@@ -120,6 +120,7 @@ ZMAP_RELEASE_LEVEL=DEVELOPMENT
 # RELEASE_SYMLINK is made by zmap_get_release_symlink()
 ZMAP_RELEASE_SYMLINK='~zmap/BUILD.${ZMAP_RELEASE_LEVEL}'
 ZMAP_ACEDB_RELEASE_CONTAINER=~acedb
+ZMAP_ACEDB_RELEASE_DIR=DEVELOPMENT
 ZMAP_ACEDB_BINARIES='tace xace sgifaceserver giface makeUserPasswd blixem blixemh belvu dotter xremote'
 ZMAP_ACEDB_VERSION_DIR=4
 

scripts/zmap_fetch_acedbbinaries.sh

@@ -69,12 +69,15 @@ ACEDB_BUILD_LEVEL=DEVELOPMENT
 if [ "x$2" == "x" ]; then
     zmap_message_err "Defaulting to DEVELOPMENT for acedb build level"
 else
-    case $2 in
-	"DEVELOPMENT"  ) ACEDB_BUILD_LEVEL=$2;;
-	"SUPPORTED"    ) ACEDB_BUILD_LEVEL=$2;;
-	"EXPERIMENTAL" ) ACEDB_BUILD_LEVEL=$2;;
-	* ) zmap_message_exit "build level should be one of DEVELOPMENT|SUPPORTED|EXPERIMENTAL" ;;
-    esac
+#    case $2 in
+#	"DEVELOPMENT"  ) ACEDB_BUILD_LEVEL=$2;;
+#	"SUPPORTED"    ) ACEDB_BUILD_LEVEL=$2;;
+#	"EXPERIMENTAL" ) ACEDB_BUILD_LEVEL=$2;;
+#	* ) zmap_message_exit "build level should be one of DEVELOPMENT|SUPPORTED|EXPERIMENTAL" ;;
+#    esac
+
+    ACEDB_BUILD_LEVEL=$2
+
     let shift_count=$shift_count+1
 fi