commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r831251 - /commons/sandbox/runtime/trunk/src/main/native/configure.xml
Date Fri, 30 Oct 2009 10:13:24 GMT
Author: mturk
Date: Fri Oct 30 10:13:24 2009
New Revision: 831251

URL: http://svn.apache.org/viewvc?rev=831251&view=rev
Log:
Use  property

Modified:
    commons/sandbox/runtime/trunk/src/main/native/configure.xml

Modified: commons/sandbox/runtime/trunk/src/main/native/configure.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/configure.xml?rev=831251&r1=831250&r2=831251&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/configure.xml (original)
+++ commons/sandbox/runtime/trunk/src/main/native/configure.xml Fri Oct 30 10:13:24 2009
@@ -117,22 +117,21 @@
 #include <wctype.h>
 int main() {printf("%d", (int)sizeof(@{type}));return 0;}
         </echo>
-        <cexec dir="${src.native}" executable="cl" output="cc${build.tstamp}.log"
+        <cexec dir="${src.native}" executable="${cc}" output="cc${build.tstamp}.log"
               resultproperty="sizeof.err">
             <and>
                 <systemid equals="windows"/>
-                <variable name="cc" equals="cl"/>
             </and>
             <arg line="-nologo"/>
             <arg line="cc${build.tstamp}.c /link /out:cc${build.tstamp}.exe"/>
         </cexec>
-        <cexec dir="${src.native}" executable="gcc"
+        <cexec dir="${src.native}" executable="${cc}" output="cc${build.tstamp}.log"
               resultproperty="sizeof.err">
             <and>
                 <systemid equals="linux"/>
             </and>
-            <arg line="-D_REENTRANT -fPIC -O3 -Wall -g"/>
-            <arg line="cc${build.tstamp}.c -lrt -lpthread -ldl -o cc${build.tstamp}"/>
+            <arg line="-Wall -Werror"/>
+            <arg line="cc${build.tstamp}.c -o cc${build.tstamp}"/>
         </cexec>
         <cexec dir="${src.native}" executable="./cc${build.tstamp}" outputproperty="@{result}"
               resultproperty="sizeof.err" error="cc${build.tstamp}.err">
@@ -160,16 +159,15 @@
 #include &lt;@{file}.h&gt;
 int main() {printf("1");return 0;}
     </echo>
-        <cexec dir="${src.native}" executable="cl" output="cc${build.tstamp}.log"
+        <cexec dir="${src.native}" executable="${cc}" output="cc${build.tstamp}.log"
               resultproperty="have.err">
             <and>
                 <systemid equals="windows"/>
-                <variable name="cc" equals="cl"/>
             </and>
             <arg line="-nologo"/>
             <arg line="cc${build.tstamp}.c /link /out:cc${build.tstamp}.exe"/>
         </cexec>
-        <cexec dir="${src.native}" executable="gcc" output="cc${build.tstamp}.log"
+        <cexec dir="${src.native}" executable="${cc}" output="cc${build.tstamp}.log"
               resultproperty="have.err">
             <and>
                 <systemid equals="linux"/>
@@ -202,11 +200,10 @@
 #include &lt;stdlib.h&gt;
 int main() {printf("1");return 0;}
     </echo>
-        <cexec dir="${src.native}" executable="cl" output="cc${build.tstamp}.log"
+        <cexec dir="${src.native}" executable="${cc}" output="cc${build.tstamp}.log"
               resultproperty="have.err">
             <and>
                 <systemid equals="windows"/>
-                <variable name="cc" equals="cl"/>
             </and>
             <arg line="-nologo"/>
             <arg line="cc${build.tstamp}.c /link /out:cc${build.tstamp}.exe @{file}.lib"/>
@@ -276,10 +273,15 @@
              <systemid equals="windows"/>
             </and>
         </conditional>
+        <conditional property="cc" value="gcc">
+            <and>
+             <systemid equals="linux"/>
+            </and>
+        </conditional>
         <echo message="check1 = ${check1}"/>
         <sizeof type="int"/>
         <sizeof type="long long" result="config.sizeof.longlong"/>
-        <!--
+
         <sequence ifnot="systemid.os" equals="windows">
             <have-include file="unistd"/>
         </sequence>
@@ -288,7 +290,6 @@
             <have-library file="bufferoverflow"/>
             <have-library file="ktmw32"/>
         </sequence>
-        -->
         <print format="#define HAVE_UNISTD_H    %1s" message="${config.have.unistd}"/>
         <print format="#define HAVE_WINDOWS_H   %1s" message="${config.have.windows}"/>
     </target>



Mime
View raw message