[Xquartz-changes] [512] tinderbox

source_changes at macosforge.org source_changes at macosforge.org
Tue Mar 22 15:55:08 PDT 2011 

Revision: 512
          http://trac.macosforge.org/projects/xquartz/changeset/512
Author:   jeremyhu at freedesktop.org
Date:     2011-03-22 15:55:07 -0700 (Tue, 22 Mar 2011)
Log Message:
-----------
tinderbox updates: using clang, building branches, etc

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

Modified: tinderbox/jhbuildrc
===================================================================
--- tinderbox/jhbuildrc	2011-03-22 16:13:55 UTC (rev 511)
+++ tinderbox/jhbuildrc	2011-03-22 22:55:07 UTC (rev 512)
@@ -25,6 +25,13 @@
 os.environ['FOP_OPTS'] = '-Xmx2048m -Djava.awt.headless=true'
 os.environ['PS2PDF'] = '/opt/local/bin/ps2pdf'
 
+os.environ['FREETYPE_CFLAGS'] = '-I/opt/X11/include/freetype2 -I' + os.path.join(prefix, 'include') + ' -I/opt/X11/include'
+
+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 -ggdb3 -Wall -arch i386 -arch x86_64 -arch ppc'
+

Modified: tinderbox/tinderbox_test.sh
===================================================================
--- tinderbox/tinderbox_test.sh	2011-03-22 16:13:55 UTC (rev 511)
+++ tinderbox/tinderbox_test.sh	2011-03-22 22:55:07 UTC (rev 512)
@@ -8,7 +8,7 @@
 . ${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"
+PATH="/opt/llvm/bin:/opt/local/bin:$PATH"
 
 #URL="http://jeremyhu-vincent:xQUGcg@tinderbox.x.org/builds/rpc"
 URL="http://jeremyhu-yuffie:xQUGcg@tinderbox.x.org/builds/rpc"
@@ -17,11 +17,17 @@
 
 #jhbuild clean
 
-#jhbuild build --start-at=libX11
-#jhbuild autobuild --autogen --verbose --report-url="${URL}"
-jhbuild autobuild --autogen --clean --verbose --report-url="${URL}"
+#jhbuild build --autogen --clean --start-at=xserver
+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
+/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
 
 rm -rf /Users/jeremy/src/freedesktop/jhbuild/build/Applications

Modified: tinderbox/xorg.modules
===================================================================
--- tinderbox/xorg.modules	2011-03-22 16:13:55 UTC (rev 511)
+++ tinderbox/xorg.modules	2011-03-22 22:55:07 UTC (rev 512)
@@ -7,10 +7,78 @@
 
   <repository type="git" name="git.freedesktop.org" href="git://anongit.freedesktop.org/git/"/>
 
+  <autotools id="xserver-1.8">
+    <branch repo="git.freedesktop.org" module="xorg/xserver" checkoutdir="xorg/xserver-1.8" revision="server-1.8-branch" />
+    <dependencies>
+      <dep package="libGL"/>
+      <dep package="libXaw"/>
+      <dep package="libxkbui"/>
+      <dep package="libXfont"/>
+      <dep package="libxtrans"/>
+      <dep package="libXau"/>
+      <dep package="libxkbfile"/>
+      <dep package="libXdmcp"/>
+      <dep package="libXxf86vm"/>
+      <dep package="libXinerama"/>
+      <dep package="libdrm"/>
+      <dep package="libdmx"/>
+      <dep package="libXtst"/>
+      <dep package="libXRes"/>
+      <dep package="pixman"/>
+      <dep package="libpciaccess"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="xserver-1.9">
+    <branch repo="git.freedesktop.org" module="xorg/xserver" checkoutdir="xorg/xserver-1.9" revision="server-1.9-branch" />
+    <dependencies>
+      <dep package="libGL"/>
+      <dep package="libXaw"/>
+      <dep package="libxkbui"/>
+      <dep package="libXfont"/>
+      <dep package="libxtrans"/>
+      <dep package="libXau"/>
+      <dep package="libxkbfile"/>
+      <dep package="libXdmcp"/>
+      <dep package="libXxf86vm"/>
+      <dep package="libXinerama"/>
+      <dep package="libdrm"/>
+      <dep package="libdmx"/>
+      <dep package="libXtst"/>
+      <dep package="libXRes"/>
+      <dep package="pixman"/>
+      <dep package="libpciaccess"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="xserver-1.10">
+    <branch repo="git.freedesktop.org" module="xorg/xserver" checkoutdir="xorg/xserver-1.10" revision="server-1.10-branch" />
+    <dependencies>
+      <dep package="libGL"/>
+      <dep package="libXaw"/>
+      <dep package="libxkbui"/>
+      <dep package="libXfont"/>
+      <dep package="libxtrans"/>
+      <dep package="libXau"/>
+      <dep package="libxkbfile"/>
+      <dep package="libXdmcp"/>
+      <dep package="libXxf86vm"/>
+      <dep package="libXinerama"/>
+      <dep package="libdrm"/>
+      <dep package="libdmx"/>
+      <dep package="libXtst"/>
+      <dep package="libXRes"/>
+      <dep package="pixman"/>
+      <dep package="libpciaccess"/>
+    </dependencies>
+  </autotools>
+
   <metamodule id="xquartz">
     <dependencies>
       <dep package="libAppleWM"/>
       <dep package="xorg"/>
+      <dep package="xserver-1.9"/>
+      <dep package="xserver-1.10"/>
     </dependencies>
   </metamodule>
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/xquartz-changes/attachments/20110322/fcde8c9b/attachment-0001.html>

More information about the Xquartz-changes mailing list