You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mt...@apache.org on 2009/10/30 11:39:35 UTC
svn commit: r831252 - in /commons/sandbox/runtime/trunk/src/main/native:
configure.properties.default configure.xml
Author: mturk
Date: Fri Oct 30 10:39:34 2009
New Revision: 831252
URL: http://svn.apache.org/viewvc?rev=831252&view=rev
Log:
We'll use ant configure only for windows at the momemnt
Modified:
commons/sandbox/runtime/trunk/src/main/native/configure.properties.default
commons/sandbox/runtime/trunk/src/main/native/configure.xml
Modified: commons/sandbox/runtime/trunk/src/main/native/configure.properties.default
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/configure.properties.default?rev=831252&r1=831251&r2=831252&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/configure.properties.default (original)
+++ commons/sandbox/runtime/trunk/src/main/native/configure.properties.default Fri Oct 30 10:39:34 2009
@@ -36,3 +36,18 @@
compile.debug=off
compile.optimize=on
compile.deprecation=on
+
+# ----- Windows Compile options -------------------------------------------------
+#
+compile.windows.cl.cppopts=-DWIN32 -DWINNT -D_WIN32 -D_WINDOWS -D_WINNT \
+ -D_WIN32_WINNT=0x0501 -D_WIN32_IE=0x0600
+compile.windows.cl.cxxopts=-TP
+compile.windows.cl.ccflags=-nologo -O2 -Ob2 -Oy- -Zi -D_MD -MD -W3
+compile.windows.cl.asflags=-nologo -DWIN32 -DWINNT -D_WIN32
+compile.windows.cl.shflags=/NOLOGO /OPT:REF
+compile.windows.cl.arflags=/NOLOGO
+compile.windows.cl.libs=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib \
+ ole32.lib shell32.lib rpcrt4.lib user32.lib \
+ gdi32.lib userenv.lib wtsapi32.lib psapi.lib \
+ shlwapi.lib wldap32.lib netapi32.lib iphlpapi.lib
+
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=831252&r1=831251&r2=831252&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:39:34 2009
@@ -6,9 +6,6 @@
<!-- Give user a chance to override without editing this file
(and without typing -D each time it compiles it
-->
- <property file="configure.properties" />
- <property file="configure.properties.default" />
-
<property name="build.top" value="${basedir}"/>
<property name="build.dir" value="${basedir}/dist"/>
<property name="build.src" value="${build.dir}/src"/>
@@ -19,6 +16,8 @@
<property name="src.java" value="${basedir}/src"/>
<property name="src.native" value="${basedir}/src/main/native"/>
+ <property file="${src.native}/configure.properties" />
+ <property file="${src.native}/configure.properties.default" />
<property name="compile.source" value="1.5"/>
<property name="compile.target" value="1.5"/>
@@ -48,7 +47,7 @@
<echo message="build.top = ${build.top}"/>
<echo message="build.dir = ${build.dir}"/>
<echo message="build.src = ${build.src}"/>
- <echo message="src.native = ${src.native}"/>
+ <echo message="src.native = ${compile.windows.cl.cppopts}"/>
<echo message="build.tstamp = ${build.tstamp}"/>
</target>
@@ -125,14 +124,6 @@
<arg line="-nologo"/>
<arg line="cc${build.tstamp}.c /link /out:cc${build.tstamp}.exe"/>
</cexec>
- <cexec dir="${src.native}" executable="${cc}" output="cc${build.tstamp}.log"
- resultproperty="sizeof.err">
- <and>
- <systemid equals="linux"/>
- </and>
- <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">
<and>
@@ -167,14 +158,6 @@
<arg line="-nologo"/>
<arg line="cc${build.tstamp}.c /link /out:cc${build.tstamp}.exe"/>
</cexec>
- <cexec dir="${src.native}" executable="${cc}" output="cc${build.tstamp}.log"
- resultproperty="have.err">
- <and>
- <systemid equals="linux"/>
- </and>
- <arg line="-c"/>
- <arg line="cc${build.tstamp}.c -o cc${build.tstamp}.o"/>
- </cexec>
<conditional variable="@{result}" value="1" else="0">
<variable name="have.err" equals="0"/>
</conditional>
@@ -273,24 +256,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>
<sequence if="systemid.os" equals="windows">
<have-include file="windows"/>
<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>
</project>