Changeset 3043064 for scripts

Timestamp:

May 30, 2009, 2:51:12 PM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

33539f7

Parents:

c50f589

Message:

scripts/locker-build: use --program-suffix instead of EXE

Update our build script to use the new --program-suffix option to set the
installed binary name to "barnowl-$VERSION", instead of setting the
Makefile variable EXE. At the same time, update it to automatically
detect the version from owl.h, instead of taking it as an argument.

File:

• scripts/locker-build (modified) (7 diffs)

scripts/locker-build

@@ -4 +4 @@
 # Build script to build BarnOwl for the locker.
 
-# Usage: locker-build [-n] [-o OUTPUT-TGZ] VERSION SOURCE-TARBALL
+# Usage: locker-build [-n] [-o OUTPUT-TGZ] SOURCE-TARBALL
 # -n is a dry-run, and drops to a shell in the build directory
 # -o does the install into a temporary directory and tars it into the
 #    specified tarball instead.
 # SOURCE-TARBALL is a source tarball, created by do-release
-# VERSION should be of the form 'barnowl-VERSION'
-#
-# TODO: Scrape $VERSION from the tarball
 
 die() {
@@ -25 +22 @@
 
 usage () {
-    echo "Usage: $0 [-n] [-o OUTPUT-TGZ] VERSION SOURCE-TARBALL"
+    echo "Usage: $0 [-n] [-o OUTPUT-TGZ] SOURCE-TARBALL"
     exit 2;
 }
@@ -52 +49 @@
 done
 
-NAME="$1"
-SRC_TGZ="$2"
+SRC_TGZ="$1"
 
-test -z "$NAME" && usage
 test -z "$SRC_TGZ"  && usage
 
@@ -80 +75 @@
 (
     cd "$TMPDIR"/* || die "Unable to cd to $TMPDIR"
+    VERS=$(perl -ne 'print $1 if m{^#define\s*OWL_VERSION_STRING\s*"([^"]+)"}' owl.h)
+    test -z "$VERS" && die "Unable to detect barnowl version."
+
+    echo "Building BarnOwl version $VERS"
 
     BARNOWL="/afs/sipb.mit.edu/project/barnowl/arch/$ATHENA_SYS"
@@ -87 +86 @@
         LDFLAGS="-L$BARNOWL/lib -Wl,-R$BARNOWL/lib" \
         ./configure --exec-prefix="/mit/barnowl/arch/$ATHENA_SYS" \
-        --prefix="/mit/barnowl/builds/$NAME" --mandir=/mit/barnowl/man \
+        --prefix="/mit/barnowl/builds/barnowl-$VERS" --mandir=/mit/barnowl/man \
+        --program-suffix="-$VERS" \
         PROTECT_CFLAGS=-fno-stack-protector \
         || die "configure failed"
@@ -98 +98 @@
     fi
 
-    $MAKE -j$CPUS EXE=$NAME all || die "make failed"
+    $MAKE -j$CPUS all || die "make failed"
 
     if [ -n "$DRYRUN" ]; then
@@ -106 +106 @@
         if [ -n "$OUT_TGZ" ]; then
             mkdir tgz
-            $MAKE EXE=$NAME DESTDIR=tgz install || die "Install failed"
+            $MAKE DESTDIR=tgz install || die "Install failed"
         else
-            $MAKE EXE=$NAME install || die "Install failed"
+            $MAKE install || die "Install failed"
         fi
     fi