[Xquartz-changes] [526] tinderbox

[source_changes at macosforge.org]

Revision: 526
          http://trac.macosforge.org/projects/xquartz/changeset/526
Author:   jeremyhu at freedesktop.org
Date:     2011-04-09 00:12:55 -0700 (Sat, 09 Apr 2011)
Log Message:
-----------
More tinderbox cleanup

Modified Paths:
--------------
    tinderbox/jhbuildrc.xquartz
    tinderbox/tinderbox_test.sh

Modified: tinderbox/jhbuildrc.xquartz
===================================================================
--- tinderbox/jhbuildrc.xquartz	2011-04-09 04:59:36 UTC (rev 525)
+++ tinderbox/jhbuildrc.xquartz	2011-04-09 07:12:55 UTC (rev 526)
@@ -13,5 +13,4 @@
 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')
-makeargs = '-j1'
 

Modified: tinderbox/tinderbox_test.sh
===================================================================
--- tinderbox/tinderbox_test.sh	2011-04-09 04:59:36 UTC (rev 525)
+++ tinderbox/tinderbox_test.sh	2011-04-09 07:12:55 UTC (rev 526)
@@ -12,21 +12,8 @@
 JHBUILDRC="jhbuildrc.linux"
 JHBUILD="jhbuild"
 
-[[ -d /usr/local/bin ]] && PATH="/usr/local/bin:${PATH}"
-[[ -d /opt/local/bin ]] && PATH="/opt/local/bin:${PATH}"
-[[ -d /opt/llvm/bin ]] && PATH="/opt/llvm/bin:${PATH}"
-[[ -d "${HOME}/bin" ]] && PATH="${HOME}/bin:${PATH}"
-
 case $CONFIG in
   yuffie)
-    . /etc/profile
-    . /etc/bashrc
-    . ${HOME}/.profile
-    . ${HOME}/.bashrc
-    . ${HOME}/src/strip.sh
-
-    unset CFLAGS OBJCFLAGS CPPFLAGS LDFLAGS C_INCLUDE_PATH OBJC_INCLUDE_PATH CPLUS_INCLUDE_PATH PKG_CONFIG_PATH
-
     URL="http://jeremyhu-yuffie:xQUGcg@tinderbox.x.org/builds/rpc"
 
     export CC="/opt/llvm/bin/clang"
@@ -51,15 +38,25 @@
     ;;
 esac
 
+JHBUILD="${JHBUILD} -f ${JHBUILDDIR}/${JHBUILDRC}"
+
+[[ -d /usr/local/bin ]] && PATH="/usr/local/bin:${PATH}"
+[[ -d /opt/local/bin ]] && PATH="/opt/local/bin:${PATH}"
+[[ -d /opt/llvm/bin ]] && PATH="/opt/llvm/bin:${PATH}"
+[[ -d "${HOME}/bin" ]] && PATH="${HOME}/bin:${PATH}"
+
 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"
+[[ -d /usr/X11 ]] && PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/usr/X11/share/pkgconfig:/usr/X11/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"
 
-JHBUILD="${JHBUILD} -f ${JHBUILDDIR}/${JHBUILDRC}"
+[[ -d "${JHBUILDDIR}/build/share/aclocal" ]] || mkdir -p "${JHBUILDDIR}/build/share/aclocal"
 
 #$JHBUILD clean
 #$JHBUILD build --autogen --clean
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/xquartz-changes/attachments/20110409/b814a5ca/attachment.html>