[gtk-osx] Bug 700371 -- jhbuild doesn't build
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-osx] Bug 700371 -- jhbuild doesn't build
- Date: Sat, 18 May 2013 18:15:08 +0000 (UTC)
commit a3310b9cabc745596febc6f41fd9f3bf6e1cdba1
Author: John Ralls <jralls ceridwen us>
Date: Sat May 18 11:13:21 2013 -0700
Bug 700371 -- jhbuild doesn't build
Set jhbuild-revision to 07b5a7d, the current master. The last stable
release, 3.4.0, has errors which cause it to not work.
gtk-osx-build-setup.sh | 7 +++++--
jhbuild-revision | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/gtk-osx-build-setup.sh b/gtk-osx-build-setup.sh
index 661c45b..b1604fb 100755
--- a/gtk-osx-build-setup.sh
+++ b/gtk-osx-build-setup.sh
@@ -79,8 +79,11 @@ else
fi
echo "Installing jhbuild..."
-(cd $SOURCE/jhbuild && ./autogen.sh && make -f Makefile.plain DISABLE_GETTEXT=1 install >/dev/null) ||
do_exit "Jhbuild installation failed"
-
+if [ -e "$SOURCE/jhbuild/autogen.sh" ]; then
+ (cd $SOURCE/jhbuild && ./autogen.sh && make -f Makefile.plain DISABLE_GETTEXT=1 install >/dev/null) ||
do_exit "Jhbuild installation failed";
+else
+ (cd $SOURCE/jhbuild && make -f Makefile.plain DISABLE_GETTEXT=1 install >/dev/null) || do_exit "Jhbuild
installation failed";
+fi
echo "Installing jhbuild configuration..."
curl -ks $BASEURL/jhbuildrc-gtk-osx -o $HOME/.jhbuildrc || do_exit "Didn't get jhbuildrc"
curl -ks $BASEURL/jhbuildrc-gtk-osx-fw-10.4 -o $HOME/.jhbuildrc-fw-10.4
diff --git a/jhbuild-revision b/jhbuild-revision
index 1809198..a5840d4 100644
--- a/jhbuild-revision
+++ b/jhbuild-revision
@@ -1 +1 @@
-3.4.0
+07b5a7d
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]