You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ha...@apache.org on 2005/01/07 17:11:01 UTC
cvs commit: ws-axis/c/build buildTransport.xml buildTransportIPV6.xml buildXMLParser.xml
hawkeye 2005/01/07 08:11:01
Modified: c/build buildTransport.xml buildTransportIPV6.xml
buildXMLParser.xml
Log:
Fixing AXISCPP-338 and added in _D to windows build when building debug
Revision Changes Path
1.5 +15 -1 ws-axis/c/build/buildTransport.xml
Index: buildTransport.xml
===================================================================
RCS file: /home/cvs/ws-axis/c/build/buildTransport.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- buildTransport.xml 9 Dec 2004 17:18:36 -0000 1.4
+++ buildTransport.xml 7 Jan 2005 16:11:00 -0000 1.5
@@ -11,7 +11,21 @@
<isset property="aix"/>
</not>
<then>
- <cc outfile="${dir.bin}/${transportLibraryName}" objdir="${dir.objects}"
+ <!-- Check to see if we are in debug mode so need _D library name -->
+ <if>
+ <and>
+ <isset property="windows"/>
+ <equals arg1="${debug}" arg2="true"/>
+ </and>
+ <then>
+ <property name="completeTransportLibraryName" value="${transportLibraryName}_D"/>
+ </then>
+ <else>
+ <property name="completeTransportLibraryName" value="${transportLibraryName}"/>
+ </else>
+ </if>
+
+ <cc outfile="${dir.bin}/${completeTransportLibraryName}" objdir="${dir.objects}"
exceptions="true" outtype="shared" multithreaded="true">
<!-- Compilers -->
<compiler refid="SolarisCC"/>
1.3 +15 -1 ws-axis/c/build/buildTransportIPV6.xml
Index: buildTransportIPV6.xml
===================================================================
RCS file: /home/cvs/ws-axis/c/build/buildTransportIPV6.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- buildTransportIPV6.xml 14 Dec 2004 10:39:15 -0000 1.2
+++ buildTransportIPV6.xml 7 Jan 2005 16:11:00 -0000 1.3
@@ -11,7 +11,21 @@
<isset property="aix"/>
</not>
<then>
- <cc outfile="${dir.bin}/${transportLibraryName}" objdir="${dir.objects}"
+ <!-- Check to see if we are in debug mode so need _D library name -->
+ <if>
+ <and>
+ <isset property="windows"/>
+ <equals arg1="${debug}" arg2="true"/>
+ </and>
+ <then>
+ <property name="completeTransportLibraryName" value="${transportLibraryName}_D"/>
+ </then>
+ <else>
+ <property name="completeTransportLibraryName" value="${transportLibraryName}"/>
+ </else>
+ </if>
+
+ <cc outfile="${dir.bin}/${completeTransportLibraryName}" objdir="${dir.objects}"
exceptions="true" outtype="shared" multithreaded="true">
<!-- Compilers -->
<compiler refid="SolarisCC"/>
1.2 +15 -1 ws-axis/c/build/buildXMLParser.xml
Index: buildXMLParser.xml
===================================================================
RCS file: /home/cvs/ws-axis/c/build/buildXMLParser.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- buildXMLParser.xml 2 Nov 2004 15:19:44 -0000 1.1
+++ buildXMLParser.xml 7 Jan 2005 16:11:00 -0000 1.2
@@ -11,7 +11,21 @@
<isset property="aix"/>
</not>
<then>
- <cc outfile="${dir.bin}/${xmlParserLibraryName}" objdir="${dir.objects}"
+ <!-- Check to see if we are in debug mode -->
+ <if>
+ <and>
+ <isset property="windows"/>
+ <equals arg1="${debug}" arg2="true"/>
+ </and>
+ <then>
+ <property name="completeXmlParserLibraryName" value="${xmlParserLibraryName}_D"/>
+ </then>
+ <else>
+ <property name="completeXmlParserLibraryName" value="${xmlParserLibraryName}"/>
+ </else>
+ </if>
+
+ <cc outfile="${dir.bin}/${completeXmlParserLibraryName}" objdir="${dir.objects}"
exceptions="true" outtype="shared" multithreaded="true">
<!-- Compilers -->
<compiler refid="SolarisCC"/>