[Xquartz-changes] [515] tinderbox
source_changes at macosforge.org
source_changes at macosforge.org
Wed Mar 23 19:14:49 PDT 2011
Revision: 515
http://trac.macosforge.org/projects/xquartz/changeset/515
Author: jeremyhu at freedesktop.org
Date: 2011-03-23 19:14:47 -0700 (Wed, 23 Mar 2011)
Log Message:
-----------
Cleanup the tinderbox script for better cross-platform support
Modified Paths:
--------------
tinderbox/tinderbox_test.sh
tinderbox/xorg.modules
Added Paths:
-----------
tinderbox/jhbuildrc.linux
tinderbox/jhbuildrc.xquartz
Removed Paths:
-------------
tinderbox/jhbuildrc
Deleted: tinderbox/jhbuildrc
===================================================================
--- tinderbox/jhbuildrc 2011-03-23 16:49:15 UTC (rev 514)
+++ tinderbox/jhbuildrc 2011-03-24 02:14:47 UTC (rev 515)
@@ -1,40 +0,0 @@
-# Outside requirements: freeype, xmlto
-
-#moduleset = 'http://cgit.freedesktop.org/xorg/util/modular/blob/xorg.modules'
-moduleset = os.path.join(os.environ['HOME'], 'src', 'freedesktop', 'jhbuild', 'xorg.modules')
-
-modules = [ 'xquartz' ]
-
-skip = [ 'xorg-drivers', 'xdriinfo', 'libdrm', 'libpciaccess', 'libGL', 'fontconfig', 'xkeyboard-config' ]
-
-# All modules will be in $HOME/src/freedesktop/jhbuild after the checkout
-os.environ['JHBUILDDIR'] = os.path.join(os.environ['HOME'], 'src', 'freedesktop', 'jhbuild')
-
-checkoutroot = os.path.join(os.environ['JHBUILDDIR'] , 'src');
-prefix = os.path.join(os.environ['JHBUILDDIR'], 'build');
-
-os.environ['EXTERN_PREFIX'] = os.path.join(os.environ['JHBUILDDIR'], 'external', 'build')
-
-os.environ['PKG_CONFIG_PATH'] = os.path.join(prefix, 'share', 'pkgconfig') + ':' + os.path.join(prefix, 'lib', 'pkgconfig') + ':/usr/share/pkgconfig:/usr/lib/pkgconfig:' + os.path.join(os.environ['EXTERN_PREFIX'], 'share', 'pkgconfig') + ':' + os.path.join(os.environ['EXTERN_PREFIX'], 'lib', 'pkgconfig');
-
-os.environ['LIBTOOLIZE'] = '/opt/local/bin/glibtoolize'
-os.environ['ACLOCAL'] = '/opt/local/bin/aclocal -I /usr/local/share/aclocal -I ' + os.path.join(prefix, 'share', 'aclocal')
-os.environ['AUTOCONF'] = '/opt/local/bin/autoconf'
-os.environ['AUTOMAKE'] = '/opt/local/bin/automake'
-
-#os.environ['GROFF'] = '/opt/local/bin/groff'
-#os.environ['XMLTO'] = '/opt/local/bin/xmlto'
-#os.environ['ASCIIDOC'] = '/opt/local/bin/asciidoc'
-#os.environ['DOXYGEN'] = '/opt/local/bin/doxygen'
-#os.environ['FOP'] = '/opt/local/bin/fop'
-#os.environ['FOP_OPTS'] = '-Xmx2048m -Djava.awt.headless=true'
-#os.environ['PS2PDF'] = '/opt/local/bin/ps2pdf'
-
-os.environ['CC'] = '/opt/llvm/bin/clang'
-os.environ['CXX'] = '/opt/llvm/bin/clang++'
-
-os.environ['CFLAGS'] = '-O0 -pipe -Wall -Wformat=2 -arch i386 -arch x86_64'
-
-os.environ['CPPFLAGS'] = '-I' + os.path.join(prefix, 'include')
-
-autogenargs='--without-xf86misc --without-fop --without-xmlto --without-doxygen --without-asciidoc --without-groff --disable-specs --disable-devel-docs --disable-docs --with-dtrace --disable-static --disable-dependency-tracking --with-launchagents-dir=' + os.path.join(prefix, 'Library', 'LaunchAgents') + ' --with-launchdaemons-dir=' + os.path.join(prefix, 'Library', 'LaunchDaemons') + ' --with-apple-applications-dir=' + os.path.join(prefix, 'Applications')
Copied: tinderbox/jhbuildrc.linux (from rev 514, tinderbox/jhbuildrc)
===================================================================
--- tinderbox/jhbuildrc.linux (rev 0)
+++ tinderbox/jhbuildrc.linux 2011-03-24 02:14:47 UTC (rev 515)
@@ -0,0 +1,13 @@
+# Outside requirements: freeype, libpng
+
+#moduleset = 'http://cgit.freedesktop.org/xorg/util/modular/blob/xorg.modules'
+moduleset = os.path.join(os.environ['JHBUILDDIR'], 'xorg.modules')
+
+modules = [ 'xorg-jeremyhu-tinderbox' ]
+
+# skip = [ 'xorg-drivers', 'xdriinfo', 'libdrm', 'libpciaccess', 'libGL', 'fontconfig', 'xkeyboard-config' ]
+
+checkoutroot = os.path.join(os.environ['JHBUILDDIR'] , 'src');
+prefix = os.path.join(os.environ['JHBUILDDIR'], 'build');
+
+autogenargs='--without-xf86misc --without-fop --without-xmlto --without-doxygen --without-asciidoc --without-groff --disable-specs --disable-devel-docs --disable-docs --disable-static --disable-dependency-tracking'
Copied: tinderbox/jhbuildrc.xquartz (from rev 514, tinderbox/jhbuildrc)
===================================================================
--- tinderbox/jhbuildrc.xquartz (rev 0)
+++ tinderbox/jhbuildrc.xquartz 2011-03-24 02:14:47 UTC (rev 515)
@@ -0,0 +1,13 @@
+# Outside requirements: freeype, libpng
+
+#moduleset = 'http://cgit.freedesktop.org/xorg/util/modular/blob/xorg.modules'
+moduleset = os.path.join(os.environ['HOME'], 'src', 'freedesktop', 'jhbuild', 'xorg.modules')
+
+modules = [ 'xquartz' ]
+
+skip = [ 'xorg-drivers', 'xdriinfo', 'libdrm', 'libpciaccess', 'libGL', 'fontconfig', 'xkeyboard-config' ]
+
+checkoutroot = os.path.join(os.environ['JHBUILDDIR'] , 'src');
+prefix = os.path.join(os.environ['JHBUILDDIR'], 'build');
+
+autogenargs='--without-xf86misc --without-fop --without-xmlto --without-doxygen --without-asciidoc --without-groff --disable-specs --disable-devel-docs --disable-docs --with-dtrace --disable-static --disable-dependency-tracking --with-launchagents-dir=' + os.path.join(prefix, 'Library', 'LaunchAgents') + ' --with-launchdaemons-dir=' + os.path.join(prefix, 'Library', 'LaunchDaemons') + ' --with-apple-applications-dir=' + os.path.join(prefix, 'Applications')
Modified: tinderbox/tinderbox_test.sh
===================================================================
--- tinderbox/tinderbox_test.sh 2011-03-23 16:49:15 UTC (rev 514)
+++ tinderbox/tinderbox_test.sh 2011-03-24 02:14:47 UTC (rev 515)
@@ -1,34 +1,65 @@
#!/bin/bash
-. /etc/profile
-. /etc/bashrc
-. ${HOME}/.profile
-. ${HOME}/.bashrc
+if [[ $# -eq 0 ]] ; then
+ CONFIG="$(hostname)"
+else
+ CONFIG=$1
+fi
-. ${HOME}/src/strip.sh
-unset CFLAGS OBJCFLAGS CPPFLAGS LDFLAGS C_INCLUDE_PATH OBJC_INCLUDE_PATH CPLUS_INCLUDE_PATH PKG_CONFIG_PATH
+export JHBUILDDIR="${HOME}/src/freedesktop/jhbuild"
+JHBUILDRC="jhbuildrc.linux"
-PATH="/opt/llvm/bin:/opt/local/bin:$PATH"
+case $CONFIG in
+ yuffie)
+ . /etc/profile
+ . /etc/bashrc
+ . ${HOME}/.profile
+ . ${HOME}/.bashrc
+ . ${HOME}/src/strip.sh
-#URL="http://jeremyhu-vincent:xQUGcg@tinderbox.x.org/builds/rpc"
-URL="http://jeremyhu-yuffie:xQUGcg@tinderbox.x.org/builds/rpc"
+ unset CFLAGS OBJCFLAGS CPPFLAGS LDFLAGS C_INCLUDE_PATH OBJC_INCLUDE_PATH CPLUS_INCLUDE_PATH PKG_CONFIG_PATH
+ PATH="/opt/local/bin:${PATH}"
-#URL="http://jeremyhu-tifa-linux32:xFDSPr@tinderbox.x.org/builds/rpc"
-#URL="http://jeremyhu-tifa-linux64:JsFKEr4f6@tinderbox.x.org/builds/rpc"
+ URL="http://jeremyhu-yuffie:xQUGcg@tinderbox.x.org/builds/rpc"
-#jhbuild clean
+ export CC="/opt/llvm/bin/clang"
+ export CXX="/opt/llvm/bin/clang++"
+ export LIBTOOLIZE="glibtoolize"
-#jhbuild build --autogen --clean --start-at=xserver
-#jhbuild autobuild --autogen --verbose --report-url="${URL}"
-jhbuild autobuild --autogen --clean --verbose --report-url="${URL}"
+ JHBUILDRC="jhbuildrc.xquartz"
+ ;;
+ vincent)
+ URL="http://jeremyhu-vincent:xQUGcg@tinderbox.x.org/builds/rpc"
+ ;;
+ tifa|tifa-linux32)
+ URL="http://jeremyhu-tifa-linux32:xFDSPr@tinderbox.x.org/builds/rpc"
+ ;;
+ tifa-linux64)
+ URL="http://jeremyhu-tifa-linux64:JsFKEr4f6@tinderbox.x.org/builds/rpc"
+ ;;
+ *)
+ echo "Invalid config: ${CONFIG}" >&2
+ exit 1
+ ;;
+esac
-/bin/ls -1 /var/tmp | /usr/bin/head -n 2000 | /usr/bin/grep dSYM | /usr/bin/sed 's:^:/var/tmp/:' | /usr/bin/xargs /bin/rm -rf
-/bin/ls -1 /var/tmp | /usr/bin/head -n 2000 | /usr/bin/grep dSYM | /usr/bin/sed 's:^:/var/tmp/:' | /usr/bin/xargs /bin/rm -rf
-/bin/ls -1 /var/tmp | /usr/bin/head -n 2000 | /usr/bin/grep dSYM | /usr/bin/sed 's:^:/var/tmp/:' | /usr/bin/xargs /bin/rm -rf
-/bin/ls -1 /var/tmp | /usr/bin/head -n 2000 | /usr/bin/grep dSYM | /usr/bin/sed 's:^:/var/tmp/:' | /usr/bin/xargs /bin/rm -rf
-/bin/ls -1 /var/tmp | /usr/bin/head -n 2000 | /usr/bin/grep dSYM | /usr/bin/sed 's:^:/var/tmp/:' | /usr/bin/xargs /bin/rm -rf
-/bin/ls -1 /var/tmp | /usr/bin/head -n 2000 | /usr/bin/grep dSYM | /usr/bin/sed 's:^:/var/tmp/:' | /usr/bin/xargs /bin/rm -rf
-/bin/ls -1 /var/tmp | /usr/bin/head -n 2000 | /usr/bin/grep dSYM | /usr/bin/sed 's:^:/var/tmp/:' | /usr/bin/xargs /bin/rm -rf
-/bin/ls -1 /var/tmp | /usr/bin/head -n 2000 | /usr/bin/grep dSYM | /usr/bin/sed 's:^:/var/tmp/:' | /usr/bin/xargs /bin/rm -rf
+export ACLOCAL="aclocal -I ${JHBUILDDIR}/build/share/aclocal"
+[[ -d "${JHBUILDDIR}/build/share/aclocal" ]] || mkdir -p "${JHBUILDDIR}/build/share/aclocal"
+[[ -d /usr/local/share/aclocal ]] && ACLOCAL="${ACLOCAL} -I /usr/local/share/aclocal"
+export PKG_CONFIG_PATH="${JHBUILDDIR}/build/share/pkgconfig:${JHBUILDDIR}/build/lib/pkgconfig:${JHBUILDDIR}/external/build/share/pkgconfig:${JHBUILDDIR}/external/build/lib/pkgconfig"
+export FOP_OPTS="-Xmx2048m -Djava.awt.headless=true"
+export CPPFLAGS="-I${JHBUILDDIR}/build/include -I${JHBUILDDIR}/external/build/include"
+export CFLAGS="-O0 -pipe -Wall -Wformat=2"
-rm -rf /Users/jeremy/src/freedesktop/jhbuild/build/Applications
+JHBUILD="jhbuild -f ${JHBUILDDIR}/${JHBUILDRC}"
+
+#$JHBUILD clean
+#$JHBUILD build --autogen --clean
+#$JHBUILD build --autogen --clean --start-at=xserver
+#$JHBUILD autobuild --autogen --verbose --report-url="${URL}"
+$JHBUILD autobuild --autogen --clean --verbose --report-url="${URL}"
+
+# Delete, so LS doesn't find it accidentally
+if [[ $CONFIG = "yuffie" ]] ; then
+ rm -rf "${JHBUILD_DIR}/build/Applications"
+fi
Modified: tinderbox/xorg.modules
===================================================================
--- tinderbox/xorg.modules 2011-03-23 16:49:15 UTC (rev 514)
+++ tinderbox/xorg.modules 2011-03-24 02:14:47 UTC (rev 515)
@@ -73,14 +73,25 @@
</dependencies>
</autotools>
- <metamodule id="xquartz">
+ <metamodule id="xserver-stable">
<dependencies>
- <dep package="libAppleWM"/>
- <dep package="xorg"/>
<dep package="xserver-1.9"/>
<dep package="xserver-1.10"/>
</dependencies>
</metamodule>
+ <metamodule id="xorg-jeremyhu-tinderbox">
+ <dependencies>
+ <dep package="xorg"/>
+ <dep package="xserver-stable"/>
+ </dependencies>
+ </metamodule>
+
+ <metamodule id="xquartz">
+ <dependencies>
+ <dep package="libAppleWM"/>
+ <dep package="xorg-jeremyhu-tinderbox"/>
+ </dependencies>
+ </metamodule>
+
</moduleset>
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/xquartz-changes/attachments/20110323/560884e8/attachment-0001.html>
More information about the Xquartz-changes
mailing list