[Ant-contrib-developers] CVS: cpptasks/test build.xml,1.2,1.3

[Adam M. <ada...@us...>]

Update of /cvsroot/ant-contrib/cpptasks/test
In directory usw-pr-cvs1:/tmp/cvs-serv5426/test

Modified Files:
	build.xml 
Log Message:
- Allow nested <defineset> <includepath> <sysincludepath> and 
  <compilerarg> elements inside <compiler> elements.
- Allow nested <libset> and <linkerarg> elements inside <linker> elements.

Index: build.xml
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/test/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** build.xml	2001/12/21 03:01:31	1.2
--- build.xml	2002/01/08 12:26:45	1.3
***************
*** 1,4 ****
  <project name="test" default="test-all">
!     <taskdef name="cc" classname="net.sf.antcontrib.cpptasks.CCTask"/>
      <property name="build.dir" value="build"/>
      <property name="debug" value="true"/>
--- 1,7 ----
  <project name="test" default="test-all">
!     <taskdef name="cc" classname="net.sf.antcontrib.cpptasks.CCTask">
!         <classpath location="../build/lib/cpptasks.jar"/>
!     </taskdef>
! 
      <property name="build.dir" value="build"/>
      <property name="debug" value="true"/>
***************
*** 25,33 ****
                  link="static"
                  debug="${debug}" >
!             <compiler name="msvc" if="windows"/>
              <compiler name="libtool" if="libtool"/>
              <compiler name="gcc"/>
              <fileset dir="c-src/lib_static"/>
-             <defineset define="DLL_IMPORT"/>
              <includepath location="c-src/include"/>
          </cc>
--- 28,37 ----
                  link="static"
                  debug="${debug}" >
!             <compiler name="msvc" if="windows">
!                 <defineset define="DLL_IMPORT"/>
!             </compiler>
              <compiler name="libtool" if="libtool"/>
              <compiler name="gcc"/>
              <fileset dir="c-src/lib_static"/>
              <includepath location="c-src/include"/>
          </cc>
***************
*** 36,44 ****
                  link="shared"
                  debug="${debug}">
!             <compiler name="msvc" if="windows"/>
              <compiler name="libtool" if="libtool"/>
              <compiler name="gcc"/>
              <fileset dir="c-src/lib_shared"/>
-             <defineset define="DLL_EXPORT"/>
              <includepath location="c-src/include"/>
          </cc>
--- 40,49 ----
                  link="shared"
                  debug="${debug}">
!             <compiler name="msvc" if="windows">
!                 <defineset define="DLL_EXPORT"/>
!             </compiler>
              <compiler name="libtool" if="libtool"/>
              <compiler name="gcc"/>
              <fileset dir="c-src/lib_shared"/>
              <includepath location="c-src/include"/>
          </cc>
***************
*** 47,55 ****
                  link="exe"
                  debug="${debug}">
!             <compiler name="msvc" if="windows"/>
              <compiler name="libtool" if="libtool"/>
              <compiler name="gcc"/>
              <fileset dir="c-src/testapp"/>
-             <defineset define="DLL_IMPORT"/>
              <includepath location="c-src/include"/>
              <libset libs="shared, static">
--- 52,61 ----
                  link="exe"
                  debug="${debug}">
!             <compiler name="msvc" if="windows">
!                 <defineset define="DLL_EXPORT"/>
!             </compiler>
              <compiler name="libtool" if="libtool"/>
              <compiler name="gcc"/>
              <fileset dir="c-src/testapp"/>
              <includepath location="c-src/include"/>
              <libset libs="shared, static">