axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From perr...@apache.org
Subject cvs commit: ws-axis/c/build buildClient.xml buildHandler.xml buildInitialize.xml buildTest.xml buildTransport.xml buildTransportIPV6.xml buildXMLParser.xml executeTest.xml
Date Mon, 10 Jan 2005 21:00:31 GMT
perryan     2005/01/10 13:00:31

  Modified:    c/build  buildClient.xml buildHandler.xml
                        buildInitialize.xml buildTest.xml
                        buildTransport.xml buildTransportIPV6.xml
                        buildXMLParser.xml executeTest.xml
  Log:
  Changed the Ant build and test framework to use the specified library names with _D added
to the names if the build is a _DEBUG build on windows.
  
  Revision  Changes    Path
  1.4       +8 -17     ws-axis/c/build/buildClient.xml
  
  Index: buildClient.xml
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/build/buildClient.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- buildClient.xml	7 Jan 2005 16:11:28 -0000	1.3
  +++ buildClient.xml	10 Jan 2005 21:00:31 -0000	1.4
  @@ -3,7 +3,8 @@
   	<!--
   	  Compile the Axis Client Library
   	  -->
  -	<target name="compileAxisClient">
  +	  <!-- <target name="compileAxisClient" depends="checkIfDebug"> -->
  +	  <target name="compileAxisClient">
   		<mkdir dir="${dir.objects}"/>
   		<mkdir dir="${dir.bin}"/>
   		<if>
  @@ -11,21 +12,11 @@
   				<isset property="aix"/>
   			</not>
   			<then>
  -				<!--  Check to see if we are in debug mode so need _D library name -->
  -				<if>
  -					<and>
  -						<isset property="windows"/>
  -						<equals arg1="${debug}" arg2="true"/>
  -					</and>
  -					<then>
  -						<property name="completeClientLibraryName" value="${clientLibraryName}_D"/>
  -					</then>
  -					<else>
  -						<property name="completeClientLibraryName" value="${clientLibraryName}"/>
  -					</else>
  -				</if>
  -					
  -				<cc outfile="${dir.bin}/${completeClientLibraryName}" objdir="${dir.objects}"
  +				<!--
  +				  Library name may have been change if windows debug build. Changed
  +				  in buildInitialize.xml
  +				  -->
  +				<cc outfile="${dir.bin}/${clientLibraryName}" objdir="${dir.objects}"
   				 exceptions="true" outtype="shared" multithreaded="true">
   				  	<!-- Compilers -->
   					<compiler refid="SolarisCC"/>
  @@ -97,4 +88,4 @@
   			</else>
   		</if>
   	</target>
  -</project>
  \ No newline at end of file
  +</project>
  
  
  
  1.3       +14 -1     ws-axis/c/build/buildHandler.xml
  
  Index: buildHandler.xml
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/build/buildHandler.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- buildHandler.xml	16 Dec 2004 15:15:28 -0000	1.2
  +++ buildHandler.xml	10 Jan 2005 21:00:31 -0000	1.3
  @@ -49,10 +49,23 @@
   		</condition>
   	</target>
   
  +	<target name="checkIfDebugName" if="debug">
  +		<if>
  +			<and>
  +				<isset property="windows"/>
  +				<equals arg1="${debug}" arg2="true" casesensitive="false"/>
  +			</and>
  +			<then>
  +				<property name="handlerLibraryName_D" value="${handlerLibraryName}_D"/>
  +				<propertycopy property="handlerLibraryName" from="handlerLibraryName_D" override="true"/>
  +			</then>
  +		</if>
  +	</target>
  +
   	<!--
   	  Builds a test handler
   	  -->
  -	<target name="buildTestHandler" depends="setHandlerLibraryName, compileTestHandler,
validateHandlerCompilation, insertEntriesInWSDDFile"/>
  +	<target name="buildTestHandler" depends="setHandlerLibraryName, checkIfDebugName, compileTestHandler,
validateHandlerCompilation, insertEntriesInWSDDFile"/>
   
   	<!--
   	  Locate all Handlers needing to be build for this client
  
  
  
  1.5       +35 -2     ws-axis/c/build/buildInitialize.xml
  
  Index: buildInitialize.xml
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/build/buildInitialize.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- buildInitialize.xml	17 Dec 2004 15:23:27 -0000	1.4
  +++ buildInitialize.xml	10 Jan 2005 21:00:31 -0000	1.5
  @@ -192,7 +192,10 @@
   	<!--
   	  Initialize properties
         -->
  -	<target name="initialize" depends="pre-init">
  +
  +	<target name="initialize" depends="set-platform-specifics, checkIfDebug" />
  +
  +	<target name="set-platform-specifics" depends="pre-init">
   		<condition property="platform" value="SunOS">
   			<isset property="solaris"/>
   		</condition>
  @@ -217,4 +220,34 @@
     		<!-- Load properties from file -->
    		<property file="${dir.properties}/build.${platform}.properties"/>
   	</target>
  -</project>
  \ No newline at end of file
  +
  +	<!--
  +	  Change the name of the DLL files if compiling with debug on windows
  +	  -->
  +	<target name="checkIfDebug" if="debug">
  +		<if>
  +			<and>
  +				<isset property="windows"/>
  +				<equals arg1="${debug}" arg2="true" casesensitive="false"/>
  +			</and>
  +			<then>
  +				<property name="clientLibraryName_D" value="${clientLibraryName}_D"/>
  +				<property name="transportLibraryName_D" value="${transportLibraryName}_D"/>
  +				<property name="xmlParserLibraryName_D" value="${xmlParserLibraryName}_D"/>
  +				<property name="xml4c.xmlParserLibraryName_D" value="${xml4c.xmlParserLibraryName}_D"/>
  +				<property name="xerces.xmlParserLibraryName_D" value="${xerces.xmlParserLibraryName}_D"/>
  +				<property name="axis2.transportLibraryName_D" value="${axis2.transportLibraryName}_D"/>
  +				<property name="axis2.ipv6.transportLibraryName_D" value="${axis2.ipv6.transportLibraryName}_D"/>
  +
  +				<propertycopy property="clientLibraryName" from="clientLibraryName_D" override="true"/>
  +				<propertycopy property="transportLibraryName" from="transportLibraryName_D" override="true"/>
  +				<propertycopy property="xmlParserLibraryName" from="xmlParserLibraryName_D" override="true"/>
  +				<propertycopy property="xml4c.xmlParserLibraryName" from="xml4c.xmlParserLibraryName_D"
override="true"/>
  +				<propertycopy property="xerces.xmlParserLibraryName" from="xerces.xmlParserLibraryName_D"
override="true"/>
  +				<propertycopy property="axis2.transportLibraryName" from="axis2.transportLibraryName_D"
override="true"/>
  +				<propertycopy property="axis2.ipv6.transportLibraryName" from="axis2.ipv6.transportLibraryName_D"
override="true"/>
  +			</then>
  +		</if>
  +	</target>
  +		
  +</project>
  
  
  
  1.4       +0 -4      ws-axis/c/build/buildTest.xml
  
  Index: buildTest.xml
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/build/buildTest.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- buildTest.xml	16 Dec 2004 14:35:07 -0000	1.3
  +++ buildTest.xml	10 Jan 2005 21:00:31 -0000	1.4
  @@ -52,10 +52,6 @@
   	  Compile test client
   	  -->
   	<target name="compileClient" depends="generateStubs, copyClient" unless="runOnly">
  -		<!--
  -		<cc failonerror="false" incremental="false" outfile="${dir.test.generated}/${client.lang}/${testName}/${testName}"
  -		 objdir="${dir.test.generated}/${client.lang}/${testName}" exceptions="true"
  -		-->
   		<cc failonerror="false" incremental="false" outfile="${test.directory}/${testName}"
   		 objdir="${test.directory}" exceptions="true"
   		 outtype="executable" subsystem="console">
  
  
  
  1.6       +6 -16     ws-axis/c/build/buildTransport.xml
  
  Index: buildTransport.xml
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/build/buildTransport.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- buildTransport.xml	7 Jan 2005 16:11:00 -0000	1.5
  +++ buildTransport.xml	10 Jan 2005 21:00:31 -0000	1.6
  @@ -3,7 +3,7 @@
      <!--
       Compile the Axis Transport Library
       -->
  -   <target name="compileAxisTransport">
  +	 <target name="compileAxisTransport">
         <mkdir dir="${dir.objects}"/>
         <mkdir dir="${dir.bin}"/>
         <if>
  @@ -11,21 +11,11 @@
               <isset property="aix"/>
            </not>
            <then>
  -				<!--  Check to see if we are in debug mode so need _D library name -->
  -				<if>
  -					<and>
  -						<isset property="windows"/>
  -						<equals arg1="${debug}" arg2="true"/>
  -					</and>
  -					<then>
  -						<property name="completeTransportLibraryName" value="${transportLibraryName}_D"/>
  -					</then>
  -					<else>
  -						<property name="completeTransportLibraryName" value="${transportLibraryName}"/>
  -					</else>
  -				</if>
  -
  -            <cc outfile="${dir.bin}/${completeTransportLibraryName}" objdir="${dir.objects}"
  +				<!--
  +				  Library name may have been change if windows debug build. Changed
  +				  in buildInitialize.xml
  +				  -->
  +            <cc outfile="${dir.bin}/${transportLibraryName}" objdir="${dir.objects}"
                exceptions="true" outtype="shared" multithreaded="true">
                  <!-- Compilers -->
                  <compiler refid="SolarisCC"/>
  
  
  
  1.4       +5 -15     ws-axis/c/build/buildTransportIPV6.xml
  
  Index: buildTransportIPV6.xml
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/build/buildTransportIPV6.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- buildTransportIPV6.xml	7 Jan 2005 16:11:00 -0000	1.3
  +++ buildTransportIPV6.xml	10 Jan 2005 21:00:31 -0000	1.4
  @@ -11,21 +11,11 @@
   				<isset property="aix"/>
   			</not>
   			<then>
  -				<!--  Check to see if we are in debug mode so need _D library name -->
  -				<if>
  -					<and>
  -						<isset property="windows"/>
  -						<equals arg1="${debug}" arg2="true"/>
  -					</and>
  -					<then>
  -						<property name="completeTransportLibraryName" value="${transportLibraryName}_D"/>
  -					</then>
  -					<else>
  -						<property name="completeTransportLibraryName" value="${transportLibraryName}"/>
  -					</else>
  -				</if>
  -
  -				<cc outfile="${dir.bin}/${completeTransportLibraryName}" objdir="${dir.objects}"
  +				<!--
  +				  Library name may have been change if windows debug build. Changed
  +				  in buildInitialize.xml
  +				  -->
  +				<cc outfile="${dir.bin}/${transportLibraryName}" objdir="${dir.objects}"
   				 exceptions="true" outtype="shared" multithreaded="true">
   					<!-- Compilers -->
   					<compiler refid="SolarisCC"/>
  
  
  
  1.3       +7 -17     ws-axis/c/build/buildXMLParser.xml
  
  Index: buildXMLParser.xml
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/build/buildXMLParser.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- buildXMLParser.xml	7 Jan 2005 16:11:00 -0000	1.2
  +++ buildXMLParser.xml	10 Jan 2005 21:00:31 -0000	1.3
  @@ -3,7 +3,7 @@
   	<!--
   	  Compile the Axis XML Parser Library
   	  -->
  -	<target name="compileAxisXMLParser">
  +	  <target name="compileAxisXMLParser">
   		<mkdir dir="${dir.objects}"/>
   		<mkdir dir="${dir.bin}"/>
   		<if>
  @@ -11,21 +11,11 @@
   				<isset property="aix"/>
   			</not>
   			<then>
  -				<!--  Check to see if we are in debug mode -->
  -				<if>
  -					<and>
  -						<isset property="windows"/>
  -						<equals arg1="${debug}" arg2="true"/>
  -					</and>
  -					<then>
  -						<property name="completeXmlParserLibraryName" value="${xmlParserLibraryName}_D"/>
  -					</then>
  -					<else>
  -						<property name="completeXmlParserLibraryName" value="${xmlParserLibraryName}"/>
  -					</else>
  -				</if>
  -
  -				<cc outfile="${dir.bin}/${completeXmlParserLibraryName}" objdir="${dir.objects}"
  +				<!--
  +				  Library name may have been change if windows debug build. Changed
  +				  in buildInitialize.xml
  +				  -->
  +				<cc outfile="${dir.bin}/${xmlParserLibraryName}" objdir="${dir.objects}"
   				 exceptions="true" outtype="shared" multithreaded="true">
   				 	<!-- Compilers -->
   					<compiler refid="SolarisCC"/>
  @@ -81,4 +71,4 @@
   			</else>
   		</if>
   	</target>
  -</project>
  \ No newline at end of file
  +</project>
  
  
  
  1.5       +1 -1      ws-axis/c/build/executeTest.xml
  
  Index: executeTest.xml
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/build/executeTest.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- executeTest.xml	6 Jan 2005 15:03:39 -0000	1.4
  +++ executeTest.xml	10 Jan 2005 21:00:31 -0000	1.5
  @@ -113,7 +113,7 @@
   	<!--
   	  Create configuration file to use when running test
   	  -->
  -	<target name="createConfigurationFile" if="successfulClientCompilation">
  +	<target name="createConfigurationFile" depends="checkIfDebug" if="successfulClientCompilation">
   		<dirname file="${axiscpp.conf}" property="confFileDirectory"/>
   
   		<mkdir dir="${confFileDirectory}"/>
  
  
  

Mime
View raw message