"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "scripts/install_cppcheck.sh" between
xrdp-0.9.13.1.tar.gz and xrdp-0.9.14.tar.gz

About: xrdp is a remote desktop protocol (rdp) server (accepting connections from rdesktop and Microsoft’s own terminal server / remote desktop clients).

install_cppcheck.sh  (xrdp-0.9.13.1):install_cppcheck.sh  (xrdp-0.9.14)
skipping to change at line 52 skipping to change at line 52
rm $log rm $log
fi fi
# Re-enable `set -e` if active before # Re-enable `set -e` if active before
$set_entry_opts $set_entry_opts
return $status return $status
} }
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
# C R E A T E Z 3 V E R S I O N H
#
# Older versions of libz3-dev do not come packaged with z3_version.h. This
# function uses the z3 command to create a copy of this file in the
# cppcheck i#externalsi# directory.
# ----------------------------------------------------------------------------
create_z3_version_h()
{
set -- `z3 --version`
if [ $# != 3 -o "$1/$2" != Z3/version ]; then
echo "** Unexpected output from z3 command '$*'" >&2
false
else
z3ver=$3 ; # e.g. 4.4.3
set -- `echo $z3ver | tr '.' ' '`
if [ $# != 3 ]; then
echo "** Unable to determine Z3 version from '$z3ver'" >&2
false
else
{
echo "#ifndef Z3_MAJOR_VERSION"
echo "#define Z3_MAJOR_VERSION $1"
echo "#endif"
echo
echo "#ifndef Z3_MINOR_VERSION"
echo "#define Z3_MINOR_VERSION $2"
echo "#endif"
echo
echo "#ifndef Z3_BUILD_NUMBER"
echo "#define Z3_BUILD_NUMBER $3"
echo "#endif"
} >externals/z3_version.h
echo " - Created z3_version.h for $1.$2.$3"
fi
fi
}
# ----------------------------------------------------------------------------
# M A I N # M A I N
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
if [ $# -ne 2 ]; then if [ $# -ne 2 ]; then
usage usage
exit 1 exit 1
fi fi
REPO_URL="$1" REPO_URL="$1"
CPPCHECK_VER="$2" CPPCHECK_VER="$2"
# Already installed? # Already installed?
skipping to change at line 81 skipping to change at line 119
exit 1 exit 1
fi fi
# Use a sub-process for the next bit to restrict the scope of 'set -e' # Use a sub-process for the next bit to restrict the scope of 'set -e'
( (
set -e ; # Exit sub-process on first error set -e ; # Exit sub-process on first error
# Put everything in this directory # Put everything in this directory
FILESDIR=$INSTALL_ROOT/$CPPCHECK_VER FILESDIR=$INSTALL_ROOT/$CPPCHECK_VER
# CFGDIR is needed for cppcheck before 1.86
make_args="FILESDIR=$FILESDIR PREFIX=$FILESDIR CFGDIR=$FILESDIR"
# See https://stackoverflow.com/questions/ # See https://stackoverflow.com/questions/
# 791959/download-a-specific-tag-with-git # 791959/download-a-specific-tag-with-git
git clone -b $CPPCHECK_VER --depth 1 $REPO_URL $workdir git clone -b $CPPCHECK_VER --depth 1 $REPO_URL $workdir
cd $workdir cd $workdir
case "$CPPCHECK_VER" in
1.*)
# CFGDIR is needed for cppcheck before 1.86
make_args="FILESDIR=$FILESDIR PREFIX=$FILESDIR CFGDIR=$FILESDIR"
;;
*) make_args="FILESDIR=$FILESDIR PREFIX=$FILESDIR USE_Z3=yes"
if [ ! -f /usr/include/z3_version.h ]; then
create_z3_version_h
fi
esac
echo "Making cppcheck..." echo "Making cppcheck..."
# CFGDIR is needed for cppcheck before 1.86 # CFGDIR is needed for cppcheck before 1.86
call_make $make_args call_make $make_args
echo "Installing cppcheck..." echo "Installing cppcheck..."
mkdir -p $FILESDIR mkdir -p $FILESDIR
call_make install $make_args call_make install $make_args
) )
status=$? status=$?
 End of changes. 3 change blocks. 
3 lines changed or deleted 50 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)