Install dependencies, unified removal of failures & build only current system

Author: piranna

install-dependencies.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+#
+# This file install the system dependencies needed to build QEmu. It should be
+# of interest only when generating prebuild releases
+#
+
+set -o pipefail
+
+APT='apt-get -qq -y'
+
+# Update cache
+#dpkg --add-architecture i386  &&
+#dpkg --add-architecture amd64 &&
+$APT update                   || exit 1
+
+#$APT install libsdl1.2-dev:i386  zlib1g-dev:i386  \
+#             libsdl1.2-dev:amd64 zlib1g-dev:amd64 || exit 20
+$APT install libsdl1.2-dev zlib1g-dev || exit 20

scripts/BigRedButton

@@ -1,8 +1,13 @@
 #!/usr/bin/env bash
 
 
-MACHINE=i686   npm run build || exit 1
-MACHINE=x86_64 npm run build || exit 2
+#
+# Generate prebuilds
+#
+
+npm run build || exit 1
+#MACHINE=i686   npm run build || exit 1
+#MACHINE=x86_64 npm run build || exit 2
 
 
 #

scripts/build

@@ -9,8 +9,6 @@ QEMU_VERSION=`node -p "require('./package.json').version"`
 
 QEMU_URL=http://wiki.qemu-project.org/download/qemu-$QEMU_VERSION.tar.bz2
 
-SRC_DIR=`pwd`/deps/qemu
-
 
 if [[ -z $JOBS ]]; then
   JOBS=$((`getconf _NPROCESSORS_ONLN` + 1))
@@ -22,12 +20,14 @@ fi
 case $MACHINE in
   i[345678]86)
     ARCH=ia32
-    CC="$CC -m32"
+#    CC="cc -m32"
+#    CXX="cpp -m32"
   ;;
 
   x86_64)
     ARCH=x64
-    CC="$CC -m64"
+#    CC="cc -m64"
+#    CXX="cpp -m64"
   ;;
 
   *)
@@ -53,38 +53,55 @@ case $OS in
 esac
 
 
+function rmStep(){
+  rm -rf $1
+  rmdir -p --ignore-fail-on-non-empty `dirname $1`
+}
+
 # Clean object dir and return the input error
 function err(){
-  rm -rf $OBJ_DIR
-  rmdir -p --ignore-fail-on-non-empty `dirname $OBJ_DIR`
+  rmStep $STEP_DIR
   exit $1
 }
 
 
+#
+# Define steps paths
+#
+
+SRC_DIR=`pwd`/deps/qemu
+OBJ_DIR=`pwd`/build/$MACHINE
+OUT_DIR=`pwd`
+PREBUILD=`pwd`/prebuilds/$PLATFORM-$ARCH.tar.gz
+
+
 #
 # Download QEmu
 #
 
-OBJ_DIR=$SRC_DIR
+STEP_DIR=$SRC_DIR
+
+if [[ ! -d $STEP_DIR ]]; then
+  mkdir -p $STEP_DIR || exit 3
 
-if [[ ! -d $OBJ_DIR ]]; then
-  mkdir -p $OBJ_DIR || exit 3
+  rmStep $OBJ_DIR
 
-  curl $QEMU_URL | tar -xj --strip-components=1 -C $OBJ_DIR || err 4
+  curl $QEMU_URL | tar -xj --strip-components=1 -C $STEP_DIR || err 4
 fi
 
 
 #
 # Build qemu
 #
 
-OBJ_DIR=`pwd`/build/$MACHINE
-OUT_DIR=`pwd`
+STEP_DIR=$OBJ_DIR
 
-if [[ ! -d $OBJ_DIR ]]; then
+if [[ ! -d $STEP_DIR ]]; then
   (
-    mkdir -p $OBJ_DIR &&
-    cd       $OBJ_DIR || exit 5
+    mkdir -p $STEP_DIR &&
+    cd       $STEP_DIR || exit 5
+
+    rmStep $PREBUILD
 
     $SRC_DIR/configure --prefix=$OUT_DIR          \
                        --cpu=$MACHINE             \
@@ -95,13 +112,15 @@ if [[ ! -d $OBJ_DIR ]]; then
 
     make -j$JOBS &&
     make install || exit 7
-  ) #|| err $?
+  ) || err $?
 fi
 
 
 #
 # Pack qemu in a node-gyp compatible way
 #
 
-mkdir -p prebuilds                                                    &&
-tar -cf - bin libexec share | gzip > prebuilds/$PLATFORM-$ARCH.tar.gz || exit 8
+STEP_DIR=$PREBUILD
+
+mkdir -p prebuilds                             &&
+tar -cf - bin libexec share | gzip > $PREBUILD || err 8