[Xquartz-changes] [497] tinderbox

[source_changes at macosforge.org]

Revision: 497
          http://trac.macosforge.org/projects/xquartz/changeset/497
Author:   jeremyhu at freedesktop.org
Date:     2010-11-14 02:57:17 -0800 (Sun, 14 Nov 2010)
Log Message:
-----------
tinderbox updates

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

Modified: tinderbox/jhbuildrc
===================================================================
--- tinderbox/jhbuildrc	2010-11-14 01:17:29 UTC (rev 496)
+++ tinderbox/jhbuildrc	2010-11-14 10:57:17 UTC (rev 497)
@@ -14,11 +14,17 @@
 prefix = os.path.join(os.environ['JHBUILDDIR'], 'build');
 
 os.environ['ACLOCAL'] = 'aclocal -I  /usr/local/share/aclocal -I ' + os.path.join(prefix, 'share', 'aclocal')
-os.environ['PKG_CONFIG_PATH'] = os.path.join(prefix, 'lib', 'pkgconfig')
+os.environ['PKG_CONFIG_PATH'] = os.path.join(prefix, 'share', 'pkgconfig') + ':' + os.path.join(prefix, 'lib', 'pkgconfig') + ':/usr/share/pkgconfig:/usr/lib/pkgconfig'
 os.environ['LIBTOOLIZE'] = 'glibtoolize'
+
 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'
 
-autogenargs='--cache-file=' + os.path.join(os.environ['JHBUILDDIR'] , 'configure-cache') + ' --without-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')
+autogenargs='--without-fop --without-xmlto --without doxygen --without-asciidoc --without-groff --disable-specs --disable-devel-docs --disable-docs --cache-file=' + os.path.join(os.environ['JHBUILDDIR'] , 'configure-cache') + ' --without-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')
 
 os.environ['CFLAGS'] = '-O0 -ggdb3 -Wall -arch i386 -arch x86_64 -arch ppc'

Modified: tinderbox/tinderbox_test.sh
===================================================================
--- tinderbox/tinderbox_test.sh	2010-11-14 01:17:29 UTC (rev 496)
+++ tinderbox/tinderbox_test.sh	2010-11-14 10:57:17 UTC (rev 497)
@@ -8,18 +8,20 @@
 . ${HOME}/src/strip.sh
 unset CFLAGS OBJCFLAGS CPPFLAGS LDFLAGS C_INCLUDE_PATH OBJC_INCLUDE_PATH CPLUS_INCLUDE_PATH PKG_CONFIG_PATH
 
+PATH="$PATH:/opt/local/bin"
+
 #URL="http://jeremyhu-vincent:xQUGcg@tinderbox.x.org/builds/rpc"
 URL="http://jeremyhu-yuffie:xQUGcg@tinderbox.x.org/builds/rpc"
 
 rm /Users/jeremy/src/freedesktop/jhbuild/configure-cache
 
-export PKG_CONFIG_PATH=/usr/lib/pkgconfig:$PKG_CONFIG_PATH
-
-
 #jhbuild clean
 
-#jhbuild build --autogen --clean # --start-at=xkeyboard-config
+#jhbuild build --start-at=libX11
+#jhbuild autobuild --autogen --verbose --report-url="${URL}"
 jhbuild autobuild --autogen --clean --verbose --report-url="${URL}"
 
 /bin/ls -1 /var/tmp | /usr/bin/head -n 9000 | /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 9000 | /usr/bin/grep dSYM | /usr/bin/sed 's:^:/var/tmp/:' | /usr/bin/xargs /bin/rm -rf
+
+rm -rf /Users/jeremy/src/freedesktop/jhbuild/build/Applications
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/xquartz-changes/attachments/20101114/c3fb8df8/attachment.html>