[gnumeric] win32: allow extra options for jhbuild.



commit 008150c541ee0c2074438af7c3507ded4962aaed
Author: Morten Welinder <terra gnome org>
Date:   Sat Nov 16 10:52:57 2013 -0500

    win32: allow extra options for jhbuild.

 tools/win32/ChangeLog |    5 +++++
 tools/win32/build     |    8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/tools/win32/ChangeLog b/tools/win32/ChangeLog
index 1f4957f..7910ccc 100644
--- a/tools/win32/ChangeLog
+++ b/tools/win32/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-16  Morten Welinder  <terra gnome org>
+
+       * build: Allow specifying extra arguments to jhbuild, notably
+       --no-network.
+
 2013-10-07  Morten Welinder <terra gnome org>
 
        * Release 1.12.8
diff --git a/tools/win32/build b/tools/win32/build
index 4e81f91..e8a45b9 100755
--- a/tools/win32/build
+++ b/tools/win32/build
@@ -105,7 +105,7 @@ setup_html_help() {
        ( cd "${JH_PREFIX}/deploy" && \
          makensis gnumeric.nsi )
     elif [ "x${target}" = "xshell" ]; then
-       ${HOME}/bin/jhbuild -f "${srcdir}/jhbuildrc.py" shell
+       ${HOME}/bin/jhbuild -f "${srcdir}/jhbuildrc.py" shell ${JHBUILD}
     elif [ "x${target}" = "xdoc" ]; then
        echo make -C "${srcdir}/../../doc/C" chm
        make -C "${srcdir}/../../doc/C" chm
@@ -114,11 +114,11 @@ setup_html_help() {
        echo exiting
        exit 0
     elif [ ! "x${start}" = "x" ]; then
-       ${HOME}/bin/jhbuild -f "${srcdir}/jhbuildrc.py" build --start-at="${start}"
+       ${HOME}/bin/jhbuild -f "${srcdir}/jhbuildrc.py" build ${JHBUILD} --start-at="${start}"
     elif [ ! "x${module}" = "x" ]; then
-       ${HOME}/bin/jhbuild -f "${srcdir}/jhbuildrc.py" buildone "${module}"
+       ${HOME}/bin/jhbuild -f "${srcdir}/jhbuildrc.py" buildone ${JHBUILD} "${module}"
     else
-       ${HOME}/bin/jhbuild -f "${srcdir}/jhbuildrc.py"
+       ${HOME}/bin/jhbuild -f "${srcdir}/jhbuildrc.py" build ${JHBUILD}
 fi
 
 ################################################################


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]