Simply passing jhbuildrc to jhbuild will start a complete build with the same locations used previously, namely ~/xorg and ~/xorg-build. These locations can be easily changed by specifying paths in the configuration section.
Signed-off-by: Dirk Wallenstein <[email protected]> --- jhbuildrc | 69 +++++++++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 56 insertions(+), 13 deletions(-) diff --git a/jhbuildrc b/jhbuildrc index de6a037..6e795f0 100644 --- a/jhbuildrc +++ b/jhbuildrc @@ -1,22 +1,65 @@ # how to use this file? # -# mkdir -p $HOME/xorg/util -# git clone git://anongit.freedesktop.org/git/xorg/util/modular/ $HOME/xorg/util/modular -# jhbuild -f $HOME/xorg/util/modular/jhbuildrc -# -# Source tree will be in $HOME/xorg -# Binaries will be in $HOME/xorg-build -# +# Make a copy of this file and fill in the two configuration variables, or +# leave them empty to use the defaults. Then start the build process with: +# $> jhbuild -f <your-edited-copy-of-this-file> + +# Passing this file to jhbuild will automatically create the source path and +# clone the modular repository to obtain the module list. + +#-------- Configuration ------------------------------------------ + +# Specify the destination path for the sources. +# An empty string will select '~/xorg'. +# You may use a '~' or '~user' preamble. +checkoutroot = "" + +# Specify the destination path for the installation. +# An empty string will select '~/xorg-build'. +# You may use a '~' or '~user' preamble. +prefix = "" + + +#-------- Internal ----------------------------------------------- + +# Notes: +# 'prefix' will be created by jhbuild itself. + + +# Fallback to the default for prefix, or expand possible '~user' spec +if len(prefix): + prefix = os.path.expanduser( prefix ) +else: + prefix = os.path.join(os.environ['HOME'], 'xorg-build') + +# Fallback to the default for checkoutroot, or expand possible '~user' spec +if len(checkoutroot): + checkoutroot = os.path.expanduser( checkoutroot ) +else: + checkoutroot = os.environ['HOME'] + + + +# Checkout util/modular if nonexistent +modular_destination = os.path.join( checkoutroot , 'xorg' , 'util' , 'modular') + +if not os.path.exists( modular_destination ): + try: + os.makedirs( modular_destination ) + except OSError, error: + sys.exit( "Could not create the path to the modular repo (%s). " + "The error is : %s" % ( modular_destination , error ) ) + if os.system( "git clone git://anongit.freedesktop.org/git/xorg/util/modular/" + " '%s'" % modular_destination ) != 0: + sys.exit( "Could not clone util/modular" ) + + -#moduleset = 'http://cgit.freedesktop.org/xorg/util/modular/blob/xorg.modules' -# Requires the module set be in $HOME/xorg/util/modular/ -moduleset = os.path.join(os.environ['HOME'], 'xorg', 'util', 'modular', 'xorg.modules') +#moduleset = 'http://cgit.freedesktop.org/xorg/util/modular/xorg.modules' +moduleset = os.path.join( modular_destination , 'xorg.modules') modules = [ 'xorg' ] -# All modules will be in $HOME/xorg/ after the checkout -checkoutroot = os.environ['HOME'] -prefix = os.path.join(os.environ['HOME'], 'xorg-build') os.environ['ACLOCAL'] = 'aclocal -I ' + os.path.join(prefix, 'share', 'aclocal') os.environ['PKG_CONFIG_PATH'] = os.path.join(prefix, 'lib', 'pkgconfig') \ + ':' + os.path.join(prefix, 'share', 'pkgconfig') -- 1.7.0.3 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
