Commit 0b2722fa authored by Scott Deboy's avatar Scott Deboy

Adding --introspection argument to build GStreamer with introspection support....

Adding --introspection argument to build GStreamer with introspection support.  Also updating logic supporting checkouts of specific branches
parent 61b8af5b
......@@ -7,13 +7,14 @@ RECONFIGURE=false
UPDATE_MODULES=true
USE_UPSTREAM=false
VERBOSE=false
INSTROSPECTION=false
errors=
while true; do
case "$1" in
-h | --help )
echo "usage: $0 [-h | --help ] [-v | --verbose] [--no-update] [--no-deps] [--upstream]"
echo "usage: $0 [-h | --help ] [-v | --verbose] [--no-update] [--no-deps] [--upstream] [--introspection]"
echo " -h | --help Print this help message."
echo " --branch [branch] The branch to check out."
echo " --no-delibtoolize Don't alter pkg-config files to remove libtool dependency."
......@@ -21,6 +22,7 @@ while true; do
echo " --no-deps Don't install dependencies before building."
echo " --reconfigure Force a reconfigure, even if a Makefile already exists."
echo " --upstream Clone from upstream where possible, instead of our repos (you probably don't want to do this)."
echo " --introspection Enable introspection"
exit;;
-v | --verbose ) VERBOSE=true; shift ;;
--branch ) shift; BRANCH=$1 ; shift ;;
......@@ -29,6 +31,7 @@ while true; do
--no-deps ) INSTALL_DEPS=false; shift ;;
--reconfigure ) RECONFIGURE=true; shift ;;
--upstream ) USE_UPSTREAM=true; shift ;;
--introspection ) INTROSPECTION=true; shift ;;
-- ) shift; break ;;
* ) break ;;
esac
......@@ -126,6 +129,15 @@ for module in ${GST_MODULES[@]} ; do
git clone "git://anongit.freedesktop.org/git/gstreamer/$module"
cd $module
fi
if [ -z "$BRANCH" ] ; then
if [[ "${NO_UPSTREAM_MODULES[@]}" == *"$module"* ]]; then
BRANCH=master
else
BRANCH=ruih/master
fi
fi
echo "Checking out branch $BRANCH"
git checkout $BRANCH || errors="$errors\nUnable to checkout branch: $BRANCH for repo $module"
elif $UPDATE_MODULES ; then
echo "Updating [$module]"
cd $module
......@@ -137,19 +149,20 @@ for module in ${GST_MODULES[@]} ; do
git fetch origin || errors="$errors\nUnable to update remote: origin"
if [ -n "BRANCH" ]; then
if [ -z "$BRANCH" ] ; then
if [[ "${NO_UPSTREAM_MODULES[@]}" == *"$module"* ]]; then
BRANCH=master
else
BRANCH=ruih/master
fi
fi
git checkout $BRANCH || errors="$errors\nUnable to checkout branch: $BRANCH for repo $module"
# -p means "don't remove merges"
git rebase -p origin/$BRANCH $BRANCH || errors="$errors\nUnable to rebase local branch $BRANCH onto remote branch origin/$BRANCH for repo $module"
else
cd $module
if [ -n "$BRANCH" ] ; then
if [ -z "$BRANCH" ] ; then
git checkout $BRANCH || errors="$errors\nUnable to checkout branch: $BRANCH for repo $module"
fi
fi
......@@ -176,7 +189,11 @@ for module in ${GST_MODULES[@]} ; do
if [ -f Makefile ] ; then
make -s clean || true
fi
$GST_PREFIX ./autogen.sh --disable-failing-tests --disable-examples -q
if $INTROSPECTION ; then
$GST_PREFIX ./autogen.sh --disable-failing-tests --disable-examples --enable-introspection -q
else
$GST_PREFIX ./autogen.sh --disable-failing-tests --disable-examples -q
fi
fi
echo "Building [$module]"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment