[Xquartz-changes] [555] tinderbox

[source_changes at macosforge.org]

Revision: 555
          http://trac.macosforge.org/projects/xquartz/changeset/555
Author:   jeremyhu at freedesktop.org
Date:     2011-05-10 19:11:21 -0700 (Tue, 10 May 2011)
Log Message:
-----------
Fix prefix and adjust warnings

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

Modified: tinderbox/jhbuildrc.linux
===================================================================
--- tinderbox/jhbuildrc.linux	2011-05-11 01:26:39 UTC (rev 554)
+++ tinderbox/jhbuildrc.linux	2011-05-11 02:11:21 UTC (rev 555)
@@ -11,7 +11,7 @@
 build_policy = 'all'
 
 checkoutroot = os.path.join(os.environ['JHBUILDDIR'] , 'src')
-prefix = '/var/tmp/jhbuild'
+prefix = os.environ['PREFIX']
 
 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 --disable-runtime-deps --disable-silent-rules --disable-gtk'
 

Modified: tinderbox/jhbuildrc.xquartz
===================================================================
--- tinderbox/jhbuildrc.xquartz	2011-05-11 01:26:39 UTC (rev 554)
+++ tinderbox/jhbuildrc.xquartz	2011-05-11 02:11:21 UTC (rev 555)
@@ -10,7 +10,7 @@
 build_policy = 'all'
 
 checkoutroot = os.path.join(os.environ['JHBUILDDIR'] , 'src')
-prefix = os.path.join(os.environ['JHBUILDDIR'], 'build')
+prefix = os.environ['PREFIX']
 
 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 --disable-silent-rules --disable-gtk --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-05-11 01:26:39 UTC (rev 554)
+++ tinderbox/tinderbox_test.sh	2011-05-11 02:11:21 UTC (rev 555)
@@ -22,7 +22,9 @@
     export CXX="/opt/llvm/bin/clang++"
     export LIBTOOLIZE="glibtoolize"
 
-    TB_CFLAGS="-Wextra"
+#    TB_CFLAGS="-Wextra"
+
+# Stage 1:
     TB_CFLAGS="${TB_CFLAGS} -Werror=implicit"
     TB_CFLAGS="${TB_CFLAGS} -Werror=nonnull"
     TB_CFLAGS="${TB_CFLAGS} -Werror=format-security"
@@ -35,18 +37,20 @@
     TB_CFLAGS="${TB_CFLAGS} -Werror=sequence-point"
     TB_CFLAGS="${TB_CFLAGS} -Werror=return-type"
     TB_CFLAGS="${TB_CFLAGS} -Werror=trigraphs"
-    TB_CFLAGS="${TB_CFLAGS} -Werror=array-bounds -ftree-vrp"
-    TB_CFLAGS="${TB_CFLAGS} -Werror=cast-align"
+    TB_CFLAGS="${TB_CFLAGS} -Werror=array-bounds"
+    TB_CFLAGS="${TB_CFLAGS} -Wcast-align"
     TB_CFLAGS="${TB_CFLAGS} -Werror=write-strings"
-    TB_CFLAGS="${TB_CFLAGS} -Werror=clobbered"
+#    TB_CFLAGS="${TB_CFLAGS} -Werror=clobbered"
     TB_CFLAGS="${TB_CFLAGS} -Werror=address"
     TB_CFLAGS="${TB_CFLAGS} -Werror=int-to-pointer-cast"
     TB_CFLAGS="${TB_CFLAGS} -Werror=pointer-to-int-cast"
-    TB_CFLAGS="${TB_CFLAGS} -Wlogical-op"
+
+# Stage 2:
+#    TB_CFLAGS="${TB_CFLAGS} -Wlogical-op"
     TB_CFLAGS="${TB_CFLAGS} -Wunused"
     TB_CFLAGS="${TB_CFLAGS} -Wuninitialized"
     TB_CFLAGS="${TB_CFLAGS} -Wshadow"
-    TB_CFLAGS="${TB_CFLAGS} -Wunsafe-loop-optimizations"
+#    TB_CFLAGS="${TB_CFLAGS} -Wunsafe-loop-optimizations"
     TB_CFLAGS="${TB_CFLAGS} -Wcast-qual"
     TB_CFLAGS="${TB_CFLAGS} -Wmissing-noreturn"
     TB_CFLAGS="${TB_CFLAGS} -Wmissing-format-attribute"
@@ -82,7 +86,7 @@
     ;;
 esac
 
-export PREFIX=${PREFIX-${JHBUILDDIR}}
+export PREFIX=${PREFIX-"${JHBUILDDIR}/build"}
 
 JHBUILD="${JHBUILD} -f ${JHBUILDDIR}/${JHBUILDRC}"
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/xquartz-changes/attachments/20110510/7667fa09/attachment-0001.html>