You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2004/12/16 16:15:28 UTC
cvs commit: ws-axis/c/build buildHandler.xml
dicka 2004/12/16 07:15:28
Modified: c/build buildHandler.xml
Log:
Test handler libraries not being correctly linked on AIX.
Submitted by: Adrian Dick
Reviewed by: Andrew Perry
Revision Changes Path
1.2 +33 -15 ws-axis/c/build/buildHandler.xml
Index: buildHandler.xml
===================================================================
RCS file: /home/cvs/ws-axis/c/build/buildHandler.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- buildHandler.xml 11 Dec 2004 15:26:14 -0000 1.1
+++ buildHandler.xml 16 Dec 2004 15:15:28 -0000 1.2
@@ -5,21 +5,39 @@
-->
<target name="compileTestHandler" if="isHandler">
<mkdir dir="${dir.test.generated}/${client.lang}/${testName}/handlers/${handlerLibraryName}"/>
- <cc incremental="false"
- outfile="${dir.test.generated}/${client.lang}/${testName}/${handlerLibraryName}"
- objdir="${dir.test.generated}/${client.lang}/${testName}/handlers/${handlerLibraryName}" exceptions="true"
- failonerror="false" outtype="shared" multithreaded="true">
- <compiler refid="VisualC++"/>
- <compiler refid="Linuxgcc"/>
- <compiler refid="AIXxlc"/>
- <linker refid="VisualC++Linker"/>
- <linker refid="LinuxLinker"/>
- <linker refid="AIXLinker"/>
- <includepath path="${dir.include}"/>
- <fileset dir="${handlerDir}">
- <include name="*.cpp"/>
- </fileset>
- </cc>
+ <if>
+ <not>
+ <isset property="aix"/>
+ </not>
+ <then>
+ <cc incremental="false"
+ outfile="${dir.test.generated}/${client.lang}/${testName}/${handlerLibraryName}"
+ objdir="${dir.test.generated}/${client.lang}/${testName}/handlers/${handlerLibraryName}" exceptions="true"
+ failonerror="false" outtype="shared" multithreaded="true">
+ <compiler refid="VisualC++"/>
+ <compiler refid="Linuxgcc"/>
+ <linker refid="VisualC++Linker"/>
+ <linker refid="LinuxLinker"/>
+ <includepath path="${dir.include}"/>
+ <fileset dir="${handlerDir}">
+ <include name="*.cpp"/>
+ </fileset>
+ </cc>
+ </then>
+ <else>
+ <cc incremental="false"
+ outfile="${dir.test.generated}/${client.lang}/${testName}/${libraryPrefix}${handlerLibraryName}${librarySuffix}"
+ objdir="${dir.test.generated}/${client.lang}/${testName}/handlers/${handlerLibraryName}" exceptions="true"
+ failonerror="false" multithreaded="true">
+ <compiler refid="AIXxlc"/>
+ <linker refid="AIXLinker"/>
+ <includepath path="${dir.include}"/>
+ <fileset dir="${handlerDir}">
+ <include name="*.cpp"/>
+ </fileset>
+ </cc>
+ </else>
+ </if>
</target>
<target name="setHandlerLibraryName">