axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From di...@apache.org
Subject cvs commit: ws-axis/c buildApache13Module.xml buildApache20Module.xml buildServerEngine.xml buildSimpleAxisServer.xml build.AIX.properties build.Linux.properties build.SunOS.properties build.Win32.properties build.xml buildClient.xml buildInitialize.xml buildTransport.xml buildXMLParser.xml package.xml
Date Fri, 15 Oct 2004 15:51:31 GMT
dicka       2004/10/15 08:51:31

  Modified:    c        build.AIX.properties build.Linux.properties
                        build.SunOS.properties build.Win32.properties
                        build.xml buildClient.xml buildInitialize.xml
                        buildTransport.xml buildXMLParser.xml package.xml
  Added:       c        buildApache13Module.xml buildApache20Module.xml
                        buildServerEngine.xml buildSimpleAxisServer.xml
  Log:
  Addition of server-side libraries to ANT build scripts
  
  Submitted by: Adrian Dick
  
  Revision  Changes    Path
  1.9       +43 -1     ws-axis/c/build.AIX.properties
  
  Index: build.AIX.properties
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/build.AIX.properties,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- build.AIX.properties	15 Oct 2004 07:52:29 -0000	1.8
  +++ build.AIX.properties	15 Oct 2004 15:51:30 -0000	1.9
  @@ -71,6 +71,48 @@
   #     For Unix    :   axis_client will produce libaxis_client.so
   clientLibraryName = axis_client
   
  +############################
  +# Server Engine Properties #
  +############################
  +
  +# Name for compiled server engine - excluding any prefix or suffix
  +# eg: For Windows :   axis_server will produce axis_server.dll
  +#     For Unix    :   axis_server will produce libaxis_server.so
  +serverEngineLibraryName = axis_server
  +
  +#################################
  +# Simple Axis Server Properties #
  +#################################
  +
  +# Is Simple Axis Server to be used?
  +server.simpleAxisServer = false
  +
  +# Name for compiled server engine - excluding any prefix or suffix
  +# eg: For Windows :   simple_axis_server will produce simple_axis_server.exe
  +#     For Unix    :   simple_axis_server will produce simple_axis_server
  +simpleAxisServerExecutableName = simple_axis_server
  +
  +#####################
  +# Apache Properties #
  +#####################
  +
  +# Apache versions to be used
  +server.apache13 = true
  +server.apache20 = true
  +
  +## Values used for Apache 1.3
  +apache13.dir.server = ${env.APACHE13_HOME}
  +apache13.serverLibraryName = mod_axis
  +
  +## Values used for Apache 2.0
  +apache20.dir.server = ${env.APACHE20_HOME}
  +apache20.serverLibraryName = mod_axis2
  +
  +# Name for compiled Apache plugin library - excluding any prefix or suffix
  +# eg: For Windows :   axis_apache will produce axis_apache.dll
  +#     For Unix    :   axis_apache will produce libaxis_apache.so
  +serverLibraryName = mod_axis
  +
   ####################
   # Trace Properties #
   ####################
  @@ -107,7 +149,7 @@
   ###############################
   # Properties for Deliverables #
   ###############################
  -dir.zips = ${basedir}/../../../Zips
  +dir.zips = ${basedir}/../../../zips
   
   ############################
   # Properties for packaging #
  
  
  
  1.7       +43 -1     ws-axis/c/build.Linux.properties
  
  Index: build.Linux.properties
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/build.Linux.properties,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.Linux.properties	14 Oct 2004 08:10:27 -0000	1.6
  +++ build.Linux.properties	15 Oct 2004 15:51:30 -0000	1.7
  @@ -71,6 +71,48 @@
   #     For Unix    :   axis_client will produce libaxis_client.so
   clientLibraryName = axis_client
   
  +############################
  +# Server Engine Properties #
  +############################
  +
  +# Name for compiled server engine - excluding any prefix or suffix
  +# eg: For Windows :   axis_server will produce axis_server.dll
  +#     For Unix    :   axis_server will produce libaxis_server.so
  +serverEngineLibraryName = axis_server
  +
  +#################################
  +# Simple Axis Server Properties #
  +#################################
  +
  +# Is Simple Axis Server to be used?
  +server.simpleAxisServer = false
  +
  +# Name for compiled server engine - excluding any prefix or suffix
  +# eg: For Windows :   simple_axis_server will produce simple_axis_server.exe
  +#     For Unix    :   simple_axis_server will produce simple_axis_server
  +simpleAxisServerExecutableName = simple_axis_server
  +
  +#####################
  +# Apache Properties #
  +#####################
  +
  +# Apache versions to be used
  +server.apache13 = true
  +server.apache20 = true
  +
  +## Values used for Apache 1.3
  +apache13.dir.server = ${env.APACHE13_HOME}
  +apache13.serverLibraryName = mod_axis
  +
  +## Values used for Apache 2.0
  +apache20.dir.server = ${env.APACHE20_HOME}
  +apache20.serverLibraryName = mod_axis2
  +
  +# Name for compiled Apache plugin library - excluding any prefix or suffix
  +# eg: For Windows :   axis_apache will produce axis_apache.dll
  +#     For Unix    :   axis_apache will produce libaxis_apache.so
  +serverLibraryName = mod_axis
  +
   ####################
   # Trace Properties #
   ####################
  @@ -107,7 +149,7 @@
   ###############################
   # Properties for Deliverables #
   ###############################
  -dir.zips = ${basedir}/../../../Zips
  +dir.zips = ${basedir}/../../../zips
   
   ############################
   # Properties for packaging #
  
  
  
  1.5       +42 -1     ws-axis/c/build.SunOS.properties
  
  Index: build.SunOS.properties
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/build.SunOS.properties,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- build.SunOS.properties	14 Oct 2004 08:10:27 -0000	1.4
  +++ build.SunOS.properties	15 Oct 2004 15:51:30 -0000	1.5
  @@ -71,6 +71,47 @@
   #     For Unix    :   axis_client will produce libaxis_client.so
   clientLibraryName = axis_client
   
  +############################
  +# Server Engine Properties #
  +############################
  +
  +# Name for compiled server engine - excluding any prefix or suffix
  +# eg: For Windows :   axis_server will produce axis_server.dll
  +#     For Unix    :   axis_server will produce libaxis_server.so
  +serverEngineLibraryName = axis_server
  +
  +#################################
  +# Simple Axis Server Properties #
  +#################################
  +# Is Simple Axis Server to be used?
  +server.simpleAxisServer = false
  +
  +# Name for compiled server engine - excluding any prefix or suffix
  +# eg: For Windows :   simple_axis_server will produce simple_axis_server.exe
  +#     For Unix    :   simple_axis_server will produce simple_axis_server
  +simpleAxisServerExecutableName = simple_axis_server
  +
  +#####################
  +# Apache Properties #
  +#####################
  +
  +# Apache versions to be used
  +server.apache13 = true
  +server.apache20 = true
  +
  +## Values used for Apache 1.3
  +apache13.dir.server = ${env.APACHE13_HOME}
  +apache13.serverLibraryName = mod_axis
  +
  +## Values used for Apache 2.0
  +apache20.dir.server = ${env.APACHE20_HOME}
  +apache20.serverLibraryName = mod_axis2
  +
  +# Name for compiled Apache plugin library - excluding any prefix or suffix
  +# eg: For Windows :   axis_apache will produce axis_apache.dll
  +#     For Unix    :   axis_apache will produce libaxis_apache.so
  +serverLibraryName = mod_axis
  +
   ####################
   # Trace Properties #
   ####################
  @@ -107,7 +148,7 @@
   ###############################
   # Properties for Deliverables #
   ###############################
  -dir.zips = ${basedir}/../../../Zips
  +dir.zips = ${basedir}/../../../zips
   
   ############################
   # Properties for packaging #
  
  
  
  1.7       +43 -1     ws-axis/c/build.Win32.properties
  
  Index: build.Win32.properties
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/build.Win32.properties,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.Win32.properties	14 Oct 2004 08:10:27 -0000	1.6
  +++ build.Win32.properties	15 Oct 2004 15:51:30 -0000	1.7
  @@ -71,6 +71,48 @@
   #     For Unix    :   axis_client will produce libaxis_client.so
   clientLibraryName = axis_client
   
  +############################
  +# Server Engine Properties #
  +############################
  +
  +# Name for compiled server engine - excluding any prefix or suffix
  +# eg: For Windows :   axis_server will produce axis_server.dll
  +#     For Unix    :   axis_server will produce libaxis_server.so
  +serverEngineLibraryName = axis_server
  +
  +#################################
  +# Simple Axis Server Properties #
  +#################################
  +
  +# Is Simple Axis Server to be used?
  +server.simpleAxisServer = false
  +
  +# Name for compiled server engine - excluding any prefix or suffix
  +# eg: For Windows :   simple_axis_server will produce simple_axis_server.exe
  +#     For Unix    :   simple_axis_server will produce simple_axis_server
  +simpleAxisServerExecutableName = simple_axis_server
  +
  +#####################
  +# Apache Properties #
  +#####################
  +
  +# Apache Versions to be used
  +server.apache13 = true
  +server.apache20 = true
  +
  +## Values used for Apache 1.3
  +apache13.dir.server = ${env.APACHE13_HOME}
  +apache13.serverLibraryName = mod_axis
  +
  +## Values used for Apache 2.0
  +apache20.dir.server = ${env.APACHE20_HOME}
  +apache20.serverLibraryName = mod_axis2
  +
  +# Name for compiled Apache plugin library - excluding any prefix or suffix
  +# eg: For Windows :   axis_apache will produce axis_apache.dll
  +#     For Unix    :   axis_apache will produce libaxis_apache.so
  +serverLibraryName = mod_axis
  +
   ####################
   # Trace Properties #
   ####################
  @@ -107,7 +149,7 @@
   ###############################
   # Properties for Deliverables #
   ###############################
  -dir.zips = ${basedir}/../../../Zips
  +dir.zips = ${basedir}/../../../zips
   
   ############################
   # Properties for packaging #
  
  
  
  1.10      +27 -0     ws-axis/c/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/build.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- build.xml	15 Oct 2004 11:33:02 -0000	1.9
  +++ build.xml	15 Oct 2004 15:51:30 -0000	1.10
  @@ -36,8 +36,34 @@
   	<import file="${basedir}/buildClient.xml"/>
   	<import file="${basedir}/buildTransport.xml"/>
   	<import file="${basedir}/buildXMLParser.xml"/>
  +	<import file="${basedir}/buildServerEngine.xml"/>
  +	<import file="${basedir}/buildApache13Module.xml"/>
  +	<import file="${basedir}/buildApache20Module.xml"/>
  +	<import file="${basedir}/buildSimpleAxisServer.xml"/>
   	<import file="${basedir}/buildWSDL2Ws.xml"/>
   
  +	<target name="compileServer">
  +		<antcall target="compileAxisServerEngine" inheritall="true"/>
  +		<if>
  +			<equals arg1="${server.apache13}" arg2="true"/>
  +			<then>
  +				<antcall target="compileApache13Module" inheritall="true"/>
  +			</then>
  +		</if>
  +		<if>
  +			<equals arg1="${server.apache20}" arg2="true"/>
  +			<then>
  +				<antcall target="compileApache20Module" inheritall="true"/>
  +			</then>
  +		</if>
  +		<if>
  +			<equals arg1="${server.simpleAxisServer}" arg2="true"/>
  +			<then>
  +				<antcall target="compileSimpleAxisServer" inheritall="true"/>
  +			</then>
  +		</if>
  +	</target>
  +
   	<target name="compileTransport">
   		<!-- Determine which flavour of transport to use -->
   		<!-- Ideally extend this to produce multiple flavours -->
  @@ -112,6 +138,7 @@
   		<antcall target="compileAxisClient" inheritall="true"/>
   		<antcall target="compileTransport" inheritall="true"/>
   		<antcall target="compileXMLParser" inheritall="true"/>
  +		<antcall target="compileServer" inheritall="true"/>
   	</target>
   
   	<import file="${basedir}/buildDocumentation.xml"/>
  
  
  
  1.3       +1 -1      ws-axis/c/buildClient.xml
  
  Index: buildClient.xml
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/buildClient.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- buildClient.xml	15 Oct 2004 11:33:02 -0000	1.2
  +++ buildClient.xml	15 Oct 2004 15:51:30 -0000	1.3
  @@ -47,7 +47,7 @@
   				</cc>
   			</then>
   			<else>
  -				<cc outfile="${dir.bin}/lib${clientLibraryName}.so" objdir="${dir.objects}"
  +				<cc outfile="${dir.bin}/${libraryPrefix}${clientLibraryName}${librarySuffix}" objdir="${dir.objects}"
   				 exceptions="true" failonerror="false" multithreaded="true">
   				  	<!-- Compilers -->
   					<compiler refid="AIXxlc"/>
  
  
  
  1.2       +7 -4      ws-axis/c/buildInitialize.xml
  
  Index: buildInitialize.xml
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/buildInitialize.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- buildInitialize.xml	12 Oct 2004 16:26:08 -0000	1.1
  +++ buildInitialize.xml	15 Oct 2004 15:51:30 -0000	1.2
  @@ -70,7 +70,7 @@
   			<compilerarg value="/FD"/>
   			<compilerarg value="/c"/>
   		</compiler>
  -		
  +
   		<!--
   		  Definition of gcc compile for Linux
   	      -->
  @@ -86,7 +86,7 @@
   			</defineset>
   			<includepath path="${dir.include}"/>
   		</compiler>
  -		
  +
   		<!--
   		  Definition of xlc compile for AIX
   	      -->
  @@ -105,7 +105,7 @@
   	<!--
   	  Linker Definitions
   	  -->
  -		<!-- Definition of Solars linker -->
  +		<!-- Definition of Solaris linker -->
   		<linker id="SolarisLinker" name="CC" libtool="true" if="solaris">
   			<linkerarg value="-g" if="debug"/>
   			<linkerarg value="-Qoption"/>
  @@ -134,8 +134,11 @@
   		<!--
   	      Definition of AIX linker
   	      -->
  -		<linker id="AIXLinker" name="xlC" libtool="false" if="aix">
  +		<linker id="AIXExecutableLinker" name="xlC" libtool="false" if="aix">
   			<linkerarg value="-g" if="debug"/>
  +		</linker>
  +
  +		<linker id="AIXLinker" extends="AIXExecutableLinker" name="xlC" libtool="false" if="aix">
   			<linkerarg value="-qmkshrobj"/>
   			<linkerarg value="-L/usr/lib/threads"/>
   			<linkerarg value="-lpthreads"/>
  
  
  
  1.2       +1 -1      ws-axis/c/buildTransport.xml
  
  Index: buildTransport.xml
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/buildTransport.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- buildTransport.xml	12 Oct 2004 16:26:08 -0000	1.1
  +++ buildTransport.xml	15 Oct 2004 15:51:30 -0000	1.2
  @@ -36,7 +36,7 @@
   				</cc>
   			</then>
   			<else>
  -				<cc outfile="${dir.bin}/lib${transportLibraryName}.so" objdir="${dir.objects}"
  +				<cc outfile="${dir.bin}/${libraryPrefix}${transportLibraryName}${librarySuffix}"
objdir="${dir.objects}"
   				 exceptions="true" failonerror="false" multithreaded="true">
   					<!-- Compilers -->
   					<compiler refid="AIXxlc"/>
  
  
  
  1.2       +1 -1      ws-axis/c/buildXMLParser.xml
  
  Index: buildXMLParser.xml
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/buildXMLParser.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- buildXMLParser.xml	12 Oct 2004 16:26:08 -0000	1.1
  +++ buildXMLParser.xml	15 Oct 2004 15:51:30 -0000	1.2
  @@ -40,7 +40,7 @@
   				</cc>
   			</then>
   			<else>
  -				<cc outfile="${dir.bin}/lib${xmlParserLibraryName}.so" objdir="${dir.objects}"
  +				<cc outfile="${dir.bin}/${libraryPrefix}${xmlParserLibraryName}${librarySuffix}"
objdir="${dir.objects}"
   				 exceptions="true" failonerror="false" multithreaded="true">
   				 	<!-- Compilers -->
   					<compiler refid="AIXxlc"/>
  
  
  
  1.3       +24 -8     ws-axis/c/package.xml
  
  Index: package.xml
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/package.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- package.xml	15 Oct 2004 11:33:02 -0000	1.2
  +++ package.xml	15 Oct 2004 15:51:30 -0000	1.3
  @@ -107,13 +107,20 @@
   		<!-- Copy across DLLs into release package -->
   		<mkdir dir="${dir.release}/bin"/>
   		<copy todir="${dir.release}/bin">
  -			<fileset dir="${dir.bin}" includes="*.dll"/>
  -			<fileset dir="${dir.bin}" includes="${clientLibraryName}.lib"/>
  +			<fileset dir="${dir.bin}">
  +				<include name="*.dll"/>
  +				<include name="*.exe"/>
  +			</fileset>
   		</copy>
   
   		<!-- Copy across LIB file into release package -->
   		<mkdir dir="${dir.release}/lib/axis"/>
  -		<copy todir="${dir.release}/lib/axis" file="${dir.bin}/${clientLibraryName}.lib"/>
  +		<copy todir="${dir.release}/lib/axis">
  +			<fileset dir="${dir.bin}">
  +				<include name="${clientLibraryName}.lib"/>
  +				<include name="${serverEngineLibraryName}.lib"/>
  +			</fileset>
  +		</copy>
   
   		<!-- Copy across MS Visual C++ Project files for samples into release package -->
   		<mkdir dir="${dir.release}/vc"/>
  @@ -145,9 +152,9 @@
   	</target>
   
   	<target name="copyAndLinkAIXLibraries" if="aix">
  -		<basename property="libraryName" file="${fullLibraryName}" suffix=".so"/>
  +		<basename property="libraryName" file="${fullLibraryName}" suffix="${librarySuffix}"/>
   		<mkdir dir="${dir.release}/lib/axis"/>
  -		<copy file="${dir.bin}/${libraryName}.so" tofile="${dir.release}/lib/axis/${libraryName}${version}.so"/>
  +		<copy file="${dir.bin}/${libraryName}${librarySuffix}" tofile="${dir.release}/lib/axis/${libraryName}${version}.so"/>
   
   		<symlink link="${dir.release}/lib/axis/${libraryName}${majorVersion}.so"
   		 resource="${libraryName}${version}.so" overwrite="true"/>
  @@ -161,12 +168,22 @@
   
   	<target name="copyUnixLibraries" unless="windows">
   		<path id="libraries">
  -			<fileset dir="${dir.bin}" includes="lib*"/>
  +			<fileset dir="${dir.bin}" includes="${libraryPrefix}*"/>
   		</path>
   
   		<foreach target="copyAndLinkUnixLibraries" param="fullLibraryName" inheritall="true">
   			<path refid="libraries"/>
   		</foreach>
  +		
  +		<if>
  +			<equals arg1="${server.simpleAxisServer}" arg2="true"/>
  +			<then>
  +				<mkdir dir="${dir.release}/bin"/>
  +				<copy todir="${dir.release}/bin">
  +					<fileset dir="${dir.bin}" includes="${simpleAxisServerExecutableName}"/>
  +				</copy>				
  +			</then>
  +		</if>
   	</target>
   
   	<target name="copyLibraries" depends="copyWindowsLibraries, copyUnixLibraries"/>
  @@ -211,8 +228,7 @@
   		<antcall target="copySource" inheritall="true"/>
   		<antcall target="copyTraceInstrumentedSource" inheritall="true"/>
   		<antcall target="copyWSDL2Ws" inheritall="true"/>
  -		<antcall target="packageDeliverable" inheritall="true">
  -		</antcall>
  +		<antcall target="packageDeliverable" inheritall="true"/>
   	</target>
   
   	<target name="packageAll">
  
  
  
  1.1                  ws-axis/c/buildApache13Module.xml
  
  Index: buildApache13Module.xml
  ===================================================================
  <project name="Axis C Apache 1.3 Server Module" default="compileApache13Module" basedir=".">
  
  	<!--
  	  Compile the Axis Server Library
  	  -->
  	<target name="compileApache13Module">
  		<mkdir dir="${dir.objects}"/>
  		<mkdir dir="${dir.bin}"/>
  		<copy todir="${basedir}/include/apache1_3">
  			<fileset dir="${apache13.dir.server}/include" includes="**"/>
  		</copy>
  		<if>
  			<not>
  				<isset property="aix"/>
  			</not>
  			<then>
  				<cc outfile="${dir.bin}/${apache13.serverLibraryName}" objdir="${dir.objects}"
  				 exceptions="true" failonerror="false" outtype="shared" multithreaded="true">
  				  	<!-- Compilers -->
  					<compiler refid="SolarisCC"/>
  					<compiler refid="Linuxgcc"/>
  					<compiler extends="VisualC++">
  						<defineset>
  							<define name="APACHE1_3_EXPORTS"/>
  						</defineset>
  					</compiler>
  					<includepath path="${apache13.dir.server}/include" unless="windows"/>
  					<!-- Additional compiler flag for Client library on all platforms -->
  					<defineset>
  						<define name="AXIS_APACHE1_3"/>
  					</defineset>
  					<!-- Linkers -->
  					<linker refid="SolarisLinker"/>
  					<linker refid="LinuxLinker"/>
  					<linker refid="VisualC++Linker"/>
  					<libset dir="${apache13.dir.server}/libexec" libs="ApacheCore" if="windows"/>
  					<libset dir="${dir.bin}" libs="${serverEngineLibraryName}"/>
  					<!-- Files to be compiled -->
  					<fileset dir="${dir.src.instrumented}">
  						<include name="server/apache/*.cpp"/>
  					</fileset>
  				</cc>
  			</then>
  			<else>
  				<cc outfile="${dir.bin}/${libraryPrefix}${apache13.serverLibraryName}${librarySuffix}"
objdir="${dir.objects}"
  				 exceptions="true" failonerror="false" multithreaded="true">
  				  	<!-- Compilers -->
  					<compiler refid="AIXxlc"/>
  					<includepath path="${apache13.dir.server}/include"/>
  					<!-- Additional compiler flag for Client library on all platforms -->
  					<defineset>
  						<define name="AXIS_APACHE1_3"/>
  					</defineset>
  					<!-- Linkers -->
  					<linker extends="AIXLinker">
  						<linkerarg value="-r"/>
  					</linker>
  					<libset dir="${dir.bin}" libs="${serverEngineLibraryName}"/>
  					<!-- Files to be compiled -->
  					<fileset dir="${dir.src.instrumented}">
  						<include name="server/apache/*.cpp"/>
  					</fileset>
  				</cc>
  			</else>
  		</if>
  	</target>
  </project>
  
  
  1.1                  ws-axis/c/buildApache20Module.xml
  
  Index: buildApache20Module.xml
  ===================================================================
  <project name="Axis C Apache 2.0 Server Module" default="compileApache20Module" basedir=".">
  
  	<!--
  	  Compile the Apache 2.0 Axis Server Module
  	  -->
  	<target name="compileApache20Module">
  		<mkdir dir="${dir.objects}"/>
  		<mkdir dir="${dir.bin}"/>
  		<copy todir="${basedir}/include/apache2_0">
  			<fileset dir="${apache20.dir.server}/include" includes="**"/>
  		</copy>
  		<if>
  			<not>
  				<isset property="aix"/>
  			</not>
  			<then>
  				<cc outfile="${dir.bin}/${apache20.serverLibraryName}" objdir="${dir.objects}"
  				 exceptions="true" failonerror="false" outtype="shared" multithreaded="true">
  				  	<!-- Compilers -->
  					<compiler refid="SolarisCC"/>
  					<compiler refid="Linuxgcc"/>
  					<compiler extends="VisualC++">
  						<defineset>
  							<define name="APACHE2_0_EXPORTS"/>
  						</defineset>
  					</compiler>
  					<includepath path="${apache20.dir.server}/include" unless="windows"/>
  					<!-- Additional compiler flag for Client library on all platforms -->
  					<defineset>
  						<define name="AXIS_APACHE1_3"/>
  					</defineset>
  					<!-- Linkers -->
  					<linker refid="SolarisLinker"/>
  					<linker refid="LinuxLinker"/>
  					<linker refid="VisualC++Linker"/>
  					<libset dir="${apache20.dir.server}/lib" libs="libapr, libhttpd" if="windows"/>
  					<libset dir="${dir.bin}" libs="${serverEngineLibraryName}"/>
  					<!-- Files to be compiled -->
  					<fileset dir="${dir.src.instrumented}">
  						<include name="server/apache2/*.cpp"/>
  					</fileset>
  				</cc>
  			</then>
  			<else>
  				<cc outfile="${dir.bin}/${libraryPrefix}${apache20.serverLibraryName}${librarySuffix}"
objdir="${dir.objects}"
  				 exceptions="true" failonerror="false" multithreaded="true">
  				  	<!-- Compilers -->
  					<compiler refid="AIXxlc"/>
  					<includepath path="${apache20.dir.server}/include"/>
  					<!-- Additional compiler flag for Client library on all platforms -->
  					<defineset>
  						<define name="AXIS_APACHE1_3"/>
  					</defineset>
  					<!-- Linkers -->
  					<linker extends="AIXLinker">
  						<linkerarg value="-r"/>
  					</linker>
  					<libset dir="${dir.bin}" libs="${serverEngineLibraryName}"/>
  					<!-- Files to be compiled -->
  					<fileset dir="${dir.src.instrumented}">
  						<include name="server/apache2/*.cpp"/>
  					</fileset>
  				</cc>
  			</else>
  		</if>
  	</target>
  </project>
  
  
  1.1                  ws-axis/c/buildServerEngine.xml
  
  Index: buildServerEngine.xml
  ===================================================================
  <project name="Axis C Server Engine" default="compileAxisServerEngine" basedir=".">
  
  	<!--
  	  Compile the Axis Server Library
  	  -->
  	<target name="compileAxisServerEngine">
  		<mkdir dir="${dir.objects}"/>
  		<mkdir dir="${dir.bin}"/>
  		<if>
  			<not>
  				<isset property="aix"/>
  			</not>
  			<then>
  				<cc outfile="${dir.bin}/${serverEngineLibraryName}" objdir="${dir.objects}"
  				 exceptions="true" failonerror="false" outtype="shared" multithreaded="true">
  				  	<!-- Compilers -->
  					<compiler refid="SolarisCC"/>
  					<compiler refid="Linuxgcc"/>
  					<compiler extends="VisualC++">
  						<defineset>
  							<define name="DYNALIB_EXPORTS"/>
  						</defineset>
  					</compiler>
  					<!-- 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="VisualC++Linker"/>
  					<!-- Files to be compiled -->
  					<fileset dir="${dir.src.instrumented}">
  						<include name="common/*.cpp"/>
  						<include name="engine/*.cpp"/>
  						<include name="engine/server/*.cpp"/>
  						<include name="soap/*.cpp"/>
  						<include name="soap/*.c"/>
  						<include name="wsdd/*.cpp"/>
  						<include name="xml/*.cpp"/>
  						<!-- The following files need to be excluded @Adrian - query these! -->
  						<exclude name="common/Packet.cpp"/>
  						<exclude name="common/AxisSocketUtils.cpp"/>
  					</fileset>
  				</cc>
  			</then>
  			<else>
  				<cc outfile="${dir.bin}/${libraryPrefix}${serverEngineLibraryName}${librarySuffix}"
objdir="${dir.objects}"
  				 exceptions="true" failonerror="false" multithreaded="true">
  				  	<!-- Compilers -->
  					<compiler refid="AIXxlc"/>
  					<!-- Additional compiler flag for Client library on all platforms -->
  					<defineset>
  						<define name="ENABLE_AXISTRACE" if="trace"/>
  					</defineset>
  					<!-- Linkers -->
  					<linker refid="AIXLinker"/>
  					<!-- Files to be compiled -->
  					<fileset dir="${dir.src.instrumented}">
  						<include name="common/*.cpp"/>
  						<include name="engine/*.cpp"/>
  						<include name="engine/server/*.cpp"/>
  						<include name="soap/*.cpp"/>
  						<include name="soap/*.c"/>
  						<include name="wsdd/*.cpp"/>
  						<include name="xml/*.cpp"/>
  						<include name="transport/axis/AxisTransportException.cpp"/>
  						<!-- The following files need to be excluded -->
  						<exclude name="common/Packet.cpp"/>
  						<exclude name="common/AxisSocketUtils.cpp"/>
  					</fileset>
  				</cc>
  			</else>
  		</if>
  	</target>
  </project>
  
  
  1.1                  ws-axis/c/buildSimpleAxisServer.xml
  
  Index: buildSimpleAxisServer.xml
  ===================================================================
  <project name="Axis C Simple Axis Server" default="compileSimpleAxisServer" basedir=".">
  
  	<!--
  	  Compile the Simple Axis Server
  	  -->
  	<target name="compileSimpleAxisServer">
  		<mkdir dir="${dir.objects}"/>
  		<mkdir dir="${dir.bin}"/>
  		<cc outfile="${dir.bin}/${simpleAxisServerExecutableName}" objdir="${dir.objects}"
  		 exceptions="true" failonerror="false" outtype="executable" multithreaded="true">
  		  	<!-- Compilers -->
  			<compiler refid="SolarisCC"/>
  			<compiler refid="Linuxgcc"/>
  			<compiler extends="VisualC++"/>
  			<compiler refid="AIXxlc"/>
  			<!-- Linkers -->
  			<linker refid="SolarisLinker"/>
  			<linker refid="LinuxLinker"/>
  			<linker refid="VisualC++Linker"/>
  			<linker refid="AIXExecutableLinker"/>
  			<libset dir="${dir.bin}" libs="${serverEngineLibraryName}"/>
  			<!-- Files to be compiled -->
  			<fileset dir="${dir.src.instrumented}">
  				<include name="server/simple_axis_server/*.cpp"/>
  			</fileset>
  		</cc>
  	</target>
  </project>
  
  

Mime
View raw message