svn commit: r835089 - in /commons/sandbox/runtime/trunk/src/main/native: Makefile.msc.in configure.xml

[mt...@apache.org]

Author: mturk
Date: Wed Nov 11 21:56:10 2009
New Revision: 835089

URL: http://svn.apache.org/viewvc?rev=835089&view=rev
Log:
Fix sqlite config file

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

Modified: commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in?rev=835089&r1=835088&r2=835089&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in (original)
+++ commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in Wed Nov 11 21:56:10 2009
@@ -224,7 +224,7 @@
 {$(SRCDIR)\srclib\regex}.c{$(SRCDIR)\srclib\regex}.$(OBJ):
 	$(CC) $(CFLAGS) $(CSFLAGS) $(CPPFLAGS) -DACR_DECLARE_EXPORT $(INCLUDES) -c -Fo$@ -Fd$(LIBNAME)-src $<
 
-{$(SRCDIR)\srclib\sqlite3}.c{$(SRCDIR)\srclib\sqlite3}.$(OBJ):
+{$(SRCDIR)\srclib\sqlite}.c{$(SRCDIR)\srclib\sqlite}.$(OBJ):
 	$(CC) $(CFLAGS) $(CSFLAGS) $(CPPFLAGS) -D_HAVE_SQLITE_CONFIG_H -DACR_DECLARE_EXPORT $(INCLUDES) -c -Fo$@ -Fd$(LIBNAME)-src $<
 
 {$(SRCDIR)\srclib\zlib}.c{$(SRCDIR)\srclib\zlib}.$(OBJ):

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=835089&r1=835088&r2=835089&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/configure.xml (original)
+++ commons/sandbox/runtime/trunk/src/main/native/configure.xml Wed Nov 11 21:56:10 2009
@@ -116,7 +116,7 @@
 #include &lt;wctype.h&gt;
 int main() {printf("%d", (int)sizeof(@{type}));return 0;}
         </echo>
-        <cexec dir="${src.native}" executable="${cc}" output="cc${build.tstamp}.log"
+        <cexec dir="${src.native}" executable="${cc}" output="${src.native}/cc${build.tstamp}.log"
               resultproperty="sizeof.err">
             <and>
                 <systemid equals="windows"/>
@@ -125,14 +125,14 @@
             <arg line="cc${build.tstamp}.c /link /out:cc${build.tstamp}.exe"/>
         </cexec>
         <cexec dir="${src.native}" executable="./cc${build.tstamp}" outputproperty="@{result}"
-              resultproperty="sizeof.err" error="cc${build.tstamp}.err">
+              resultproperty="sizeof.err" error="${src.native}/cc${build.tstamp}.err">
             <and>
                 <variable name="sizeof.err" equals="0"/>
             </and>
         </cexec>
         <delete>
             <fileset dir="${src.native}">
-                <filename name="ac${build.tstamp}*" />
+                <filename name="cc${build.tstamp}*" />
             </fileset>
         </delete>
         <property name="@{result}" value="0"/>
@@ -150,7 +150,7 @@
 #include &lt;@{file}.h&gt;
 int main() {printf("1");return 0;}
     </echo>
-        <cexec dir="${src.native}" executable="${cc}" output="cc${build.tstamp}.log"
+        <cexec dir="${src.native}" executable="${cc}" output="${src.native}/cc${build.tstamp}.log"
               resultproperty="have.err">
             <and>
                 <systemid equals="windows"/>
@@ -183,7 +183,7 @@
 #include &lt;stdlib.h&gt;
 int main() {printf("1");return 0;}
     </echo>
-        <cexec dir="${src.native}" executable="${cc}" output="cc${build.tstamp}.log"
+        <cexec dir="${src.native}" executable="${cc}" output="${src.native}/cc${build.tstamp}.log"
               resultproperty="have.err">
             <and>
                 <systemid equals="windows"/>
@@ -228,28 +228,6 @@
                 <filename name="*${build.tstamp}*" />
             </fileset>
         </delete>
-        <conditional target="test1" else="test2">
-            <and>
-             <systemid equals="windows"/>
-             <systemid arch="32" />
-            </and>
-        </conditional>
-        <property name="check1" value="none" />
-        <!-- Variable set condition -->
-        <conditional variable="check1" value="-DWIN32" else="false">
-            <and>
-             <systemid equals="windows"/>
-             <systemid arch="32" />
-            </and>
-        </conditional>
-        <!-- Variable add condition -->
-        <conditional variable="check1" add="-D_WIN32 -DWIN32" else="-D_WIN64">
-            <and>
-             <systemid equals="windows"/>
-             <systemid arch="32" />
-            </and>
-        </conditional>
-        <echo message="check1 = ${check1}"/>
         <!-- Imutable set condition -->
         <conditional property="cc" value="cl">
             <and>
@@ -259,6 +237,7 @@
 
         <sizeof type="int"/>
         <sizeof type="long long" result="config.sizeof.longlong"/>
+        <sizeof type="void *" result="config.sizeof.pointer"/>
 
         <sequence if="systemid.os" equals="windows">
             <have-include file="windows"/>