You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2004/10/15 13:33:02 UTC
cvs commit: ws-axis/c build.xml buildClient.xml package.xml
dicka 2004/10/15 04:33:02
Modified: c build.xml buildClient.xml package.xml
Log:
Further updates to ANT build scripts for nightly builds.
Submitted by: Adrian Dick
Revision Changes Path
1.9 +31 -112 ws-axis/c/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/ws-axis/c/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.xml 12 Oct 2004 16:26:08 -0000 1.8
+++ build.xml 15 Oct 2004 11:33:02 -0000 1.9
@@ -11,14 +11,15 @@
These are available from: http://ant-contrib.sourceforge.net/
{Note: You will require both the cpptasks and ant-contrib downloads }
-It is intended that the default target be used, which compiles and links all code,
-generates documentation and packages ready for distribution.
+It is intended that the default target be used, which compiles and links all code
+and generates documentation.
Associated with this build script are property files for each platform, the script
will automatically determine the correct one to be used;
- build.Win32.properties
- build.Linux.properties
- build.AIX.properties
+ - build.SunOS.properties
Please use these to configure directories to suit the needs of your system.
Notes:
@@ -107,128 +108,46 @@
</if>
</target>
-
- <target name="compileWithDebug">
- <antcall target="compileAxisClient" inheritall="true">
- <param name="debug" value="on"/>
- <param name="dir.bin" value="${dir.bin}/debug"/>
- <param name="dir.objects" value="${dir.objects}/debug"/>
- </antcall>
- <antcall target="compileTransport" inheritall="true">
- <param name="debug" value="on"/>
- <param name="dir.bin" value="${dir.bin}/debug"/>
- <param name="dir.objects" value="${dir.objects}/debug"/>
- </antcall>
- <antcall target="compileXMLParser" inheritall="true">
- <param name="debug" value="on"/>
- <param name="dir.bin" value="${dir.bin}/debug"/>
- <param name="dir.objects" value="${dir.objects}/debug"/>
- </antcall>
- </target>
-
- <target name="compileWithoutDebug">
+ <target name="compile">
<antcall target="compileAxisClient" inheritall="true"/>
<antcall target="compileTransport" inheritall="true"/>
<antcall target="compileXMLParser" inheritall="true"/>
</target>
- <target name="compileWithTrace" depends="initialize, addTrace">
- <antcall target="compileWithDebug" inheritall="true">
- <param name="trace" value="true"/>
- <param name="dir.src" value="${dir.src.instrumented}"/>
- <param name="dir.bin" value="${dir.bin}/trace"/>
- <param name="dir.objects" value="${dir.objects}/trace"/>
- </antcall>
- <antcall target="compileWithoutDebug" inheritall="true">
- <param name="trace" value="true"/>
- <param name="dir.src" value="${dir.src.instrumented}"/>
- <param name="dir.bin" value="${dir.bin}/trace"/>
- <param name="dir.objects" value="${dir.objects}/trace"/>
- </antcall>
- </target>
+ <import file="${basedir}/buildDocumentation.xml"/>
- <target name="compileWithoutTrace" depends="initialize">
- <antcall target="compileWithDebug" inheritall="true"/>
- <antcall target="compileWithoutDebug" inheritall="true"/>
- </target>
-
- <target name="compile" depends="compileWithTrace, compileWithoutTrace, compileWSDL2Ws, buildWSDL2WsJARFile"
- description="Compile all C/C++ code and WSDL2Ws java code"/>
+ <target name="buildAll" depends="compile, compileWSDL2Ws, buildWSDL2WsJARFile, documentation"/>
- <import file="${basedir}/buildDocumentation.xml"/>
- <target name="build" depends="compile, documentation"/>
+ <target name="build" depends="initialize"
+ description="Build runtime libraries, WSDL2Ws tool and API Documentation">
+ <antcall target="buildAll" 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>
- <!--
- Validate all artifacts produced for Windows platform
- -->
- <target name="validateWindows" depends="initialize" if="windows">
- <condition property="missingArtifact">
- <not>
- <and>
- <!-- DLLs -->
- <available file="${dir.package.bin}/${clientLibraryName}.dll"/>
- <available file="${dir.package.bin}/${transportLibraryName}.dll"/>
- <available file="${dir.package.bin}/${xmlParserLibraryName}.dll"/>
- <available file="${dir.package.lib}/${clientLibraryName}.lib"/>
- </and>
- </not>
- </condition>
- <fail message="Not all artifacts have been produced for windows" if="missingArtifact"/>
- </target>
-
- <!--
- Validate all artifacts produced for Unix platform
- -->
- <target name="validateUnix" depends="initialize" unless="windows">
- <condition property="missingArtifact">
- <not>
- <and>
- <!-- Shared Libraries -->
- <available file="${dir.package.lib}/lib${clientLibraryName}.so.${majorVersion}"/>
- <available file="${dir.package.lib}/lib${clientLibraryName}.so.${version}"/>
- <available file="${dir.package.lib}/lib${transportLibraryName}.so.${majorVersion}"/>
- <available file="${dir.package.lib}/lib${transportLibraryName}.so.${version}"/>
- <available file="${dir.package.lib}/lib${xmlParserLibraryName}.so.${majorVersion}"/>
- <available file="${dir.package.lib}/lib${xmlParserLibraryName}.so.${version}"/>
- </and>
- </not>
- </condition>
- <fail message="Not all artifacts have been produced for unix" if="missingArtifact"/>
+ <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="validateAIX" depends="validateUnix" if="aix">
- <condition property="missingArtifact">
- <not>
- <and>
- <available file="${dir.package.lib}/lib${clientLibraryName}.a"/>
- <available file="${dir.package.lib}/lib${transportLibraryName}.a"/>
- <available file="${dir.package.lib}/lib${xmlParserLibraryName}.a"/>
- </and>
- </not>
- </condition>
- <fail message="Not all artifacts have been produced for AIX" if="missingArtifact"/>
- </target>
-
- <!--
- Validate all artifacts produced
- -->
- <target name="validate" depends="validateWindows, validateUnix, validateAIX">
- <condition property="missingArtifact">
- <not>
- <and>
- <!-- WSDL2Ws Tool -->
- <available file="${dir.package.WSDL2Ws}/wsdl2ws.jar"/>
- <!-- Header Files -->
- <available file="${dir.package.include}/axis" type="dir"/>
- <!-- Documentation -->
- <available file="${dir.package.docs}" type="dir"/>
- </and>
- </not>
- </condition>
- <fail message="Not all artifacts have been produced" if="missingArtifact"/>
+ <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
-->
1.2 +2 -2 ws-axis/c/buildClient.xml
Index: buildClient.xml
===================================================================
RCS file: /home/cvs/ws-axis/c/buildClient.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- buildClient.xml 12 Oct 2004 16:26:08 -0000 1.1
+++ buildClient.xml 15 Oct 2004 11:33:02 -0000 1.2
@@ -31,7 +31,7 @@
<linker refid="LinuxLinker"/>
<linker refid="VisualC++Linker"/>
<!-- Files to be compiled -->
- <fileset dir="${dir.src.instrumented}">
+ <fileset dir="${dir.src}">
<include name="common/*.cpp"/>
<include name="engine/*.cpp"/>
<include name="engine/client/*.cpp"/>
@@ -59,7 +59,7 @@
<!-- Linkers -->
<linker refid="AIXLinker"/>
<!-- Files to be compiled -->
- <fileset dir="${dir.src.instrumented}">
+ <fileset dir="${dir.src}">
<include name="common/*.cpp"/>
<include name="engine/*.cpp"/>
<include name="engine/client/*.cpp"/>
1.2 +39 -19 ws-axis/c/package.xml
Index: package.xml
===================================================================
RCS file: /home/cvs/ws-axis/c/package.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- package.xml 12 Oct 2004 16:26:08 -0000 1.1
+++ package.xml 15 Oct 2004 11:33:02 -0000 1.2
@@ -1,5 +1,26 @@
<project name="Apache Axis C Packaging" default="package" basedir=".">
-
+ <description>
+This ANT script packages the Apache AxisC runtime binaries, WSDL2Ws tooling and
+documentation. You will need to use build.xml to produce all binaries, etc.
+
+This script is intended for use with Java 1.4+ and Apache ANT 1.6+.
+Ant is available from: http://ant.apache.org/
+
+You will require the ant-contrib extensions to ANT, within:
+ [ant install dir]/lib
+These are available from: http://ant-contrib.sourceforge.net/
+
+It is intended that the default target be used, produces the complete source and
+binary deliverables.
+
+Associated with this build script are property files for each platform, the script
+will automatically determine the correct one to be used;
+ - build.Win32.properties
+ - build.Linux.properties
+ - build.AIX.properties
+ - build.SunOS.properties
+Please use these to configure directories to suit the needs of your system.
+ </description>
<import file="${basedir}/buildInitialize.xml"/>
<target name="copySource">
@@ -190,10 +211,11 @@
<antcall target="copySource" inheritall="true"/>
<antcall target="copyTraceInstrumentedSource" inheritall="true"/>
<antcall target="copyWSDL2Ws" inheritall="true"/>
- <antcall target="packageDeliverable" inheritall="true"/>
+ <antcall target="packageDeliverable" inheritall="true">
+ </antcall>
</target>
- <target name="packageWithoutTrace">
+ <target name="packageAll">
<antcall target="packageBinaryRelease" inheritall="true">
<param name="release" value="${release}-bin"/>
<param name="dir.release" value="${dir.release}-bin"/>
@@ -204,22 +226,20 @@
</antcall>
</target>
- <target name="packageWithTrace">
- <antcall target="packageBinaryRelease" inheritall="true">
- <param name="dir.bin" value="${dir.bin}/trace"/>
- <param name="release" value="${release}-bin-trace"/>
- <param name="dir.release" value="${dir.release}-bin-trace"/>
- </antcall>
- <antcall target="packageSourceRelease" inheritall="true">
- <param name="trace" value="true"/>
- <param name="release" value="${release}-src-trace"/>
- <param name="dir.release" value="${dir.release}-src-trace"/>
- </antcall>
- </target>
-
- <target name="package" depends="initialize" description="Package ready for delivery">
- <antcall target="packageWithoutTrace" inheritall="true"/>
- <antcall target="packageWithTrace" inheritall="true"/>
+ <target name="package" depends="initialize">
+ <if>
+ <available file="${dir.src.instrumented}" type="dir"/>
+ <then>
+ <antcall target="packageAll" inheritall="true">
+ <param name="trace" value="true"/>
+ <param name="release" value="${release}-trace"/>
+ <param name="dir.release" value="${dir.release}-trace"/>
+ </antcall>
+ </then>
+ <else>
+ <antcall target="packageAll" inheritall="true"/>
+ </else>
+ </if>
</target>
<target name="clean" depends="initialize" description="Remove built packages">