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 ha...@apache.org on 2005/07/22 16:15:40 UTC
cvs commit: ws-axis/c/build build.Win32.properties build.common.properties
hawkeye 2005/07/22 07:15:40
Modified: c test.xml buildSamples.xml
c/build build.Win32.properties build.common.properties
Log:
common.properites was not being used so samples failed to build
Revision Changes Path
1.33 +0 -2 ws-axis/c/test.xml
Index: test.xml
===================================================================
RCS file: /home/cvs/ws-axis/c/test.xml,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- test.xml 14 Jun 2005 16:38:49 -0000 1.32
+++ test.xml 22 Jul 2005 14:15:39 -0000 1.33
@@ -71,7 +71,6 @@
Create a list of all the tests
-->
<target name="setAll" if="allTest">
- <echo message="setAll ${dir.autotests}/tests"/>
<path id="test_properties">
<fileset dir="${dir.testproperties}" includes="*.xml"/>
</path>
@@ -91,7 +90,6 @@
Create a list of tests from a properties file unless an individual test has been specified too
-->
<target name="setFromList" if="test.list" unless="test.name">
- <echo message="setFromList ${test.list}"/>
<path id="test_properties">
<fileset dir="${dir.testproperties}" includesfile="${test.list}"/>
</path>
1.8 +4 -2 ws-axis/c/buildSamples.xml
Index: buildSamples.xml
===================================================================
RCS file: /home/cvs/ws-axis/c/buildSamples.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- buildSamples.xml 2 Jun 2005 11:52:32 -0000 1.7
+++ buildSamples.xml 22 Jul 2005 14:15:39 -0000 1.8
@@ -194,6 +194,7 @@
<!-- Load properties from file -->
<property file="${basedir}/build/version.properties"/>
+ <property file="${basedir}/build/build.common.properties"/>
<property file="${basedir}/build/build.${platform}.properties"/>
<!-- Get directory to contain log file -->
@@ -269,7 +270,8 @@
</antcall>
<!--Build server-->
<echo>Building server ${serverSampleDir}/@{samplename}</echo>
- <cc failonerror="false" incremental="false" outfile="${dir.obj}/samples/@{samplename}"
+ <mkdir dir="${dir.obj}/samples/server/@{samplename}/"/>
+ <cc failonerror="false" incremental="false" outfile="${dir.obj}/samples/server/@{samplename}/@{samplename}"
objdir="${dir.obj}/objects" exceptions="true"
outtype="shared" subsystem="console" >
<!-- Compilers -->
@@ -295,7 +297,7 @@
<!--
Build samples
-->
- <target name="buildSamples" unless="runOnly" depends="initialize, compileSamples" description="Build all sampless"/>
+ <target name="buildSamples" unless="runOnly" depends="initialize, compileSamples" description="Build all samples"/>
<!--
Remove all generated samples artifacts
-->
1.25 +1 -22 ws-axis/c/build/build.Win32.properties
Index: build.Win32.properties
===================================================================
RCS file: /home/cvs/ws-axis/c/build/build.Win32.properties,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- build.Win32.properties 27 Jun 2005 13:51:52 -0000 1.24
+++ build.Win32.properties 22 Jul 2005 14:15:39 -0000 1.25
@@ -72,24 +72,6 @@
HTTP.SecureChannelLibraryName = HTTPSSLChannel
-#####################
-# Client Properties #
-#####################
-
-# Name for compiled client - excluding any prefix or suffix
-# eg: For Windows : axis_client will produce axis_client.dll
-# For Unix : axis_client will produce libaxis_client.so
-clientLibraryName = AxisClient
-
-############################
-# 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 = AxisServer
-
#################################
# Simple Axis Server Properties #
#################################
@@ -113,10 +95,7 @@
apache20.serverLibraryName = mod_axis2
-########################################
-# Location of wsdl2ws for Deliverables #
-########################################
-dir.wsdl2ws = ${dir.release}/lib/axis
+
# Prefix and suffix used for executables and libraries
# Typical values are:
1.3 +1 -1 ws-axis/c/build/build.common.properties
Index: build.common.properties
===================================================================
RCS file: /home/cvs/ws-axis/c/build/build.common.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.common.properties 21 Jul 2005 12:44:19 -0000 1.2
+++ build.common.properties 22 Jul 2005 14:15:39 -0000 1.3
@@ -150,7 +150,7 @@
#####################
# Apache versions to be used
-server.apache13 = true
+server.apache13 = false
server.apache20 = true
## Values used for Apache 1.3