From 47d114ac01363843977eb2578d0008ede5a65731 Mon Sep 17 00:00:00 2001 From: Jason Molenda Date: Thu, 27 Sep 2012 21:26:57 +0000 Subject: [PATCH] Patch from Dan Malea to get the Bourne shells scripts to run cleanly on Ubuntu. llvm-svn: 164801 --- lldb/scripts/Python/build-swig-Python.sh | 38 +++++++++---------- .../scripts/Python/finish-swig-Python-LLDB.sh | 22 +++++------ lldb/scripts/build-swig-wrapper-classes.sh | 12 +++--- lldb/scripts/finish-swig-wrapper-classes.sh | 8 ++-- 4 files changed, 40 insertions(+), 40 deletions(-) diff --git a/lldb/scripts/Python/build-swig-Python.sh b/lldb/scripts/Python/build-swig-Python.sh index 2a1a34bdd5a5..205476472823 100755 --- a/lldb/scripts/Python/build-swig-Python.sh +++ b/lldb/scripts/Python/build-swig-Python.sh @@ -19,7 +19,7 @@ debug_flag=$5 SWIG=$6 os_name=`uname -s` -if [ "$os_name" == "Darwin" ] +if [ "$os_name" = "Darwin" ] then swig_output_file=${SRC_ROOT}/source/LLDBWrapPython.cpp else @@ -40,7 +40,7 @@ if [ "$LLDB_DISABLE_PYTHON" = "1" ] ; then else -if [ -n "$debug_flag" -a "$debug_flag" == "-debug" ] +if [ -n "$debug_flag" -a "$debug_flag" = "-debug" ] then Debug=1 else @@ -148,13 +148,13 @@ INTERFACE_FILES="${SRC_ROOT}/scripts/Python/interface/SBAddress.i"\ " ${SRC_ROOT}/scripts/Python/interface/SBValueList.i"\ " ${SRC_ROOT}/scripts/Python/interface/SBWatchpoint.i" -if [ $Debug == 1 ] +if [ $Debug -eq 1 ] then echo "Header files are:" echo ${HEADER_FILES} fi -if [ $Debug == 1 ] +if [ $Debug -eq 1 ] then echo "SWIG interface files are:" echo ${INTERFACE_FILES} @@ -166,20 +166,20 @@ NeedToUpdate=0 if [ ! -f ${swig_output_file} ] then NeedToUpdate=1 - if [ $Debug == 1 ] + if [ $Debug -eq 1 ] then echo "Failed to find LLDBWrapPython.cpp" fi fi -if [ $NeedToUpdate == 0 ] +if [ $NeedToUpdate -eq 0 ] then for hdrfile in ${HEADER_FILES} do if [ $hdrfile -nt ${swig_output_file} ] then NeedToUpdate=1 - if [ $Debug == 1 ] + if [ $Debug -eq 1 ] then echo "${hdrfile} is newer than ${swig_output_file}" echo "swig file will need to be re-built." @@ -189,14 +189,14 @@ then done fi -if [ $NeedToUpdate == 0 ] +if [ $NeedToUpdate -eq 0 ] then for intffile in ${INTERFACE_FILES} do if [ $intffile -nt ${swig_output_file} ] then NeedToUpdate=1 - if [ $Debug == 1 ] + if [ $Debug -eq 1 ] then echo "${intffile} is newer than ${swig_output_file}" echo "swig file will need to be re-built." @@ -206,12 +206,12 @@ then done fi -if [ $NeedToUpdate == 0 ] +if [ $NeedToUpdate -eq 0 ] then if [ ${swig_input_file} -nt ${swig_output_file} ] then NeedToUpdate=1 - if [ $Debug == 1 ] + if [ $Debug -eq 1 ] then echo "${swig_input_file} is newer than ${swig_output_file}" echo "swig file will need to be re-built." @@ -219,12 +219,12 @@ then fi fi -if [ $NeedToUpdate == 0 ] +if [ $NeedToUpdate -eq 0 ] then if [ ${swig_python_extensions} -nt ${swig_output_file} ] then NeedToUpdate=1 - if [ $Debug == 1 ] + if [ $Debug -eq 1 ] then echo "${swig_python_extensions} is newer than ${swig_output_file}" echo "swig file will need to be re-built." @@ -232,12 +232,12 @@ then fi fi -if [ $NeedToUpdate == 0 ] +if [ $NeedToUpdate -eq 0 ] then if [ ${swig_python_wrapper} -nt ${swig_output_file} ] then NeedToUpdate=1 - if [ $Debug == 1 ] + if [ $Debug -eq 1 ] then echo "${swig_python_wrapper} is newer than ${swig_output_file}" echo "swig file will need to be re-built." @@ -245,12 +245,12 @@ then fi fi -if [ $NeedToUpdate == 0 ] +if [ $NeedToUpdate -eq 0 ] then if [ ${swig_python_typemaps} -nt ${swig_output_file} ] then NeedToUpdate=1 - if [ $Debug == 1 ] + if [ $Debug -eq 1 ] then echo "${swig_python_typemaps} is newer than ${swig_output_file}" echo "swig file will need to be re-built." @@ -260,7 +260,7 @@ fi python_version=`/usr/bin/env python --version 2>&1 | sed -e 's,Python ,,' -e 's,[.][0-9],,2' -e 's,[a-z][a-z][0-9],,'` -if [ "$os_name" == "Darwin" ] +if [ "$os_name" = "Darwin" ] then framework_python_dir="${TARGET_DIR}/LLDB.framework/Resources/Python" else @@ -279,7 +279,7 @@ then fi -if [ $NeedToUpdate == 0 ] +if [ $NeedToUpdate -eq 0 ] then echo "Everything is up-to-date." exit 0 diff --git a/lldb/scripts/Python/finish-swig-Python-LLDB.sh b/lldb/scripts/Python/finish-swig-Python-LLDB.sh index c6c394c28a82..12ffb412567d 100755 --- a/lldb/scripts/Python/finish-swig-Python-LLDB.sh +++ b/lldb/scripts/Python/finish-swig-Python-LLDB.sh @@ -39,7 +39,7 @@ debug_flag=$5 if [ ! "$LLDB_DISABLE_PYTHON" = "1" ] ; then -if [ -n "$debug_flag" -a "$debug_flag" == "-debug" ] +if [ -n "$debug_flag" -a "$debug_flag" = "-debug" ] then Debug=1 else @@ -50,7 +50,7 @@ OS_NAME=`uname -s` PYTHON_VERSION=`/usr/bin/env python --version 2>&1 | sed -e 's,Python ,,' -e 's,[.][0-9],,2' -e 's,[a-z][a-z][0-9],,'` -if [ $Debug == 1 ] +if [ $Debug -eq 1 ] then echo "The current OS is $OS_NAME" echo "The Python version is $PYTHON_VERSION" @@ -59,7 +59,7 @@ fi # # Determine where to put the files. -if [ ${OS_NAME} == "Darwin" ] +if [ ${OS_NAME} = "Darwin" ] then # We are on a Darwin system, so all the lldb Python files can go # into the LLDB.framework/Resources/Python subdirectory. @@ -69,7 +69,7 @@ then echo "Error: Unable to find LLDB.framework" >&2 exit 1 else - if [ $Debug == 1 ] + if [ $Debug -eq 1 ] then echo "Found ${TARGET_DIR}/LLDB.framework." fi @@ -91,7 +91,7 @@ fi # already exist, attempt to make it. # -if [ $Debug == 1 ] +if [ $Debug -eq 1 ] then echo "Python files will be put in ${framework_python_dir}" fi @@ -102,13 +102,13 @@ for python_dir in $python_dirs do if [ ! -d "${python_dir}" ] then - if [ $Debug == 1 ] + if [ $Debug -eq 1 ] then echo "Making directory ${python_dir}" fi mkdir -p "${python_dir}" else - if [ $Debug == 1 ] + if [ $Debug -eq 1 ] then echo "${python_dir} already exists." fi @@ -126,17 +126,17 @@ done if [ ! -L "${framework_python_dir}/_lldb.so" ] then - if [ $Debug == 1 ] + if [ $Debug -eq 1 ] then echo "Creating symlink for _lldb.so" fi - if [ ${OS_NAME} == "Darwin" ] + if [ ${OS_NAME} = "Darwin" ] then cd "${framework_python_dir}" ln -s "../../../LLDB" _lldb.so fi else - if [ $Debug == 1 ] + if [ $Debug -eq 1 ] then echo "${framework_python_dir}/_lldb.so already exists." fi @@ -243,7 +243,7 @@ create_python_package "/formatters" "${package_files}" package_files="${SRC_ROOT}/examples/python/symbolication.py" create_python_package "/utils" "${package_files}" -if [ ${OS_NAME} == "Darwin" ] +if [ ${OS_NAME} = "Darwin" ] then # lldb/macosx package_files="${SRC_ROOT}/examples/python/crashlog.py diff --git a/lldb/scripts/build-swig-wrapper-classes.sh b/lldb/scripts/build-swig-wrapper-classes.sh index 34726eb62d3f..3f0bc2a29d55 100755 --- a/lldb/scripts/build-swig-wrapper-classes.sh +++ b/lldb/scripts/build-swig-wrapper-classes.sh @@ -32,7 +32,7 @@ debug_flag=$5 # Check to see if we are in debug-mode or not. # -if [ -n "$debug_flag" -a "$debug_flag" == "-debug" ] +if [ -n "$debug_flag" -a "$debug_flag" = "-debug" ] then Debug=1 else @@ -49,7 +49,7 @@ then exit 1 fi -if [ $Debug == 1 ] +if [ $Debug -eq 1 ] then echo "Found lldb.swig file" fi @@ -69,7 +69,7 @@ else fi fi -if [ ${SWIG}a == a ] +if [ ${SWIG}a = a ] then echo Error: could not find the swig binary exit 1 @@ -87,7 +87,7 @@ cwd=${SRC_ROOT}/scripts for curlang in $languages do - if [ $Debug == 1 ] + if [ $Debug -eq 1 ] then echo "Current language is $curlang" fi @@ -98,7 +98,7 @@ do continue else - if [ $Debug == 1 ] + if [ $Debug -eq 1 ] then echo "Found $curlang sub-directory" fi @@ -113,7 +113,7 @@ do continue else - if [ $Debug == 1 ] + if [ $Debug -eq 1 ] then echo "Found $curlang build script." echo "Executing $curlang build script..." diff --git a/lldb/scripts/finish-swig-wrapper-classes.sh b/lldb/scripts/finish-swig-wrapper-classes.sh index a9065b202c5c..4c9ef999adc8 100755 --- a/lldb/scripts/finish-swig-wrapper-classes.sh +++ b/lldb/scripts/finish-swig-wrapper-classes.sh @@ -28,7 +28,7 @@ CONFIG_BUILD_DIR=$3 PREFIX=$4 debug_flag=$5 -if [ -n "$debug_flag" -a "$debug_flag" == "-debug" ] +if [ -n "$debug_flag" -a "$debug_flag" = "-debug" ] then Debug=1 else @@ -48,7 +48,7 @@ cwd=${SRC_ROOT}/scripts for curlang in $languages do - if [ $Debug == 1 ] + if [ $Debug -eq 1 ] then echo "Current language is $curlang" fi @@ -59,7 +59,7 @@ do continue else - if [ $Debug == 1 ] + if [ $Debug -eq 1 ] then echo "Found $curlang sub-directory" fi @@ -70,7 +70,7 @@ do if [ -f $filename ] then - if [ $Debug == 1 ] + if [ $Debug -eq 1 ] then echo "Found $curlang post-processing script for LLDB" echo "Executing $curlang post-processing script..."