[pitivi] Clarify a bit the comments
- From: Jean-François Fortin Tam <jfft src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] Clarify a bit the comments
- Date: Thu, 30 May 2013 20:45:39 +0000 (UTC)
commit a1e7a93fb0e9f5946c74260c1b48c9aefa77ec98
Author: Alexandru Băluț <alexandru balut gmail com>
Date: Sun Mar 10 01:40:05 2013 +0100
Clarify a bit the comments
bin/pitivi-git-environment.sh | 34 ++++++++++++++++------------------
1 files changed, 16 insertions(+), 18 deletions(-)
---
diff --git a/bin/pitivi-git-environment.sh b/bin/pitivi-git-environment.sh
index 682de1f..577e970 100755
--- a/bin/pitivi-git-environment.sh
+++ b/bin/pitivi-git-environment.sh
@@ -1,26 +1,25 @@
#!/bin/bash -i
# Indentation = 4 spaces.
#
-# This script sets up the environment to use and develop pitivi with an
-# uninstalled git checkout of pitivi and GES.
+# This script sets up the environment to use and develop Pitivi.
#
-# It will set up LD_LIBRARY_PATH, DYLD_LIBRARY_PATH, PKG_CONFIG_PATH,
-# to prefer the uninstalled versions but also contain the installed ones.
+# The git projects will be cloned in ~/pitivi-git, unless you specify
+# a different directory, for example:
+# MYPITIVI=~/dev/pitivi pitivi-git-environment.sh
#
-# You can change the MYPITIVI variable your preferred location, that either:
-# + contains your own build of pitivi, ges, gst-python, etc.
-#
-# + an empty location where you have R+W access, so that the script
-# can set up everything for you (recommended).
-# Either set $MYPITIVI in your ~/.bashrc, or edit the line below:
+# LD_LIBRARY_PATH, DYLD_LIBRARY_PATH, PKG_CONFIG_PATH are set to
+# prefer the cloned git projects and to also allow using the installed ones.
+
MYPITIVI=${MYPITIVI:-$HOME/pitivi-git}
-# Change this variable to 'master' if you prefer to work with the master branch
+
+# Change this variable to 'master' if you prefer to work with the master branch.
# When using "master", this script will automatically "pull --rebase" modules.
-# This will fail and check master in the end
-# Using master until we depend on a released version
+# For now, we are using master until we depend on a released version.
GST_RELEASE_TAG="master"
+
# If you care about building the GStreamer/GES developer API documentation:
BUILD_DOCS=false
+
# Here are some dependencies for building GStreamer and GES. If they're missing,
# we'll fetch the git repositories at the given version tag and compile.
# If you set those variables to "master", it will grab the latest dev version
@@ -28,6 +27,7 @@ GLIB_RELEASE_TAG="2.34.2" # "gobject-introspection" needs glib > 2.32
PYGOBJECT_RELEASE_TAG="3.8.0"
GOBJECT_INTROSPECTION_RELEASE_TAG="GOBJECT_INTROSPECTION_1_34_2"
+
#
# Everything below this line shouldn't be edited!
#
@@ -39,16 +39,14 @@ if pkg-config glib-2.0 --atleast-version=$GLIB_RELEASE_TAG; then
else
MODULES_CORE="glib gobject-introspection pygobject"
fi
-# Do NOT use the following two variables directly, use $MODULES instead
-MODULES_ALL="gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad gst-ffmpeg gnonlin
gst-editing-services gst-python"
-MODULES_MINIMAL="gnonlin gst-editing-services gst-python"
+
# The following decision has to be made before we've set any env variables,
# otherwise the script will detect our "gst uninstalled" and think it's the
# system-wide install.
if pkg-config --exists --print-errors 'gstreamer-1.0 >= 1.1.0.1'; then
- MODULES=$MODULES_MINIMAL
+ MODULES="gnonlin gst-editing-services gst-python"
else
- MODULES=$MODULES_ALL
+ MODULES="gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad gst-ffmpeg gnonlin
gst-editing-services gst-python"
fi
# base path under which dirs are installed
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]