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 di...@apache.org on 2006/03/13 11:46:15 UTC
svn commit: r385503 - /webservices/axis/trunk/c/build/buildAdminClient.xml
Author: dicka
Date: Mon Mar 13 02:46:14 2006
New Revision: 385503
URL: http://svn.apache.org/viewcvs?rev=385503&view=rev
Log:
Resolve compilation problems in AdminClient when using a trace enabled build.
Have disabled trace within AdminClient - the AxisClient used by AdminClient will still have trace.
Modified:
webservices/axis/trunk/c/build/buildAdminClient.xml
Modified: webservices/axis/trunk/c/build/buildAdminClient.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/build/buildAdminClient.xml?rev=385503&r1=385502&r2=385503&view=diff
==============================================================================
--- webservices/axis/trunk/c/build/buildAdminClient.xml (original)
+++ webservices/axis/trunk/c/build/buildAdminClient.xml Mon Mar 13 02:46:14 2006
@@ -8,83 +8,47 @@
<mkdir dir="${dir.objects}"/>
<mkdir dir="${dir.bin}"/>
- <if>
- <not>
- <isset property="aix"/>
- </not>
- <then>
- <!--
- Library name may have been change if windows debug build. Changed in buildInitialize.xml
- -->
- <cc outfile="${dir.bin}/${adminClientExecutableName}"
- objdir="${dir.objects}"
- exceptions="true"
- outtype="executable"
- multithreaded="true">
-
- <!-- Compilers -->
- <compiler refid="SolarisCC"/>
- <compiler refid="Linuxgcc"/>
- <compiler refid="HP-UXaC++"/>
- <compiler extends="VisualC++"/>
- <compiler refid="OS400icc"/>
-
- <!-- required libraries -->
- <syslibset libs="${clientLibraryName}" dir="${dir.bin}" unless="os400"/>
-
- <!-- Additional compiler flag for Client library on all platforms -->
- <defineset>
- <define name="ENABLE_AXISTRACE" if="trace"/>
- </defineset>
-
- <!-- Linkers -->
- <linker refid="SolarisLinker"/>
- <linker refid="LinuxLinker"/>
- <linker refid="HP-UXLinker"/>
- <linker refid="VisualC++Linker"/>
- <linker extends="OS400ExecutableLinker">
- <linkerarg location="end" value="${dir.bin}/lib${clientLibraryName}.so"/>
- <linkerarg value="-qOPTION=*DUPPROC"/>
- <linkerarg value="-qOPTION=*DUPVAR"/>
- </linker>
-
- <!-- Files to be compiled -->
- <fileset dir="${dir.src}">
- <include name="client/adminclient/*.cpp"/>
- <include name="platforms/windows/*.cpp" if="windows"/>
- <include name="platforms/unix/*.cpp" if="linux"/>
- <include name="platforms/unix/*.cpp" if="solaris"/>
- <include name="platforms/os400/*.cpp" if="os400"/>
- </fileset>
- </cc>
- </then>
- <else>
- <cc outfile="${dir.bin}/${adminClientExecutableName}"
- objdir="${dir.objects}"
- exceptions="true"
- multithreaded="true">
-
- <!-- Compilers -->
- <compiler refid="AIXxlc"/>
-
- <!-- required libraries -->
- <syslibset libs="${clientLibraryName}" dir="${dir.bin}"/>
-
- <!-- Additional compiler flag for Client library on all platforms -->
- <defineset>
- <define name="ENABLE_AXISTRACE" if="trace"/>
- </defineset>
-
- <!-- Linkers -->
- <linker refid="AIXLinker"/>
+ <!--
+ Library name may have been change if windows debug build. Changed in buildInitialize.xml
+ -->
+ <cc outfile="${dir.bin}/${adminClientExecutableName}"
+ objdir="${dir.objects}"
+ exceptions="true"
+ outtype="executable"
+ multithreaded="true">
+
+ <!-- Compilers -->
+ <compiler refid="SolarisCC"/>
+ <compiler refid="Linuxgcc"/>
+ <compiler refid="HP-UXaC++"/>
+ <compiler extends="VisualC++"/>
+ <compiler refid="OS400icc"/>
+ <compiler refid="AIXxlc"/>
+
+ <!-- required libraries -->
+ <syslibset libs="${clientLibraryName}" dir="${dir.bin}" unless="os400"/>
+
+ <!-- Linkers -->
+ <linker refid="SolarisLinker"/>
+ <linker refid="LinuxLinker"/>
+ <linker refid="HP-UXLinker"/>
+ <linker refid="VisualC++Linker"/>
+ <linker refid="AIXLinker"/>
+ <linker extends="OS400ExecutableLinker">
+ <linkerarg location="end" value="${dir.bin}/lib${clientLibraryName}.so"/>
+ <linkerarg value="-qOPTION=*DUPPROC"/>
+ <linkerarg value="-qOPTION=*DUPVAR"/>
+ </linker>
<!-- Files to be compiled -->
- <fileset dir="${dir.src}">
- <include name="client/adminclient/*.cpp"/>
- <include name="platforms/aix/*.cpp"/>
- </fileset>
- </cc>
- </else>
- </if>
+ <fileset dir="${dir.src}">
+ <include name="client/adminclient/*.cpp"/>
+ <include name="platforms/windows/*.cpp" if="windows"/>
+ <include name="platforms/unix/*.cpp" if="linux"/>
+ <include name="platforms/unix/*.cpp" if="solaris"/>
+ <include name="platforms/os400/*.cpp" if="os400"/>
+ <include name="platforms/aix/*.cpp" if="aix"/>
+ </fileset>
+ </cc>
</target>
</project>