Menu
▾
▴
[Ant-contrib-developers] CVS: cpptasks/samples xercesc.ant,1.4,1.5
|
From: Curt A. <ca...@us...> - 2002-03-21 06:33:19
|
Update of /cvsroot/ant-contrib/cpptasks/samples
In directory usw-pr-cvs1:/tmp/cvs-serv2432
Modified Files:
xercesc.ant
Log Message:
XercesCOM now works
Index: xercesc.ant
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/samples/xercesc.ant,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** xercesc.ant 20 Mar 2002 06:36:02 -0000 1.4
--- xercesc.ant 21 Mar 2002 06:33:16 -0000 1.5
***************
*** 80,83 ****
--- 80,84 ----
<property name="docs.dir" value="doc"/>
<property name="tests.dir" value="tests"/>
+ <property name="xml4com.dir" value="../../Build/Win32/xml4com"/>
***************
*** 114,118 ****
<target name="win-debug-init" depends="pre-init" if="is-debug">
! <property name="build.dir" value="../../build/win32/${compiler}/Debug"/>
<property name="build.obj.dir" value="${build.dir}/obj"/>
</target>
--- 115,119 ----
<target name="win-debug-init" depends="pre-init" if="is-debug">
! <property name="build.dir" value="../../Build/Win32/${compiler}/Debug"/>
<property name="build.obj.dir" value="${build.dir}/obj"/>
</target>
***************
*** 155,173 ****
</compiler>
! <compiler id="gcc" name="gcc" if="use-gcc">
</compiler>
- <linker id="gcc_dll_link" name="gcc" if="use-gcc">
- </linker>
- <linker id="ms_dll_link" name="msvc" if="use-msvc">
- <linkerarg value="/SUBSYSTEM:WINDOWS"/>
- </linker>
! <linker id="gcc_console_link" name="gcc" if="use-gcc">
! </linker>
- <linker id="ms_console_link" name="msvc" if="use-msvc">
- <linkerarg value="/SUBSYSTEM:CONSOLE"/>
- </linker>
--- 156,180 ----
</compiler>
! <compiler id="msvc_with_extensions" name="msvc" if="use-msvc">
! <!-- target Pentium Pro -->
! <compilerarg value="/G6"/>
! <!-- enable Microsoft Extensions -->
! <compilerarg value="/Ze"/>
! <!-- display many warnings -->
! <compilerarg value="/W3"/>
! <!-- maximize speed -->
! <compilerarg value="/O2" unless="is-debug"/>
! <!-- auto-inlining -->
! <compilerarg value="/Ob2" unless="is-debug"/>
! <defineset>
! <define name="_CRTDBG_MAP_ALLOC" if="is-debug"/>
! </defineset>
</compiler>
! <compiler id="gcc" name="gcc" if="use-gcc">
! </compiler>
!
***************
*** 207,212 ****
<fileset dir="${src.dir}" includes="util/Platforms/Win32/Version.rc"/>
</compiler>
! <linker refid="gcc_dll_link"/>
! <linker refid="ms_dll_link"/>
<fileset dir="${src.dir}">
<include name="dom/*.cpp"/>
--- 214,220 ----
<fileset dir="${src.dir}" includes="util/Platforms/Win32/Version.rc"/>
</compiler>
! <linker name="gcc" if="use-gcc"/>
! <linker name="msvc" base="301989888" if="use-msvc">
! </linker>
<fileset dir="${src.dir}">
<include name="dom/*.cpp"/>
***************
*** 246,250 ****
<!-- libset libs="kernel32.lib,user32.lib,advapi32.lib,ws2_32.lib"/ -->
<libset>
! <fileset>
<include name="KERNEL32.LIB" if="windows"/>
<include name="USER32.LIB" if="windows"/>
--- 254,258 ----
<!-- libset libs="kernel32.lib,user32.lib,advapi32.lib,ws2_32.lib"/ -->
<libset>
! <fileset caseSensitive="false">
<include name="KERNEL32.LIB" if="windows"/>
<include name="USER32.LIB" if="windows"/>
***************
*** 265,270 ****
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker refid="gcc_console_link"/>
! <linker refid="ms_console_link"/>
<fileset dir="${samples.dir}" includes="CreateDOMDocument/CreateDOMDocument.cpp"/>
<includepath location="${include.dir}"/>
--- 273,278 ----
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker name="gcc" if="use-gcc"/>
! <linker name="msvc" if="use-msvc"/>
<fileset dir="${samples.dir}" includes="CreateDOMDocument/CreateDOMDocument.cpp"/>
<includepath location="${include.dir}"/>
***************
*** 289,294 ****
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker refid="gcc_console_link"/>
! <linker refid="ms_console_link"/>
<fileset dir="${samples.dir}" includes="DOMCount/DOMCount.cpp"/>
<includepath location="${include.dir}"/>
--- 297,302 ----
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker name="gcc" if="use-gcc"/>
! <linker name="msvc" if="use-msvc"/>
<fileset dir="${samples.dir}" includes="DOMCount/DOMCount.cpp"/>
<includepath location="${include.dir}"/>
***************
*** 314,319 ****
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker refid="gcc_console_link"/>
! <linker refid="ms_console_link"/>
<fileset dir="${tests.dir}" includes="DOM/DOMIDTest/DOMIDTest.cpp"/>
<includepath location="${include.dir}"/>
--- 322,327 ----
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker name="gcc" if="use-gcc"/>
! <linker name="msvc" if="use-msvc"/>
<fileset dir="${tests.dir}" includes="DOM/DOMIDTest/DOMIDTest.cpp"/>
<includepath location="${include.dir}"/>
***************
*** 340,345 ****
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker refid="gcc_console_link"/>
! <linker refid="ms_console_link"/>
<fileset dir="${tests.dir}" includes="DOM/DOMMemTest/DOMMemTest.cpp"/>
<includepath location="${include.dir}"/>
--- 348,353 ----
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker name="gcc" if="use-gcc"/>
! <linker name="msvc" if="use-msvc"/>
<fileset dir="${tests.dir}" includes="DOM/DOMMemTest/DOMMemTest.cpp"/>
<includepath location="${include.dir}"/>
***************
*** 366,371 ****
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker refid="gcc_console_link"/>
! <linker refid="ms_console_link"/>
<fileset dir="${samples.dir}" includes="DOMPrint/*.cpp"/>
<includepath location="${include.dir}"/>
--- 374,379 ----
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker name="gcc" if="use-gcc"/>
! <linker name="msvc" if="use-msvc"/>
<fileset dir="${samples.dir}" includes="DOMPrint/*.cpp"/>
<includepath location="${include.dir}"/>
***************
*** 392,397 ****
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker refid="gcc_console_link"/>
! <linker refid="ms_console_link"/>
<fileset dir="${tests.dir}" includes="DOM/DOMTest/*.cpp"/>
<includepath location="${include.dir}"/>
--- 400,405 ----
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker name="gcc" if="use-gcc"/>
! <linker name="msvc" if="use-msvc"/>
<fileset dir="${tests.dir}" includes="DOM/DOMTest/*.cpp"/>
<includepath location="${include.dir}"/>
***************
*** 419,424 ****
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker refid="gcc_console_link"/>
! <linker refid="ms_console_link"/>
<fileset dir="${tests.dir}" includes="DOM/Traversal/*.cpp"/>
<includepath location="${include.dir}"/>
--- 427,432 ----
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker name="gcc" if="use-gcc"/>
! <linker name="msvc" if="use-msvc"/>
<fileset dir="${tests.dir}" includes="DOM/Traversal/*.cpp"/>
<includepath location="${include.dir}"/>
***************
*** 445,450 ****
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker refid="gcc_console_link"/>
! <linker refid="ms_console_link"/>
<fileset dir="${tests.dir}" includes="EncodingTest/*.cpp"/>
<includepath location="${include.dir}"/>
--- 453,458 ----
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker name="gcc" if="use-gcc"/>
! <linker name="msvc" if="use-msvc"/>
<fileset dir="${tests.dir}" includes="EncodingTest/*.cpp"/>
<includepath location="${include.dir}"/>
***************
*** 471,476 ****
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker refid="gcc_console_link"/>
! <linker refid="ms_console_link"/>
<fileset dir="${samples.dir}" includes="EnumVal/*.cpp"/>
<includepath location="${include.dir}"/>
--- 479,484 ----
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker name="gcc" if="use-gcc"/>
! <linker name="msvc" if="use-msvc"/>
<fileset dir="${samples.dir}" includes="EnumVal/*.cpp"/>
<includepath location="${include.dir}"/>
***************
*** 497,502 ****
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker refid="gcc_console_link"/>
! <linker refid="ms_console_link"/>
<fileset dir="${samples.dir}" includes="IDOMCount/*.cpp"/>
<includepath location="${include.dir}"/>
--- 505,510 ----
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker name="gcc" if="use-gcc"/>
! <linker name="msvc" if="use-msvc"/>
<fileset dir="${samples.dir}" includes="IDOMCount/*.cpp"/>
<includepath location="${include.dir}"/>
***************
*** 523,528 ****
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker refid="gcc_console_link"/>
! <linker refid="ms_console_link"/>
<fileset dir="${tests.dir}" includes="IDom/IDOMMemTest/*.cpp"/>
<includepath location="${include.dir}"/>
--- 531,536 ----
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker name="gcc" if="use-gcc"/>
! <linker name="msvc" if="use-msvc"/>
<fileset dir="${tests.dir}" includes="IDom/IDOMMemTest/*.cpp"/>
<includepath location="${include.dir}"/>
***************
*** 547,552 ****
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker refid="gcc_console_link"/>
! <linker refid="ms_console_link"/>
<fileset dir="${samples.dir}" includes="IDOMPrint/*.cpp"/>
<includepath location="${include.dir}"/>
--- 555,560 ----
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker name="gcc" if="use-gcc"/>
! <linker name="msvc" if="use-msvc"/>
<fileset dir="${samples.dir}" includes="IDOMPrint/*.cpp"/>
<includepath location="${include.dir}"/>
***************
*** 571,576 ****
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker refid="gcc_console_link"/>
! <linker refid="ms_console_link"/>
<fileset dir="${tests.dir}" includes="IDom/IDOMTest/*.cpp"/>
<includepath location="${include.dir}"/>
--- 579,584 ----
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker name="gcc" if="use-gcc"/>
! <linker name="msvc" if="use-msvc"/>
<fileset dir="${tests.dir}" includes="IDom/IDOMTest/*.cpp"/>
<includepath location="${include.dir}"/>
***************
*** 595,600 ****
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker refid="gcc_console_link"/>
! <linker refid="ms_console_link"/>
<fileset dir="${tests.dir}" includes="InitTermTest/*.cpp"/>
<includepath location="${include.dir}"/>
--- 603,608 ----
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker name="gcc" if="use-gcc"/>
! <linker name="msvc" if="use-msvc"/>
<fileset dir="${tests.dir}" includes="InitTermTest/*.cpp"/>
<includepath location="${include.dir}"/>
***************
*** 620,625 ****
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker refid="gcc_console_link"/>
! <linker refid="ms_console_link"/>
<fileset dir="${tests.dir}" includes="IDom/IRangeTest/*.cpp"/>
<includepath location="${include.dir}"/>
--- 628,633 ----
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker name="gcc" if="use-gcc"/>
! <linker name="msvc" if="use-msvc"/>
<fileset dir="${tests.dir}" includes="IDom/IRangeTest/*.cpp"/>
<includepath location="${include.dir}"/>
***************
*** 644,649 ****
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker refid="gcc_console_link"/>
! <linker refid="ms_console_link"/>
<fileset dir="${tests.dir}" includes="IDom/ITraversal/*.cpp"/>
<includepath location="${include.dir}"/>
--- 652,657 ----
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker name="gcc" if="use-gcc"/>
! <linker name="msvc" if="use-msvc"/>
<fileset dir="${tests.dir}" includes="IDom/ITraversal/*.cpp"/>
<includepath location="${include.dir}"/>
***************
*** 668,673 ****
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker refid="gcc_console_link"/>
! <linker refid="ms_console_link"/>
<fileset dir="${samples.dir}" includes="MemParse/*.cpp"/>
<includepath location="${include.dir}"/>
--- 676,681 ----
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker name="gcc" if="use-gcc"/>
! <linker name="msvc" if="use-msvc"/>
<fileset dir="${samples.dir}" includes="MemParse/*.cpp"/>
<includepath location="${include.dir}"/>
***************
*** 692,697 ****
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker refid="gcc_console_link"/>
! <linker refid="ms_console_link"/>
<fileset dir="${samples.dir}" includes="PParse/*.cpp"/>
<includepath location="${include.dir}"/>
--- 700,705 ----
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker name="gcc" if="use-gcc"/>
! <linker name="msvc" if="use-msvc"/>
<fileset dir="${samples.dir}" includes="PParse/*.cpp"/>
<includepath location="${include.dir}"/>
***************
*** 717,722 ****
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker refid="gcc_console_link"/>
! <linker refid="ms_console_link"/>
<fileset dir="${tests.dir}" includes="DOM/RangeTest/*.cpp"/>
<includepath location="${include.dir}"/>
--- 725,730 ----
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker name="gcc" if="use-gcc"/>
! <linker name="msvc" if="use-msvc"/>
<fileset dir="${tests.dir}" includes="DOM/RangeTest/*.cpp"/>
<includepath location="${include.dir}"/>
***************
*** 741,746 ****
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker refid="gcc_console_link"/>
! <linker refid="ms_console_link"/>
<fileset dir="${samples.dir}" includes="Redirect/*.cpp"/>
<includepath location="${include.dir}"/>
--- 749,754 ----
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker name="gcc" if="use-gcc"/>
! <linker name="msvc" if="use-msvc"/>
<fileset dir="${samples.dir}" includes="Redirect/*.cpp"/>
<includepath location="${include.dir}"/>
***************
*** 766,771 ****
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker refid="gcc_console_link"/>
! <linker refid="ms_console_link"/>
<fileset dir="${samples.dir}" includes="SAX2Count/*.cpp"/>
<includepath location="${include.dir}"/>
--- 774,779 ----
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker name="gcc" if="use-gcc"/>
! <linker name="msvc" if="use-msvc"/>
<fileset dir="${samples.dir}" includes="SAX2Count/*.cpp"/>
<includepath location="${include.dir}"/>
***************
*** 791,796 ****
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker refid="gcc_console_link"/>
! <linker refid="ms_console_link"/>
<fileset dir="${samples.dir}" includes="SAXCount/*.cpp"/>
<includepath location="${include.dir}"/>
--- 799,804 ----
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker name="gcc" if="use-gcc"/>
! <linker name="msvc" if="use-msvc"/>
<fileset dir="${samples.dir}" includes="SAXCount/*.cpp"/>
<includepath location="${include.dir}"/>
***************
*** 816,821 ****
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker refid="gcc_console_link"/>
! <linker refid="ms_console_link"/>
<fileset dir="${samples.dir}" includes="SAXPrint/*.cpp"/>
<includepath location="${include.dir}"/>
--- 824,829 ----
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker name="gcc" if="use-gcc"/>
! <linker name="msvc" if="use-msvc"/>
<fileset dir="${samples.dir}" includes="SAXPrint/*.cpp"/>
<includepath location="${include.dir}"/>
***************
*** 841,846 ****
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker refid="gcc_console_link"/>
! <linker refid="ms_console_link"/>
<fileset dir="${samples.dir}" includes="SEnumVal/*.cpp"/>
<includepath location="${include.dir}"/>
--- 849,854 ----
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker name="gcc" if="use-gcc"/>
! <linker name="msvc" if="use-msvc"/>
<fileset dir="${samples.dir}" includes="SEnumVal/*.cpp"/>
<includepath location="${include.dir}"/>
***************
*** 866,871 ****
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker refid="gcc_console_link"/>
! <linker refid="ms_console_link"/>
<fileset dir="${samples.dir}" includes="StdInParse/*.cpp"/>
<includepath location="${include.dir}"/>
--- 874,879 ----
<compiler refid="gcc"/>
<compiler refid="msvc"/>
! <linker name="gcc" if="use-gcc"/>
! <linker name="msvc" if="use-msvc"/>
<fileset dir="${samples.dir}" includes="StdInParse/*.cpp"/>
<includepath location="${include.dir}"/>
***************
*** 890,910 ****
multithreaded="true" exceptions="true">
<compiler refid="gcc"/>
! <compiler name="msvc" if="use-msvc">
! <!-- target Pentium Pro -->
! <compilerarg value="/G6"/>
! <!-- enable Microsoft Extensions -->
! <compilerarg value="/Ze"/>
! <!-- display many warnings -->
! <compilerarg value="/W3"/>
! <!-- maximize speed -->
! <compilerarg value="/O2" unless="is-debug"/>
! <!-- auto-inlining -->
! <compilerarg value="/Ob2" unless="is-debug"/>
! <defineset>
! <define name="_CRTDBG_MAP_ALLOC" if="is-debug"/>
! </defineset>
! </compiler>
! <linker refid="gcc_console_link"/>
! <linker refid="ms_console_link"/>
<fileset dir="${tests.dir}" includes="ThreadTest/*.cpp"/>
<includepath location="${include.dir}"/>
--- 898,904 ----
multithreaded="true" exceptions="true">
<compiler refid="gcc"/>
! <compiler refid="msvc_with_extensions"/>
! <linker name="gcc" if="use-gcc"/>
! <linker name="msvc" if="use-msvc"/>
<fileset dir="${tests.dir}" includes="ThreadTest/*.cpp"/>
<includepath location="${include.dir}"/>
***************
*** 921,934 ****
</target>
! <target name="xml4com_tlb" depends="init" if="windows">
! <mkdir dir="${build.obj.dir}"/>
! <mkdir dir="${build.dir}"/>
<cc debug="${debug}" link="none"
! objdir="${build.obj.dir}" outfile="../../build/xml4com"
multithreaded="true" exceptions="true">
<compiler name="midl">
<!-- output generated header file to use in next step -->
! <compilerarg value="/h ${build.obj.dir}/xml4com.h"/>
! <compilerarg value="/iid ${build.obj.dir}/xml4com_i.c"/>
</compiler>
<fileset dir="${src.dir}" includes="com/xml4com.idl"/>
--- 915,929 ----
</target>
! <target name="XercesCOM_tlb" depends="init" if="windows">
! <mkdir dir="${xml4com.dir}"/>
<cc debug="${debug}" link="none"
! objdir="${xml4com.dir}" outfile="xml4com"
multithreaded="true" exceptions="true">
<compiler name="midl">
<!-- output generated header file to use in next step -->
! <compilerarg value="/h"/>
! <compilerarg value="xml4com.h"/>
! <compilerarg value="/iid"/>
! <compilerarg value="xml4com_i.c"/>
</compiler>
<fileset dir="${src.dir}" includes="com/xml4com.idl"/>
***************
*** 937,940 ****
--- 932,962 ----
</target>
+ <target name="XercesCOM" depends="XercesCOM_tlb">
+ <mkdir dir="${build.obj.dir}"/>
+ <mkdir dir="${build.dir}"/>
+ <cc debug="${debug}" link="shared"
+ objdir="${build.obj.dir}" outfile="${build.dir}/xml4com"
+ multithreaded="true" exceptions="true">
+ <compiler refid="msvc_with_extensions"/>
+ <compiler name="msrc" if="use-msvc">
+ <compilerarg value="/l 0x409"/>
+ <fileset dir="${src.dir}" includes="com/*.rc"/>
+ </compiler>
+ <linker name="msvc"/>
+ <fileset dir="${src.dir}" includes="com/*.cpp"/>
+ <includepath location="${xml4com.dir}"/>
+ <includepath location="${include.dir}"/>
+ <includepath location="."/>
+ <defineset>
+ <define name="PLATFORM_WIN32" if="windows"/>
+ </defineset>
+ <libset>
+ <fileset dir="${build.dir}" includes="xerces-c.lib"/>
+ <fileset caseSensitive="false">
+ <include name="WININET.LIB"/>
+ </fileset>
+ </libset>
+ </cc>
+ </target>
***************
*** 957,968 ****
RangeTest,ThreadTest"/>
! <!--
! ===================================================================
! Main target - runs dist-lite by default
! ===================================================================
! -->
<target name="main"
! description="--> creates a minimum distribution in ./dist"
! depends="CreateDOMDocument" />
</project>
--- 979,986 ----
RangeTest,ThreadTest"/>
! <target name="XercesAll" depends="Samples,Tests,XercesCOM"/>
!
<target name="main"
! depends="XercesAll" />
</project>
|