ws-axis-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nadira...@apache.org
Subject svn commit: r719625 - in /webservices/axis/trunk/c: build.xml build/buildClientC.xml build/buildTools.xml package.xml
Date Fri, 21 Nov 2008 16:27:31 GMT
Author: nadiramra
Date: Fri Nov 21 08:27:31 2008
New Revision: 719625

URL: http://svn.apache.org/viewvc?rev=719625&view=rev
Log:
AXISCPP-100 enable axis c++ (engine) tracing - update build files.

Added:
    webservices/axis/trunk/c/build/buildClientC.xml
      - copied, changed from r676256, webservices/axis/trunk/c/build/buildTest.xml
Removed:
    webservices/axis/trunk/c/build/buildTools.xml
Modified:
    webservices/axis/trunk/c/build.xml
    webservices/axis/trunk/c/package.xml

Modified: webservices/axis/trunk/c/build.xml
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/build.xml?rev=719625&r1=719624&r2=719625&view=diff
==============================================================================
--- webservices/axis/trunk/c/build.xml (original)
+++ webservices/axis/trunk/c/build.xml Fri Nov 21 08:27:31 2008
@@ -37,7 +37,7 @@
 	</description>
 
 	<import file="${basedir}/build/buildInitialize.xml"/>
-	<import file="${basedir}/build/buildTools.xml"/>
+	<import file="${basedir}/build/buildClientC.xml"/>
 	<import file="${basedir}/build/buildClient.xml"/>
 	<import file="${basedir}/build/buildTransport.xml"/>
 	<import file="${basedir}/build/buildChannel.xml"/>
@@ -282,30 +282,12 @@
 		<ant dir="." antFile="unitTest.xml" inheritAll="true"/>
 	</target>
 
-	<target name="buildWithTrace" depends="initialize"
- 	 description="Build traced runtime libraries, WSDL2Ws tool and API Documentation">
-		<antcall target="addTrace" inheritall="true"/>
-		<property name="trace" value="true"/>
-		<antcall target="build" inheritall="true">
-			<param name="dir.src" value="${dir.src.instrumented}"/>
-		</antcall>
-	</target>
-
 	<target name="buildWithDebug" depends="initialize"
 	 description="Build runtime libraries (with debug symbols), WSDL2Ws tool and API Documentation">
 		<property name="debug" value="true"/>
 		<antcall target="build" inheritall="true"/>
 	</target>
 	
-	<target name="buildWithTraceAndDebug" depends="initialize"
-	 description="Build traced runtime libraries (with debug symbols), WSDL2Ws tool and API
Documentation">
-		<antcall target="addTrace" inheritall="true"/>
-		<property name="debug" value="true"/>
-		<property name="trace" value="true"/>
-		<antcall target="build" inheritall="true">
-			<param name="dir.src" value="${dir.src.instrumented}"/>
-		</antcall>
-	</target>
 	<!--
 	  Remove all generated artifaces
 	  -->

Copied: webservices/axis/trunk/c/build/buildClientC.xml (from r676256, webservices/axis/trunk/c/build/buildTest.xml)
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/build/buildClientC.xml?p2=webservices/axis/trunk/c/build/buildClientC.xml&p1=webservices/axis/trunk/c/build/buildTest.xml&r1=676256&r2=719625&rev=719625&view=diff
==============================================================================
--- webservices/axis/trunk/c/build/buildTest.xml (original)
+++ webservices/axis/trunk/c/build/buildClientC.xml Fri Nov 21 08:27:31 2008
@@ -1,172 +1,80 @@
-<project name="buildTest" default="compileClient" basedir="..">
-	<import file="buildLibrary.xml"/>
-	
-	<target name="buildClient" unless="runOnly">
-		<antcall target="compileClient" inheritAll="true"/>
-	</target>
-
-	<!--
-	  Need to set a language property for wsdl2ws
-	  -->
-	<target name="setLanguage">
-		<condition property="generated.lang" value="c++">
-			<equals arg1="${test.clientLang}" arg2="cpp"/>
-		</condition>
-		<condition property="generated.lang.allheaders" value="*.hpp">
-			<equals arg1="${test.clientLang}" arg2="cpp"/>
-		</condition>
-		<condition property="clientLibraryName.lang" value="${clientLibraryName}">
-			<equals arg1="${test.clientLang}" arg2="cpp"/>
-		</condition>
-		<condition property="CommonClientTestCode.header" value="CommonClientTestCode.hpp">
-			<equals arg1="${test.clientLang}" arg2="cpp"/>
-		</condition>
-
-		<condition property="generated.lang" value="c">
-			<equals arg1="${test.clientLang}" arg2="c"/>
-		</condition>
-		<condition property="generated.lang.allheaders" value="*.h">
-			<equals arg1="${test.clientLang}" arg2="c"/>
-		</condition>
-		<condition property="clientLibraryName.lang" value="${cClientLibraryName}">
-			<equals arg1="${test.clientLang}" arg2="c"/>
-		</condition>
-		<condition property="CommonClientTestCode.header" value="CommonClientTestCode.h">
-			<equals arg1="${test.clientLang}" arg2="c"/>
-		</condition>
-	</target>
+<project name="Apache Axis C Build Tools" default="" basedir="..">
 
 	<!--
-	  Use WSDL2Ws to generate stubs from WSDL files
+	  Compile, package and run the C binding generator
 	  -->
-	<target name="generateStubs" if="test.wsdl" unless="test.dynamicCode" depends="setLanguage">
-		<!-- Make directory in which all generated code shall be placed -->
-		<mkdir dir="${dir.test.generated}/${test.clientLang}/${test.name}"/>
-		<!-- Setup classpath for WSDL2Ws -->
-		<path id ="cp">
-			<fileset dir="${dir.wsdl2ws}" includes="wsdl2ws.jar"/>
-			<fileset dir="${dir.axisJARs}" includes="*.jar"/>
-		</path>
-		<!-- Run WSDL2Ws -->
-		<!-- use the following java task if client stub generation fails -->
-		<java classname="org.apache.axis.wsdl.wsdl2ws.WSDL2Ws" fork="true"> 
-		 <!-- <java jar="${dir.wsdl2ws}/wsdl2ws.jar" fork="true">-->
-			<classpath refid="cp"/>
-			<arg value="${wsdl.test}"/>
-			<arg value="-o${test.directory}"/>
-			<arg value="-l${generated.lang}"/>
-			<arg value="-sclient"/>
-		</java>
-	</target>
+	<target name="buildCBindings" depends="compileCBindings" if="buildCBindings"
+	  description="Generate the C bindings and compile and link the C bindings client library"/>
 
 	<!--
-	  Copy across test client, ready for compiling
+	  Compile the Axis C Bindings Client Library
 	  -->
-	<target name="getClient" depends="copyStubClient, copyDynamicClient"/>
-
-	<target name="copyStubClient" depends="generateStubs, copyClientCode" unless="test.dynamicCode"/>
-
-	<target name="copyClientCode" unless="test.dynamicCode">
-		<copy file="${client.code}" todir="${test.directory}"/>
-		<copy file="${dir.autotests}/client/${test.clientLang}/${CommonClientTestCode.header}"
 todir="${test.directory}"/>
+	  <target name="compileCBindings" if="buildCBindings">
+		<mkdir dir="${dir.objects}"/>
+		<mkdir dir="${dir.bin}"/>
+        <antcall target="buildVersionResource" inheritall="true">
+            <param name="internalName" value="${cClientLibraryName}"/>
+        </antcall>    
+		<if>
+			<not>
+				<isset property="aix"/>
+			</not>
+			<then>
+				<cc outfile="${dir.bin}/${cClientLibraryName}" objdir="${dir.objects}"
+				 exceptions="true" outtype="shared" multithreaded="true">
+				  	<!-- Compilers -->
+					<compiler refid="SolarisCC"/>
+					<compiler refid="Linuxgcc"/>
+					<compiler extends="VisualC++">
+						<defineset>
+							<define name="AXISCLIENTCDLL_EXPORTS"/>
+						</defineset>
+					</compiler>
+                    <compiler refid="HP-UXaC++"/>            
+			            <compiler refid="OS400icc"/>
+					<!-- Additional compiler flag for Client library on all platforms -->
+					<defineset>
+						<define name="AXIS_CLIENTC_LIB"/>
+					</defineset>
+					<includepath path="${dir.include}${path.separator}${dir.obj}/include"/>
+					<!-- Linkers -->
+					<linker refid="SolarisLinker"/>
+					<linker refid="LinuxLinker"/>
+					<linker refid="VisualC++Linker"/>
+                    <linker refid="HP-UXLinker"/>            
+			        <linker extends="OS400Linker">
+                        <linkerarg value="-qDUPPROC"/>
+                        <linkerarg value="-qDUPVAR"/>
+                        <linkerarg location="end" value="${dir.bin}/lib${clientLibraryName}.so"/>
+                    </linker>
+					<!-- Additional library of the Axis Client Library -->
+					<libset dir="${dir.bin}" libs="${clientLibraryName}" unless="os400"/>
+					<!-- Files to be compiled -->
+					<fileset dir="${dir.src}">
+						<include name="cbindings/**"/>
+					</fileset>
+				</cc>
+			</then>
+			<else>
+				<cc outfile="${dir.bin}/${libraryPrefix}${cClientLibraryName}${librarySuffix}" 
+                         objdir="${dir.objects}" exceptions="true" multithreaded="true">
+				  	<!-- Compilers -->
+					<compiler refid="AIXxlc"/>
+					<!-- Additional compiler flag for Client library on all platforms -->
+					<defineset>
+						<define name="AXIS_CLIENTC_LIB"/>
+					</defineset>
+					<includepath path="${dir.include}${path.separator}${dir.obj}/include"/>
+					<!-- Linkers -->
+					<linker refid="AIXLinker"/>
+					<!-- Additional library of the Axis Client Library -->
+					<libset dir="${dir.bin}" libs="${clientLibraryName}"/>
+					<!-- Files to be compiled -->
+					<fileset dir="${dir.src}">
+						<include name="cbindings/**"/>
+					</fileset>
+				</cc>
+			</else>
+		</if>
 	</target>
-
-	<target name="copyDynamicClient" if="test.dynamicCode">
-		<copy file="${dir.autotests}/client/${test.clientLang}/${CommonClientTestCode.header}"
 todir="${test.directory}"/>
-		<copy todir="${test.directory}">
-			<fileset dir="${dir.autotests}/dynamic/${test.dynamicCodeDirectory}">
-				<include name="*.${test.clientLang}"/>
-				<include name="${generated.lang.allheaders}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<!--
-	  Compile test client
-	  -->
-	<target name="compileClient" depends="callCompileStaticClient, callCompileLinkedClient"/>
-
-	<target name="callCompileStaticClient" unless="test.stubAsLibrary">
-		<antcall target="compileStaticClient" inheritall="true"/>
-	</target>
-	<target name="callCompileLinkedClient" if="test.stubAsLibrary">
-		<property name="libraryName" value="${test.name}_Library"/>
-		<antcall target="compileLinkedClient" inheritall="true"/>
-	</target>
-
-	<target name="compileStaticClient" depends="getClient">
-		<cc failonerror="false" incremental="false" outfile="${test.directory}/${test.name}"
-		 objdir="${test.directory}" exceptions="true"
-		 outtype="executable" subsystem="console">
-		 	<!-- Compilers -->
-			<compiler extends="VisualC++">
-                <defineset>         
-                    <define name="Q168440_WORKAROUND" unless="msvc7" />
-                </defineset>         
-            </compiler>         
-			<compiler refid="SolarisCC"/>
-			<compiler refid="Linuxgcc"/>
-			<compiler refid="AIXxlc"/>
-            <compiler refid="HP-UXaC++"/>      
-            <compiler extends="OS400icc"> 
- 			   <compilerarg value="-g"/> 
-                <defineset>         
-                    <define name="_LONG_LONG" />
-                </defineset>                	      	
-            </compiler>
-			<!-- Linkers -->
-			<linker refid="VisualC++Linker"/>
-			<linker refid="SolarisLinker"/>
-			<linker refid="LinuxLinker"/>
-			<linker refid="AIXExecutableLinker"/>
-            <linker refid="HP-UXLinker"/>      
-		    <linker extends="OS400ExecutableLinker">
-  		         <linkerarg location="end" value="${dir.lib}/lib${clientLibraryName.lang}.so"/>
-		    </linker>
-
-			<!-- Axis Client .lib file location, or UNIX shared object -->
-			<libset dir="${dir.lib}" libs="${clientLibraryName.lang}" unless="os400"/>
-			<!-- Files to be compiled -->
-			<includepath path="${dir.include}"/>
-			<fileset dir="${test.directory}">
-				<include name="*.${test.clientLang}"/>
-			</fileset>
-		</cc>
-	</target>
-
-	<target name="compileLinkedClient" depends="getClient, generateStubs, compileLibrary,
copyClientCode">
-		<basename file="${client.code}" property="client.source"/>
-		<cc failonerror="false" incremental="false" outfile="${test.directory}/${test.name}"
-		 objdir="${test.directory}" exceptions="true"
-		 outtype="executable" subsystem="console">
-		 	<!-- Compilers -->
-			<compiler extends="VisualC++">
-            </compiler>      
-			<compiler refid="SolarisCC"/>
-			<compiler refid="Linuxgcc"/>
-			<compiler refid="AIXxlc"/>
-            <compiler refid="HP-UXaC++"/>      
-			<compiler refid="OS400icc"/>
-			<!-- Linkers -->
-			<linker refid="VisualC++Linker"/>
-			<linker refid="SolarisLinker"/>
-			<linker refid="LinuxLinker"/>
-			<linker refid="AIXExecutableLinker"/>
-            <linker refid="HP-UXLinker"/>      
-		    <linker extends="OS400ExecutableLinker">
-                <linkerarg value="-qDUPPROC"/>
-		        <linkerarg location="end" value="${dir.lib}/lib${clientLibraryName.lang}.so"/>
-		        <linkerarg location="end" value="${test.directory}/lib${libraryName}.so"/>
-		    </linker>
-			<!-- Axis Client .lib file location, or UNIX shared object -->
-			<libset dir="${dir.lib}" libs="${clientLibraryName.lang}" unless="os400"/>
-			<libset dir="${test.directory}" libs="${libraryName}" unless="os400"/>
-			<!-- Files to be compiled -->
-			<includepath path="${dir.include}"/>
-			<fileset dir="${test.directory}">
-				<include name="${client.source}"/>
-			</fileset>
-		</cc>
-	</target>
-
 </project>
\ No newline at end of file

Modified: webservices/axis/trunk/c/package.xml
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/package.xml?rev=719625&r1=719624&r2=719625&view=diff
==============================================================================
--- webservices/axis/trunk/c/package.xml (original)
+++ webservices/axis/trunk/c/package.xml Fri Nov 21 08:27:31 2008
@@ -27,7 +27,7 @@
 Please use these to configure directories to suit the needs of your system.
 	</description>
 	<import file="${basedir}/build/buildInitialize.xml"/>
-	<import file="${basedir}/build/buildTools.xml"/>
+	<import file="${basedir}/build/buildClientC.xml"/>
 
 	<target name="copySource">
 		<mkdir dir="${dir.release}"/>
@@ -355,7 +355,7 @@
     <property name="zipNameTraceSrc" value="${dir.zips}/${release}-trace-src.tar.gz"/>
   </target>
 
-  <target name="ascFiles" depends="initialize, packageWindowsDeliverableName, packageUnixDeliverableName,
buildTools">
+  <target name="ascFiles" depends="initialize, packageWindowsDeliverableName, packageUnixDeliverableName,
buildCBindings">
     <if>
       <available file="${basedir}/../../SecurityKeys/Apache_1_6/gpg/KEYS"/>
       <then>



Mime
View raw message