From 9d9ac15b69530edd83c1b95f98a70efa8f98a27a Mon Sep 17 00:00:00 2001 From: philwo Date: Wed, 21 Jun 2017 15:25:10 +0200 Subject: Use getopt to parse process-wrapper's command-line. This will allow us to add new and optional flags like selecting a strategy used to spawn / wait for the child process. No one except Bazel should be calling "process-wrapper" and I couldn't find any references, so this breaking change should be fine. PiperOrigin-RevId: 159685867 --- scripts/bootstrap/compile.sh | 36 ------------------------------------ 1 file changed, 36 deletions(-) (limited to 'scripts/bootstrap') diff --git a/scripts/bootstrap/compile.sh b/scripts/bootstrap/compile.sh index 3fcffba31e..6ca0e85b38 100755 --- a/scripts/bootstrap/compile.sh +++ b/scripts/bootstrap/compile.sh @@ -233,42 +233,6 @@ cp $1 $2/MANIFEST EOF chmod 0755 ${ARCHIVE_DIR}/_embedded_binaries/build-runfiles${EXE_EXT} -log "Creating process-wrapper..." -cat <<'EOF' >${ARCHIVE_DIR}/_embedded_binaries/process-wrapper${EXE_EXT} -#!/bin/sh -# Dummy process wrapper, does not support timeout -shift 2 -stdout="$1" -stderr="$2" -shift 2 - -if [ "$stdout" = "-" ] -then - if [ "$stderr" = "-" ] - then - "$@" - exit $? - else - "$@" 2>"$stderr" - exit $? - fi -else - if [ "$stderr" = "-" ] - then - "$@" >"$stdout" - exit $? - else - "$@" 2>"$stderr" >"$stdout" - exit $? - fi -fi - - -"$@" -exit $? -EOF -chmod 0755 ${ARCHIVE_DIR}/_embedded_binaries/process-wrapper${EXE_EXT} - function build_jni() { local -r output_dir=$1 -- cgit v1.2.3