axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From di...@apache.org
Subject svn commit: r265693 - /webservices/axis/trunk/c/buildSamples.xml
Date Thu, 01 Sep 2005 10:52:59 GMT
Author: dicka
Date: Thu Sep  1 03:52:33 2005
New Revision: 265693

URL: http://svn.apache.org/viewcvs?rev=265693&view=rev
Log:
Update buildSamples.xml to use same compiler/linker definitions as build and test scripts
-- avoiding duplication.

Modified:
    webservices/axis/trunk/c/buildSamples.xml

Modified: webservices/axis/trunk/c/buildSamples.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/buildSamples.xml?rev=265693&r1=265692&r2=265693&view=diff
==============================================================================
--- webservices/axis/trunk/c/buildSamples.xml (original)
+++ webservices/axis/trunk/c/buildSamples.xml Thu Sep  1 03:52:33 2005
@@ -25,6 +25,9 @@
 	- Linux   = gcc
 	- AIX     = Visual Age
 </description>
+
+    <import file="${basedir}/build/buildInitialize.xml"/>
+    
 	<!--
 	  Load definition of C/C++ Tasks and Types
 	  To allow the compilation and linking of C/C++ code
@@ -48,107 +51,6 @@
 	<property name="dir.wsdls" value="${basedir}/deploy/wsdls"/>
 	
 	<!--property name="sampleName" value="base"/-->
-
-	<!--
-	  Compiler definitions
-	  -->
-	  
-		<!--
-		  Definition of Visual C++ compiler
-		  -->
-		<compiler id="VisualC++" name="msvc" if="windows">
-			<compilerarg value="/nologo"/>
-			<compilerarg value="/MD"/>
-			<compilerarg value="/W3"/>
-			<compilerarg value="/GX"/>
-			<compilerarg value="/Od"/>
-			<includepath path="${dir.include}"/>
-			<defineset>
-				<define name="WIN32"/>
-				<define name="NDEBUG"/>
-				<define name="_WINDOWS"/>
-				<define name="_MBCS"/>
-				<define name="_USRDLL"/>
-				<define name="ENABLE_AXIS_EXCEPTION"/>
-			</defineset>
-			<compilerarg value="/FD"/>
-			<compilerarg value="/c"/>
-		</compiler>
-		
-		<!--
-		  Definition of gcc compile for Linux
-		  -->
-		<compiler id="Linuxgcc" name="g++" if="linux">
-			<compilerarg value="-g"/>
-			<defineset>
-				<define name="ENABLE_AXIS_EXCEPTION"/>
-				<define name="HAVE_CONFIG_H"/>
-				<define name="PIC"/>
-			</defineset>
-			<includepath path="${dir.include}"/>
-		</compiler>
-	
-		<!--
-		  Definition of xlc compile for AIX
-		  -->
-		<compiler id="AIXxlc" name="xlC" if="aix">
-			<compilerarg value="-g"/>
-			<compilerarg value="-V"/>
-			<compilerarg value="-qstaticinline"/>
-
-			<defineset>
-				<define name="ENABLE_AXIS_EXCEPTION"/>
-				<define name="HAVE_CONFIG_H"/>
-				<define name="AIX"/>
-			</defineset>
-			<includepath path="${dir.include}"/>
-		</compiler>
-
-	<!--
-	  Linker Definitions
-	  -->
-	
-		<!--
-		  Definition of Visual C++ linker
-		  -->
-		<linker id="VisualC++Linker" name="msvc" if="windows">
-			<linkerarg value="/machine:I386"/>
-			<linkerarg value="/nologo"/>
-			<linkerarg value="/pdb:none"/>
-		</linker>
-	
-		<!--
-		  Definition of Linux linker
-		  -->
-		<linker id="LinuxLinker" name="g++" libtool="true" if="linux">
-			<linkerarg value="-g"/>
-			<libset libs="stdc++"/>
-			<libset libs="dl"/>
-			<libset libs="pthread"/>
-		</linker>
-	
-		<!--
-		  Definition of AIX linker
-		  -->
-		<linker id="AIXLinker" name="xlC" libtool="false" if="aix">
-			<!-- debug is on for all -->
-			<linkerarg value="-g"/>
-		</linker>	
-
-	<!--
-	  Determine platform
-	  -->
-	<target name="pre-init">
-		<condition property="windows">
-			<os family="windows"/>
-		</condition>
-		<condition property="aix">
-			<os name="AIX"/>
-		</condition>
-		<condition property="linux">
-			<os name="Linux"/>
-		</condition>
-	</target>
 
 	<!--
 	  Check if an individual samples name has been specified



Mime
View raw message