[Jython-checkins] SF.net SVN: jython:[6047] trunk/jython

[<fwi...@us...>]

Revision: 6047
          http://jython.svn.sourceforge.net/jython/?rev=6047&view=rev
Author:   fwierzbicki
Date:     2009-02-24 20:42:25 +0000 (Tue, 24 Feb 2009)

Log Message:
-----------
Added a target and infrastructure for compiling the ctypes_test.c needed for
test__rawffi.py.  So far only tested on OS X.

Used cpptasks from http://ant-contrib.sourceforge.net/cpptasks/index.html

Modified Paths:
--------------
    trunk/jython/build.xml

Added Paths:
-----------
    trunk/jython/extlibs/cpptasks/
    trunk/jython/extlibs/cpptasks/cpptasks.jar

Modified: trunk/jython/build.xml
===================================================================
--- trunk/jython/build.xml	2009-02-24 05:45:38 UTC (rev 6046)
+++ trunk/jython/build.xml	2009-02-24 20:42:25 UTC (rev 6047)
@@ -168,6 +168,7 @@
             <pathelement path="${extlibs.dir}/junit-3.8.2.jar" />
             <pathelement path="${exposed.dir}" />
             <pathelement path="${compile.dir}" />
+            <pathelement path="${cpptasks.jar.dir}" />
         </path>
         <!-- 64 bit Java 6 needs roughly 96m for regrtest on most platforms, but Apple's needs
          more -->
@@ -215,6 +216,7 @@
         <property file="${basedir}/ant.properties" />
 
         <property name="svnant.jar.dir" value="${basedir}/extlibs/svnant-jars" />
+        <property name="cpptasks.jar.dir" value="${basedir}/extlibs/cpptasks/cpptasks.jar" />
 
         <!-- use this property to distinguish a full-build from a developer-build -->
         <property name="full-build" value="true" />
@@ -493,8 +495,6 @@
             nowarn="${nowarn}"> 
             <classpath refid="test.classpath" />
         </javac>
-
-
         <copy file="${source.dir}/org/python/modules/ucnhash.dat"
               todir="${compile.dir}/org/python/modules"
               preservelastmodified="true" />
@@ -506,6 +506,23 @@
         </copy>
     </target>
 
+    <!--
+    If you run this before running regrtest, test__rawffi.py should pass.
+    So far I have been unable to enable cpptasks without passing an arg to ant.
+    To run this task like I am do:
+
+    ant -lib extlibs/cpptasks/cpptasks.jar compile_cpp
+
+    XXX: get cpptasks running without an arg to ant.
+    -->
+    <target name="compile_cpp" depends="compile">
+        <taskdef resource="cpptasks.tasks"/>
+        <cc outtype="shared" subsystem="console" outfile="ctypes_test" objdir="${compile.dir}">
+             <fileset dir="tests/c" includes="*.c"/>
+         </cc>
+    </target>
+
+
     <target name="expose" depends="init">
         <taskdef name="expose" classname="org.python.expose.generate.ExposeTask">
             <classpath>

Added: trunk/jython/extlibs/cpptasks/cpptasks.jar
===================================================================
(Binary files differ)


Property changes on: trunk/jython/extlibs/cpptasks/cpptasks.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.