[gnome-shell] gnome-shell-build-setup.sh: Move default directory to ~/gnome
- From: Owen Taylor <otaylor src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] gnome-shell-build-setup.sh: Move default directory to ~/gnome
- Date: Fri, 5 Oct 2012 17:28:37 +0000 (UTC)
commit b99bb3d4bbe2d589d77ab96172689c4a8f8dac36
Author: Owen W. Taylor <otaylor fishsoup net>
Date: Wed Oct 3 00:17:15 2012 -0400
gnome-shell-build-setup.sh: Move default directory to ~/gnome
gnome-shell-build-setup.sh is generally useful for working on GNOME.
If moving on from hacking on gnome-shell to some other module,
having the checkout location be ~/gnome-shell is a little odd and
cumbersome, so start out checking things out into ~/gnome/source
and installing them into ~/gnome/install.
Add a warning if the old ~/gnome-shell exists to avoid unnecessary
checking out of every module again.
https://bugzilla.gnome.org/show_bug.cgi?id=685355
tools/build/gnome-shell-build-setup.sh | 14 ++++++++++++++
tools/build/jhbuildrc-gnome-shell | 4 ++--
2 files changed, 16 insertions(+), 2 deletions(-)
---
diff --git a/tools/build/gnome-shell-build-setup.sh b/tools/build/gnome-shell-build-setup.sh
index f0c3f28..d546bb4 100755
--- a/tools/build/gnome-shell-build-setup.sh
+++ b/tools/build/gnome-shell-build-setup.sh
@@ -298,6 +298,20 @@ if [ ! -f $HOME/.jhbuildrc-custom ]; then
echo "done"
fi
+if [ -d $HOME/gnome-shell -a \! -d $HOME/gnome ] ; then
+ cat <<EOF
+WARNING:
+ The old source and install directory '$HOME/gnome-shell' exists, but
+ '$HOME/gnome' doesn't. An empty $HOME/gnome will be created.
+
+ To avoid starting again from scratch you should remove the empty directory
+ and move your old '$HOME/gnome-shell' to '$HOME/gnome':
+
+ rm -rf $HOME/gnome
+ mv $HOME/gnome-shell $HOME/gnome
+EOF
+fi
+
echo "Installing modules as system packages when possible"
$HOME/bin/jhbuild sysdeps --install
diff --git a/tools/build/jhbuildrc-gnome-shell b/tools/build/jhbuildrc-gnome-shell
index a4c7fc2..5de3318 100644
--- a/tools/build/jhbuildrc-gnome-shell
+++ b/tools/build/jhbuildrc-gnome-shell
@@ -23,10 +23,10 @@ moduleset = 'gnome-apps-3.6'
modules = [ 'meta-gnome-core-shell' ]
# what directory should the source be checked out to?
-checkoutroot = os.path.expanduser('~/gnome-shell/source')
+checkoutroot = os.path.expanduser('~/gnome/source')
# the prefix to configure/install modules to (must have write access)
-prefix = os.path.expanduser('~/gnome-shell/install')
+prefix = os.path.expanduser('~/gnome/install')
# reduce what we build as much as possible
ignore_suggests = True
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]