[Xquartz-changes] [514] tinderbox

[source_changes at macosforge.org]

Revision: 514
          http://trac.macosforge.org/projects/xquartz/changeset/514
Author:   jeremyhu at freedesktop.org
Date:     2011-03-23 09:49:15 -0700 (Wed, 23 Mar 2011)
Log Message:
-----------
Skip configure caching, add report URLs for new tinderboxes

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

Modified: tinderbox/jhbuildrc
===================================================================
--- tinderbox/jhbuildrc	2011-03-22 22:58:21 UTC (rev 513)
+++ tinderbox/jhbuildrc	2011-03-23 16:49:15 UTC (rev 514)
@@ -13,25 +13,28 @@
 checkoutroot = os.path.join(os.environ['JHBUILDDIR'] , 'src');
 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, 'share', 'pkgconfig') + ':' + os.path.join(prefix, 'lib', 'pkgconfig') + ':/usr/share/pkgconfig:/usr/lib/pkgconfig'
-os.environ['LIBTOOLIZE'] = 'glibtoolize'
+os.environ['EXTERN_PREFIX'] = os.path.join(os.environ['JHBUILDDIR'], 'external', 'build')
 
-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['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['FREETYPE_CFLAGS'] = '-I/opt/X11/include/freetype2 -I' + os.path.join(prefix, 'include') + ' -I/opt/X11/include'
+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 -ggdb3 -Wall -arch i386 -arch x86_64'
-os.environ['CPPFLAGS'] = '-I/opt/X11/include/freetype2 -I' + os.path.join(prefix, 'include') + ' -I/opt/X11/include'
 
-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 -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')

Modified: tinderbox/tinderbox_test.sh
===================================================================
--- tinderbox/tinderbox_test.sh	2011-03-22 22:58:21 UTC (rev 513)
+++ tinderbox/tinderbox_test.sh	2011-03-23 16:49:15 UTC (rev 514)
@@ -13,13 +13,14 @@
 #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
+#URL="http://jeremyhu-tifa-linux32:xFDSPr@tinderbox.x.org/builds/rpc"
+#URL="http://jeremyhu-tifa-linux64:JsFKEr4f6@tinderbox.x.org/builds/rpc"
 
 #jhbuild clean
 
 #jhbuild build --autogen --clean --start-at=xserver
-jhbuild autobuild --autogen --verbose --report-url="${URL}"
-#jhbuild autobuild --autogen --clean --verbose --report-url="${URL}"
+#jhbuild autobuild --autogen --verbose --report-url="${URL}"
+jhbuild autobuild --autogen --clean --verbose --report-url="${URL}"
 
 /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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/xquartz-changes/attachments/20110323/166bb83b/attachment.html>