Skip to content
Snippets Groups Projects
Commit 679d07b9 authored by edgrif's avatar edgrif
Browse files

make build scripts use ACEDB_MACHINE env variable, simpler, more robust.

parent ada321a4
No related branches found
No related tags found
No related merge requests found
......@@ -12,6 +12,3 @@ PATH=$GTK_PREFIX/bin:$PATH
# This shouldn't get overwritten.
PKG_CONFIG=$GTK_PREFIX/bin/pkg-config
# So we look for LINUX_64 when fetching acedb binaries...
ZMAP_ACEDB_VERSION_DIR="64"
......@@ -16,9 +16,7 @@ PATH=$GTK_PREFIX/bin:$PATH
ACLOCAL_FLAGS="-I $GTK_PREFIX/share/aclocal"
PKG_CONFIG=$GTK_PREFIX/bin/pkg-config
# remove universal build junk.....
UNIVERSAL_BUILD=no
if [ "x$UNIVERSAL_BUILD" == "xyes" ]; then
ZMAP_ACEDB_VERSION_DIR=UNIVERSAL
fi
......@@ -17,6 +17,3 @@ PKG_CONFIG=$GTK_PREFIX/bin/pkg-config
UNIVERSAL_BUILD=no
if [ "x$UNIVERSAL_BUILD" == "xyes" ]; then
ZMAP_ACEDB_VERSION_DIR=UNIVERSAL
fi
......@@ -129,12 +129,14 @@ ZMAP_RELEASES_DIR=~zmap/BUILDS
ZMAP_RELEASE_LEVEL=DEVELOPMENT
# RELEASE_SYMLINK is made by zmap_get_release_symlink()
ZMAP_RELEASE_SYMLINK='~zmap/BUILD.${ZMAP_RELEASE_LEVEL}'
# acedb stuff
ZMAP_ACEDB_RELEASE_CONTAINER=~acedb
if [ -z "$ZMAP_ACEDB_RELEASE_DIR" ] ; then
ZMAP_ACEDB_RELEASE_DIR='DEVELOPMENT'
fi
ZMAP_ACEDB_BINARIES='tace xace sgifaceserver giface makeUserPasswd blixem blixemh belvu dotter xremote'
ZMAP_ACEDB_VERSION_DIR=4
ZMAP_RELEASE_NOTES_TIMESTAMP=LAST_RELEASE_DATE.txt
ZMAP_VERSION_HEADER=zmapUtils_P.h
......@@ -142,6 +144,7 @@ ZMAP_WEBPAGE_HEADER=zmapWebPages.h
ZMAP_RELEASE_FILE_PREFIX=release_notes
ZMAP_RELEASE_FILE_SUFFIX=shtml
WEBPUBLISH=webpublish
ENSCRIPT_EXE=enscript
ENSCRIPT_OUTPUT_FLAG=-W
......
......@@ -14,6 +14,13 @@ set -o history
. $BASE_DIR/build_config.sh || { echo "Failed to load build_config.sh"; exit 1; }
if [ "x$ACEDB_MACHINE" == "x" ]; then
zmap_message_err "The ENV variable ACEDB_MACHINE is not set so the acedb binaries cannot be found."
zmap_message_exit "."
fi
# Usage
# zmap_fetch_acedbbinaries.sh <Target Release Dir> [acedb level]
......@@ -42,7 +49,6 @@ if [ "x$1" == "x" ]; then
zmap_message_err ""
zmap_message_err "Command line variables:"
zmap_message_err " ZMAP_ACEDB_RELEASE_CONTAINER path to find RELEASE.<level> [$ZMAP_ACEDB_RELEASE_CONTAINER]"
zmap_message_err " ZMAP_ACEDB_VERSION_DIR the part of the release dir after the _ e.g. 4 in _4 [$ZMAP_ACEDB_VERSION_DIR]"
zmap_message_exit "."
else
let shift_count=$shift_count+1
......@@ -88,22 +94,18 @@ if [ $# -gt 0 ]; then
eval "$*"
fi
# ===================== MAIN PART ======================
# Get our machine type. Acedb uses upper cased name.
ZMAP_ARCH=$(uname -ms | sed -e 's/ /_/g')
ACEDB_ARCH=$(uname | tr [:lower:] [:upper:])
# We could use ACEDB_MACHINE from acedb .cshrc
# acedb now has UNIVERSAL builds for mac. We need to check out if we're doing that
# The only that changes is the _4, _64, _UNIVERSAL so we set that here.
# Get machine architecture in zmap format.
ZMAP_ARCH=$(uname -ms | sed -e 's/ /_/g')
ACEDB_VERSION=$ZMAP_ACEDB_VERSION_DIR
[ "x$ACEDB_VERSION" != "x" ] || ACEDB_VERSION=4
# We get machine architecture for acedb from $ACEDB_MACHINE env. variable.
zmap_message_out "Using '$ZMAP_ARCH' for zmap architecture dir."
zmap_message_out "Using '$ACEDB_ARCH' for acedb architecture dir."
zmap_message_out "Using '$ACEDB_VERSION' for acedb version."
zmap_message_out "Using '$ACEDB_MACHINE' for acedb architecture dir."
# make sure the target of the symlinks exists
if [ "x$TAR_TARGET_HOST" != "x" ]; then
......@@ -136,7 +138,7 @@ zmap_message_out "$ZMAP_ACEDB_RELEASE_CONTAINER/RELEASE.$ACEDB_BUILD_LEVEL point
# Finalise the source and target directories.
TARGET=${TARGET_RELEASE_DIR}/${ZMAP_ARCH}/bin
SOURCE=${ZMAP_ACEDB_RELEASE_CONTAINER}/RELEASE.${ACEDB_BUILD_LEVEL}/bin.${ACEDB_ARCH}_${ACEDB_VERSION}
SOURCE=${ZMAP_ACEDB_RELEASE_CONTAINER}/RELEASE.${ACEDB_BUILD_LEVEL}/bin.$ACEDB_MACHINE
if [ "x$ZMAP_MASTER_HOST" != "x" ]; then
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment